Changeset 0741804 in sasview for docs/sphinx-docs


Ignore:
Timestamp:
Apr 11, 2017 5:58:19 AM (8 years ago)
Author:
ajj
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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
083afa1, f028ca9
Parents:
0657b10 (diff), 461a917 (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://www.github.com/sasview/sasview

Location:
docs/sphinx-docs/source/user
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r959eb01 r461a917  
    33.. _tutorial: 
    44 
    5 Tutorial 
    6 ======== 
     5Tutorials 
     6========= 
    77 
    88.. note:: In Windows use [Alt]-[Cursor left] to return to the previous page 
    99 
    10 :download:`Tutorial <../../../../sasview/media/Tutorial.pdf>` 
     10:download:`Getting Started with Sasview <../../../../sasview/media/getting_started_with_sasview.pdf>` 
     11 
     12:download:`Old Tutorial <../../../../sasview/media/Tutorial.pdf>` 

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

    r959eb01 r8cc39d6  
    1515   Test Data <../test/testdata_help.rst> 
    1616       
    17    Tutorial <tutorial.rst> 
     17   Tutorials <tutorial.rst> 
    1818    
    1919   Writing a Plugin Model <sasgui/perspectives/fitting/plugin.rst> 
Note: See TracChangeset for help on using the changeset viewer.