From 1680fe6b84577ebbbf341dc9cf2896bc7c59c251 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Mon, 9 Mar 2015 08:15:44 +0100
Subject: [PATCH] Removed a sectioning marker and updated the coding style file
 to be a little clearer on that.

---
 CODING_STYLE.md            | 26 +++++++++++++++-----------
 evennia/locks/lockfuncs.py |  6 +++---
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/CODING_STYLE.md b/CODING_STYLE.md
index 38a48ca70b..80a8c79079 100644
--- a/CODING_STYLE.md
+++ b/CODING_STYLE.md
@@ -44,9 +44,6 @@ parser will use this to create pretty API documentation.
 
 Modules should all start with at least a few lines of docstring at
 their top describing the contents and purpose of the module.
-Sectioning should not be used - the auto-api will create this
-automatically. Otherwise markdown should be used as needed to format
-the text.
 
 Example of module docstring (top of file):
 
@@ -58,6 +55,12 @@ are useful in the game ...
 """
 ```
 
+Sectioning (`# title`,  `## subtile` etc) should not be used in
+freeform docstrings - this will confuse the sectioning of the auto
+documentation page and the auto-api will create this automatically.
+Use **section** with bold markers if a section is needed. Otherwise
+markdown should be used as needed to format the text.
+
 Code examples should use [multi-line syntax highlighting][markdown-hilight]
 to mark multi-line code blocks, using the "python" identifier. Just
 indenting code blocks (common in markdown) will not produce the
@@ -73,7 +76,7 @@ other text, only code).
 The root class docstring should describe the over-arcing use of the
 class. It should usually not describe the exact call sequence nor list
 important methods, this tends to be hard to keep updated as the API
-develops.
+develops. Don't use section markers (`#`, `##` etc).
 
 Example of class docstring:
 
@@ -148,13 +151,14 @@ Here are all the supported block headers:
 ```
 
 Parts marked with "freeform" means that you can in principle put any
-text there using any formatting except for the indentation to mark
-which block you are part of. You should normally use the specified
-format rather than the freeform counterpart (this will produce nicer
-output) but in some cases the freeform may produce a more compact and
-readable result (such as when describing an `*args` or `**kwargs`
-statement in general terms). The first `self` argument of class methods
-should never be documented. 
+text there using any formatting except for sections markers (`#`, `##`
+etc). You must also keep indentation to mark which block you are part
+of. You should normally use the specified format rather than the
+freeform counterpart (this will produce nicer output) but in some
+cases the freeform may produce a more compact and readable result
+(such as when describing an `*args` or `**kwargs` statement in general
+terms). The first `self` argument of class methods should never be
+documented. 
 
 Note that
 
diff --git a/evennia/locks/lockfuncs.py b/evennia/locks/lockfuncs.py
index 6138630779..4cd7b21a5d 100644
--- a/evennia/locks/lockfuncs.py
+++ b/evennia/locks/lockfuncs.py
@@ -12,7 +12,7 @@ with a lock variable/field, so be careful to not expect
 a certain object type.
 
 
-##Appendix: MUX locks
+**Appendix: MUX locks**
 
 Below is a list nicked from the MUX help file on the locks available
 in standard MUX. Most of these are not relevant to core Evennia since
@@ -29,7 +29,7 @@ DefaultLock:   Exits:          controls who may traverse the exit to
                                its destination.
                                  Evennia: "traverse:<lockfunc()>"
                Rooms:          controls whether the player sees the
-                               SUCC or FAIL message for the room 
+                               SUCC or FAIL message for the room
                                following the room description when
                                looking at the room.
                                  Evennia: Custom typeclass
@@ -58,7 +58,7 @@ DefaultLock:   Exits:          controls who may traverse the exit to
  ParentLock:   All:            controls who may make @parent links to
                                the object.
                                  Evennia: Typeclasses and
-								          "puppet:<lockstring()>"
+                               "puppet:<lockstring()>"
  ReceiveLock:  Players/Things: controls who may give things to the
                                object.
                                  Evennia: