Update CHANGELOG

Update HAProxy Config Docs

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## Main branch
+
+- [Fix][pull3799]: Fix typo in `basic_tc.py` contrib for beginner tutorial (Tharic99)
+- [Doc][pull3800]: Describe support for Telnet SSH in HAProxy documentation (holl0wstar)
+
+[pull3799]: https://github.com/evennia/evennia/issues/3799
+[pull3800]: https://github.com/evennia/evennia/issues/3800
+
+
 ## Evennia 5.0.1
 
 Jul 2, 2025

docs/source/Setup/Config-HAProxy.md

@@ -157,6 +157,8 @@ We use the `my.awesomegame.com` example here and here are the ports
 - `4001` is the standard Evennia webserver port (firewall closed!)
 - `4002` is the default Evennia websocket port (we use the same number for
   the outgoing wss port, so this should be open in firewall).
+- `4000` is the default Telnet port for Evennia, and we proxy through HAProxy
+  so `7000` can used for Secure Telnet connections instead.
 
 ```shell
 # base stuff to set up haproxy
@@ -187,6 +189,14 @@ listen evennia-secure-websocket
     timeout server 10m
     timeout connect 5m
 
+listen evennia-secure-telnet
+    bind my.awesomegame.com:7000 ssl no-sslv3 no-tlsv10 crt /etc/letsencrypt/live/my.awesomegame.com/my.awesomegame.com.pem
+    server localhost 127.0.0.1:4000
+    mode tcp
+    timeout client 10m
+    timeout server 10m
+    timeout connect 5m
+
 ```
 
 ## Putting it all together

evennia/contrib/game_systems/turnbattle/tb_basic.py

@@ -595,7 +595,7 @@ class CmdFight(Command):
             return
         here.msg_contents("%s starts a fight!" % self.caller)
         # Add a turn handler script to the room, which starts combat.
-        here.scripts.add(self.command_handler_class)
+        here.scripts.add(self.combat_handler_class)
 
 
 class CmdAttack(Command):