openedx · auraz · Jun 20, 2013 · Jun 11, 2013 · Jun 12, 2013 · Jun 12, 2013
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -5,6 +5,8 @@ These are notable changes in edx-platform.  This is a rolling list of changes,
 in roughly chronological order, most recent first.  Add your entries at or near
 the top.  Include a label indicating the component affected.
 
+Common: Repairs development documentation generation by sphinx.
+
 LMS: Problem rescoring.  Added options on the Grades tab of the
 Instructor Dashboard to allow all students' submissions for a
 particular problem to be rescored.  Also supports resetting all

diff --git a/common/lib/capa/capa/checker.py b/common/lib/capa/capa/checker.py
@@ -12,8 +12,8 @@
 from cStringIO import StringIO
 from collections import defaultdict
 
-from .calc import UndefinedVariable
-from .capa_problem import LoncapaProblem
+from calc import UndefinedVariable
+from capa.capa_problem import LoncapaProblem
 from mako.lookup import TemplateLookup
 
 logging.basicConfig(format="%(levelname)s %(message)s")

diff --git a/doc/public/course_data_formats/conditional_module/conditional_module.rst b/doc/public/course_data_formats/conditional_module/conditional_module.rst
@@ -53,7 +53,7 @@ Examples of conditional depends on poll
     </conditional>
 
 Examples of conditional depends on poll (use <show> tag)
--------------------------------------------
+--------------------------------------------------------
 
 .. code-block:: xml
 

diff --git a/doc/public/course_data_formats/drag_and_drop/drag_and_drop_input.rst b/doc/public/course_data_formats/drag_and_drop/drag_and_drop_input.rst
@@ -420,6 +420,6 @@ Draggables can be reused
 .. literalinclude:: drag-n-drop-demo2.xml
 
 Examples of targets on draggables
-------------------------
+---------------------------------
 
 .. literalinclude:: drag-n-drop-demo3.xml
diff --git a/doc/public/course_data_formats/graphical_slider_tool/graphical_slider_tool.rst b/doc/public/course_data_formats/graphical_slider_tool/graphical_slider_tool.rst
@@ -362,7 +362,7 @@ that has to be updated on a parameter's change, then one can define
 a special function to handle this. The "output" of such a function must be
 set to "none", and the JavaScript code inside this function must update the
 MathJax element by itself. Before exiting, MathJax typeset function should
-be called so that the new text will be re-rendered by MathJax. For example,
+be called so that the new text will be re-rendered by MathJax. For example::
 
     <render>
         ...

diff --git a/doc/public/course_data_formats/symbolic_response.rst b/doc/public/course_data_formats/symbolic_response.rst
@@ -19,11 +19,11 @@ This is a partial list of features, to be revised as we go along:
 
       An example of a problem::
 
-      <symbolicresponse expect="a_b^c + b_x__d" size="30">
-        <textline math="1"
+        <symbolicresponse expect="a_b^c + b_x__d" size="30">
+          <textline math="1"
            preprocessorClassName="SymbolicMathjaxPreprocessor"
            preprocessorSrc="/static/js/capa/symbolic_mathjax_preprocessor.js"/>
-      </symbolicresponse>
+        </symbolicresponse>
 
       It's a bit of a pain to enter that.
 

diff --git a/doc/public/index.rst b/doc/public/index.rst
@@ -28,6 +28,7 @@ Specific Problem Types
    course_data_formats/conditional_module/conditional_module.rst
    course_data_formats/word_cloud/word_cloud.rst
    course_data_formats/custom_response.rst
+   course_data_formats/symbolic_response.rst
 
 
 Internal Data Formats

diff --git a/docs/source/calc.rst b/docs/source/calc.rst
@@ -0,0 +1,7 @@
+*******************************************
+Calc
+*******************************************
+
+.. automodule:: calc
+    :members:
+    :show-inheritance:
diff --git a/docs/source/capa.rst b/docs/source/capa.rst
@@ -8,14 +8,6 @@ Contents:
 .. toctree::
     :maxdepth: 2
 
-    chem.rst
-
-Calc
-====
-
-.. automodule:: capa.calc
-    :members:
-    :show-inheritance:
 
 Capa_problem
 ============

diff --git a/docs/source/chem.rst b/docs/source/chem.rst
@@ -1,13 +1,13 @@
 *******************************************
-Chem module
+Chemistry modules
 *******************************************
 
 .. module:: chem
 
 Miller
 ======
 
-.. automodule:: capa.chem.miller
+.. automodule:: chem.miller
     :members:
     :show-inheritance:
 
@@ -47,22 +47,22 @@ Documentation from **crystallography.js**::
 Chemcalc
 ========
 
-.. automodule:: capa.chem.chemcalc
+.. automodule:: chem.chemcalc
     :members:
     :show-inheritance:
 
 Chemtools
 =========
 
-.. automodule:: capa.chem.chemtools
+.. automodule:: chem.chemtools
     :members:
     :show-inheritance:
 
 
 Tests
 =====
 
-.. automodule:: capa.chem.tests
+.. automodule:: chem.tests
     :members:
     :show-inheritance:
 

diff --git a/docs/source/cms.rst b/docs/source/cms.rst
@@ -4,86 +4,3 @@ CMS module
 
 .. module:: cms
 
-Auth
-====
-
-.. automodule:: auth
-    :members:
-    :show-inheritance:
-
-Authz
------
-
-.. automodule:: auth.authz
-    :members:
-    :show-inheritance:
-
-Content store
-=============
-
-.. .. automodule:: contentstore
-..     :members:
-..     :show-inheritance:
-
-.. Utils
-.. -----
-
-.. .. automodule:: contentstore.untils
-..     :members:
-..     :show-inheritance:
-
-.. Views
-.. -----
-
-.. .. automodule:: contentstore.views
-..     :members:
-..     :show-inheritance:
-
-.. Management
-.. ----------
-
-.. .. automodule:: contentstore.management
-..     :members:
-..     :show-inheritance:
-
-.. Tests
-.. -----
-
-.. .. automodule:: contentstore.tests
-..     :members:
-..     :show-inheritance:
-
-Github sync
-===========
-
-.. automodule:: github_sync
-    :members:
-    :show-inheritance:
-
-Exceptions
-----------
-
-.. automodule:: github_sync.exceptions
-    :members:
-    :show-inheritance:
-
-Views
------
-
-.. automodule:: github_sync.views
-    :members:
-    :show-inheritance:
-
-Management
-----------
-
-.. automodule:: github_sync.management
-    :members:
-    :show-inheritance:
-
-Tests
------
-
-.. .. automodule:: github_sync.tests
-..     :members:
-..     :show-inheritance:
diff --git a/docs/source/common-lib.rst b/docs/source/common-lib.rst
@@ -6,4 +6,9 @@ Contents:
    :maxdepth: 2
 
    xmodule.rst
-   capa.rst
+   capa.rst
+   chem.rst
+   sandbox-packages.rst
+   symmath.rst
+   calc.rst
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -53,7 +53,7 @@ Examples of conditional depends on poll @@
         </conditional>
     Examples of conditional depends on poll (use <show> tag)
-    -------------------------------------------
+    --------------------------------------------------------
     .. code-block:: xml
@@ Expand Down @@