Changeset 9087214 in sasview for docs/sphinx-docs


Ignore:
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
Files:
1 added
1 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • docs/sphinx-docs/source/dev/dev.rst

    r476d4e3 re8447d8  
    11Developer Documentation 
    22======================= 
     3 
     4.. note:: In Windows use [Alt]-[Cursor left] to return to the previous page 
    35 
    46Contents 

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

    r8d3d20a r46dfee9  
    11.. _analysis: 
    22 
    3 Types of Analysis 
    4 ================= 
     3Fitting & Other Analyses 
     4======================== 
    55 
    66.. note:: In Windows use [Alt]-[Cursor left] to return to the previous page 

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

    rec860a8f r46dfee9  
    4848The Analysis option provides access to the key functionality of *SasView*: 
    4949 
    50 - Fitting; 
     50- Model Fitting; 
    5151- P(r) Inversion; 
    5252- Invariant Analysis; 
    … …  
    6262- change optimiser (under Fit Options); 
    6363- view fit parameter correlations, distributions, and convergence traces (under Fit Results); 
    64 - create/edit a Custom Model. 
     64- create/edit a Plugin Model. 
    6565 
    6666Additional functionality is available under this menu option during particular types of model fitting, including: 
    … …  
    7878- information on how to acknowledge *SasView* in publications; 
    7979- information about the version of *SasView* you are using; 
     80- the :ref:`marketplace`\ ; 
    8081- a check to see if there is a more recent version of *SasView*. 
     82 
     83.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
     84 
     85.. note::  This help document was last changed by Steve King, 10Oct2016 

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

    r3150541 r46dfee9  
    11.. _tools: 
    22 
    3 Tools 
    4 ===== 
     3Tools & Utilities 
     4================= 
    55 
    66.. note:: In Windows use [Alt]-[Cursor left] to return to the previous page 

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

    rec860a8f re8447d8  
    66======== 
    77 
     8.. note:: In Windows use [Alt]-[Cursor left] to return to the previous page 
     9 
    810:download:`Tutorial <../../../../sasview/media/Tutorial.pdf>` 

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

    rbdae317 r46dfee9  
    1111   Menu Bar <menu_bar> 
    1212 
    13    Analysis <analysis> 
     13   Fitting & Other Analyses <analysis> 
    1414    
    15    Tools <tools> 
     15   Tools & Utilities <tools> 
    1616          
    1717   Working with SasView <working> 

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

    r751f4bd r46dfee9  
    1717   Tutorial <tutorial.rst> 
    1818    
     19   Writing a Plugin Model <sasgui/perspectives/fitting/plugin.rst> 
     20    
    1921   Computations with a GPU <gpu_computations> 
    2022    
    21    Converting SANS to SESANS <sans_to_sesans> 
    22     
    23    Fitting SESANS Data <sesans_fitting.rst> 
    24     
Note: See TracChangeset for help on using the changeset viewer.