Changeset 9087214 in sasview for docs/sphinx-docs/source/user

Timestamp:

Oct 11, 2016 11:09:47 AM (8 years ago)

Author:

jhbakker

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:

4581ac9, 7949dcf7

Parents:

392056d (diff), 46dfee9 (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 Jurrian1D, fingers crossed!

Location:

docs/sphinx-docs/source/user

Files:

• analysis.rst (modified) (1 diff)
• marketplace.rst (added)
• menu_bar.rst (modified) (3 diffs)
• tools.rst (modified) (1 diff)
• tutorial.rst (modified) (1 diff)
• user.rst (modified) (1 diff)
• working.rst (modified) (1 diff)

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

@@ -1 +1 @@
 .. _analysis:
 
-Types of Analysis
-=================
+Fitting & Other Analyses
+========================
 
 .. note:: In Windows use [Alt]-[Cursor left] to return to the previous page

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

@@ -48 +48 @@
 The Analysis option provides access to the key functionality of *SasView*:
 
-- Fitting;
+- Model Fitting;
 - P(r) Inversion;
 - Invariant Analysis;
@@ -62 +62 @@
 - change optimiser (under Fit Options);
 - view fit parameter correlations, distributions, and convergence traces (under Fit Results);
-- create/edit a Custom Model.
+- create/edit a Plugin Model.
 
 Additional functionality is available under this menu option during particular types of model fitting, including:
@@ -78 +78 @@
 - information on how to acknowledge *SasView* in publications;
 - information about the version of *SasView* you are using;
+- the :ref:`marketplace`\ ;
 - a check to see if there is a more recent version of *SasView*.
+
+.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
+
+.. note::  This help document was last changed by Steve King, 10Oct2016

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

@@ -1 +1 @@
 .. _tools:
 
-Tools
-=====
+Tools & Utilities
+=================
 
 .. note:: In Windows use [Alt]-[Cursor left] to return to the previous page

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

@@ -6 +6 @@
 ========
 
+.. note:: In Windows use [Alt]-[Cursor left] to return to the previous page
+
 :download:`Tutorial <../../../../sasview/media/Tutorial.pdf>`

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

@@ -11 +11 @@
    Menu Bar <menu_bar>
 
-   Analysis <analysis>
+   Fitting & Other Analyses <analysis>
    
-   Tools <tools>
+   Tools & Utilities <tools>
          
    Working with SasView <working>

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

@@ -17 +17 @@
    Tutorial <tutorial.rst>
    
+   Writing a Plugin Model <sasgui/perspectives/fitting/plugin.rst>
+   
    Computations with a GPU <gpu_computations>
    
-   Converting SANS to SESANS <sans_to_sesans>
-   
-   Fitting SESANS Data <sesans_fitting.rst>
-