Merge branch 'master' into develop

CODING_STYLE.md

@@ -10,7 +10,7 @@ on your sources.
 
 ## A quick list of code style points
 
- * 4-space indendation, NO TABS!
+ * 4-space indentation, NO TABS!
  * Unix line endings.
  * CamelCase is only used for classes, nothing else.
  * All non-global variable names and all function names are to be

evennia/commands/cmdhandler.py

@@ -572,7 +572,7 @@ def cmdhandler(
             cmd.raw_string = unformatted_raw_string
             # cmd.obj  # set via on-object cmdset handler for each command,
             # since this may be different for every command when
-            # merging multuple cmdsets
+            # merging multiple cmdsets
 
             if _testing:
                 # only return the command instance

evennia/commands/default/syscommands.py

@@ -70,7 +70,7 @@ class SystemNoMatch(COMMAND_DEFAULT_CLASS):
 
 
 #
-# Command called when there were mulitple matches to the command.
+# Command called when there were multiple matches to the command.
 #
 class SystemMultimatch(COMMAND_DEFAULT_CLASS):
     """

evennia/contrib/building_menu.py

@@ -577,7 +577,7 @@ class BuildingMenu(object):
     keys_go_back = ["@"]  # The keys allowing to go back in the menu tree
     sep_keys = "."  # The key separator for menus with more than 2 levels
     joker_key = "*"  # The special key meaning "anything" in a choice key
-    min_shortcut = 1  # The minimum length of shorcuts when `key` is not set
+    min_shortcut = 1  # The minimum length of shortcuts when `key` is not set
 
     def __init__(
         self,

evennia/prototypes/prototypes.py

@@ -691,7 +691,7 @@ def validate_prototype(
                       err=err, protkey=protkey, typeclass=typeclass)
             )
 
-    # recursively traverese prototype_parent chain
+    # recursively traverse prototype_parent chain
 
     for protstring in make_iter(prototype_parent):
         protstring = protstring.lower()