Changeset 9a15a87 in sasview for docs/sphinx-docs/source

Timestamp:

Aug 22, 2016 2:08:36 AM (8 years ago)

Author:

lewis

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

c97d76a

Parents:

6f343e3 (diff), 525aaa2 (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' into corfunc

Location:

docs/sphinx-docs/source

Files:

• conf.py (modified) (1 diff)
• user/analysis.rst (modified) (1 diff)
• user/sasgui/perspectives/corfunc/corfunc_help.rst (added)
• user/sasgui/perspectives/corfunc/fig1.gif (added)
• user/sasgui/perspectives/corfunc/fig2.gif (added)
• user/sasgui/perspectives/corfunc/tutorial1.png (added)
• user/sasgui/perspectives/corfunc/tutorial2.png (added)
• user/sasgui/perspectives/corfunc/tutorial3.png (added)

docs/sphinx-docs/source/conf.py

@@ -62 +62 @@
 version = '4.0.0'
 # The full version, including alpha/beta/rc tags.
-release = '4.0.0-alpha'
+release = '4.0.0-beta'
 
 # The language for content autogenerated by Sphinx. Refer to documentation

docs/sphinx-docs/source/user/analysis.rst

@@ -6 +6 @@
 .. toctree::
    :maxdepth: 1
-   
+
    Model Fitting <sasgui/perspectives/fitting/fitting>
-   
+
    P(r) Inversion <sasgui/perspectives/pr/pr_help>
-   
+
    Invariant Calculation <sasgui/perspectives/invariant/invariant_help>
+
+   Correlation Function <sasgui/perspectives/corfunc/corfunc_help>