Merge branch 'master' into jkarni/docs-merge

Conflicts: docs/source/conf.py
2013-07-30 10:23:35 -04:00
parent 2540be2442 77a796e2c7
commit c0f6ec6cf5
1075 changed files with 42550 additions and 25704 deletions
--- a/docs/developers/source/lms.rst
+++ b/docs/developers/source/lms.rst
@@ -276,34 +276,6 @@ Psychoanalyze
    :members:
    :show-inheritance:

-Simple wiki
-===========
-
-.. automodule:: simplewiki
-    :members:
-    :show-inheritance:
-
-Models
------
-
-.. automodule:: simplewiki.models
-    :members:
-    :show-inheritance:
-
-Views
-----
-
-.. automodule:: simplewiki.views
-    :members:
-    :show-inheritance:
-
-Tests
-----
-
-.. automodule:: simplewiki.tests
-    :members:
-    :show-inheritance:
-

 Static template view
 ====================