Changeset 3931ea14 in sasview for docs/sphinx-docs/source/user

Timestamp:

Aug 4, 2016 3:55:03 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:

18e7309, fcba29a

Parents:

a3c538e1 (diff), db74ee8 (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 file-converter

Location:

docs/sphinx-docs/source/user

Files:

• sasgui/perspectives/file_converter/file_converter_help.rst (added)
• tools.rst (modified) (1 diff)

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

@@ -8 +8 @@
 
    Data Operations Utility <sasgui/perspectives/calculator/data_operator_help>
-      
+
    Density/Volume Calculator <sasgui/perspectives/calculator/density_calculator_help>
-   
+
    Generic SANS Calculator <sasgui/perspectives/calculator/sas_calculator_help>
-   
+
    Image Viewer <sasgui/perspectives/calculator/image_viewer_help>
-   
+
    Kiessig Thickness Calculator <sasgui/perspectives/calculator/kiessig_calculator_help>
-   
+
    SLD Calculator <sasgui/perspectives/calculator/sld_calculator_help>
-   
+
    Slit Size Calculator <sasgui/perspectives/calculator/slit_calculator_help>
-   
+
    Q Resolution Estimator <sasgui/perspectives/calculator/resolution_calculator_help>
-   
+
    Python Shell <sasgui/perspectives/calculator/python_shell_help>
-   
+
+   File Converter <sasgui/perspectives/file_converter/file_converter_help>