From eaa4ef8a201896059e2454fb5decd106dcb87b05 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Mon, 7 Nov 2011 14:22:21 +0100
Subject: [PATCH 1/2] Fixed an overly-zealous python module check for a module
 that was optional.

---
 game/evennia.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/game/evennia.py b/game/evennia.py
index 05032b372..12d77e61d 100755
--- a/game/evennia.py
+++ b/game/evennia.py
@@ -420,7 +420,7 @@ def error_check_python_modules():
     imp(settings.SEARCH_AT_RESULT)
     imp(settings.SEARCH_AT_MULTIMATCH_INPUT)
     imp(settings.CONNECTION_SCREEN_MODULE, split=False)
-    imp(settings.AT_INITIAL_SETUP_HOOK_MODULE, split=False)
+    #imp(settings.AT_INITIAL_SETUP_HOOK_MODULE, split=False)
     for path in settings.LOCK_FUNC_MODULES:
         imp(path, split=False)
     # cmdsets

From ffb73cdb31a1ce11744b646da41a8052b80af3cd Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Mon, 7 Nov 2011 16:49:02 +0100
Subject: [PATCH 2/2] Fixing the documentation for the latest contrib models.

---
 contrib/chargen.py    | 19 +++++++++++--------
 contrib/menu_login.py |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/contrib/chargen.py b/contrib/chargen.py
index 9609d3f54..27d552b25 100644
--- a/contrib/chargen.py
+++ b/contrib/chargen.py
@@ -17,16 +17,19 @@ Installation:
 Import this module in game.gamesrc.basecmdset and
 add the following line to the end of OOCCmdSet's at_cmdset_creation():
    
-   self.add(character_creation.OOCCmdSetExtended)
+   self.add(character_creation.OOCCmdSetCharGen)
 
-You could also add/edit this line to your game/settings.py file: 
 
-CMDSET_OOC = "contrib.character_creation.OOCCmdSetExtended"
+If you have a freshly installed database you could also instead add/edit 
+this line to your game/settings.py file: 
 
-(uncomment the super() statement in OOCCmdSetExtended in this case
-too) This will however only affect NEWLY created players, not those
-already in the game, so you'd usually only do this if you are starting
-from scratch.
+CMDSET_OOC = "contrib.character_creation.OOCCmdSetCharGen"
+
+This will replace the default OOCCmdset to look to this module 
+instead of the one in game.gamesrc.basecmdset. If you do this, uncomment 
+the super() statement in OOCCmdSetCharGen (end of this file) too. This will 
+however only affect NEWLY created players, not those already in the game, which i
+s why you'd usually only do this if you are starting from scratch.
 
 """
 
@@ -190,7 +193,7 @@ class OOCCmdSetCharGen(OOCCmdSet):
     """    
     def at_cmdset_creation(self):
         "Install everything from the default set, then overload"
-        super(OOCCmdSetCharGen, self).at_cmdset_creation()
+        #super(OOCCmdSetCharGen, self).at_cmdset_creation()
         self.add(CmdOOCLook())
         self.add(CmdOOCCharacterCreate())
 
diff --git a/contrib/menu_login.py b/contrib/menu_login.py
index e82ca5b37..a52407a1b 100644
--- a/contrib/menu_login.py
+++ b/contrib/menu_login.py
@@ -15,7 +15,7 @@ Install is simple:
 
 To your settings file, add/edit the line:
 
-CMDSET_UNLOGGEDIN = "contrib.alt_login.UnloggedInCmdSet"
+CMDSET_UNLOGGEDIN = "contrib.menu_login.UnloggedInCmdSet"
 
 That's it. The cmdset in this module will now be used instead of the
 default one.