Changeset b3133fd in sasview for docs

Timestamp:

Feb 13, 2015 4:08:07 AM (9 years ago)

Author:

krzywon

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

b3efb7d, a7dcc95

Parents:

7a04dbb (diff), 8042dbb (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:

Merge branch 'master' of ​https://github.com/SasView/sasview

Location:

docs/sphinx-docs

Files:

• source/index.rst (modified) (1 diff)
• build_sphinx.py (modified) (1 diff)
• source/conf.py (modified) (1 diff)

docs/sphinx-docs/source/index.rst

@@ -10 +10 @@
    :maxdepth: 1
 
+   Model Documentation <user/models/model_functions>
+   
    User Documentation <user/user>
 

docs/sphinx-docs/build_sphinx.py

@@ -46 +46 @@
     example:
 
-        sans/../[MODULE]/media/dir/A.rst
-        sans/../[MODULE]/media/B.rst
+        sas/../[MODULE]/media/dir/A.rst
+        sas/../[MODULE]/media/B.rst
 
     gets copied to a new location:

docs/sphinx-docs/source/conf.py

@@ -79 +79 @@
 # that we don't get various "ImportError: No module named ___" when
 # running Sphinx.
-exclude_patterns = ["*sans.perspectives.simulation.rst",
-                    "*sans.pr.c_extensions.rst",
-                    "*sans.realspace.rst",
-                    "*sans.simulation.rst",
+exclude_patterns = ["*sas.perspectives.simulation.rst",
+                    "*sas.pr.c_extensions.rst",
+                    "*sas.realspace.rst",
+                    "*sas.simulation.rst",
                     "*park.fitmc.rst",
                     "*park.fitservice.rst",
                     "*park.parksnob.rst",
                     "*park.rangemap.rst",
-                    "*sans.sansview.setup_exe.rst",
-                    "*sans.sansview.setup_mac.rst",
-                    "*sans.guiframe.custom_pstats.rst", # pstats not in standard library on Ubuntu out of the box
+                    "*sas.sasview.setup_exe.rst",
+                    "*sas.sasview.setup_mac.rst",
+                    "*sas.guiframe.custom_pstats.rst", # pstats not in standard library on Ubuntu out of the box
                     ]