Changeset e9b1663d in sasmodels for doc

Timestamp:

Mar 23, 2016 3:02:10 PM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

76a9ffe

Parents:

69aa451 (diff), 34edbb8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

pull from master

Location:

doc

Files:

• Makefile (modified) (1 diff)
• conf.py (modified) (2 diffs)
• genmodel.py (modified) (1 diff)
• developer/calculator.rst (added)
• developer/index.rst (modified) (1 diff)

doc/Makefile

@@ -85 +85 @@
 
 clean:
-        -$(RMDIR) _build model api ref/models
+        -$(RMDIR) _build model api ref$(PATHSEP)models
 
 html: build

doc/conf.py

@@ -56 +56 @@
 # General information about the project.
 project = 'SAS Models'
-copyright = '2014, sasview team'
+copyright = '2016, sasview team'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -231 +231 @@
     with open('rst_prolog') as fid:
         rst_prolog = fid.read()
+
+numfig = True
+#numfig_format = {"figure": "Fig. %s", "table": "Table %s", "code-block": "Program %s"}

doc/genmodel.py

@@ -33 +33 @@
     'qx_max'    : 0.5,
     #'colormap'  : 'gist_ncar',
-    'colormap'  : 'jet',
+    'colormap'  : 'nipy_spectral',
+    #'colormap'  : 'jet',
 }
 

doc/developer/index.rst

@@ -3 +3 @@
 ***************************
 
+.. toctree::
+   :numbered: 4
+   :maxdepth: 4
 
+   calculator.rst