Changeset f2ea95a in sasview for docs/sphinx-docs/source

Timestamp:

Jun 16, 2017 12:51:12 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

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

Children:

940d034, fca1f50

Parents:

c0ef8da (diff), d9c1551 (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 ticket-510

Location:

docs/sphinx-docs/source

Files:

• user/tutorial.rst (modified) (1 diff)
• user/working.rst (modified) (1 diff)
• rst_prolog (modified) (2 diffs)

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

@@ -3 +3 @@
 .. _tutorial:
 
-Tutorial
-========
+Tutorials
+=========
 
 .. note:: In Windows use [Alt]-[Cursor left] to return to the previous page
 
-:download:`Tutorial <../../../../sasview/media/Tutorial.pdf>`
+:download:`Getting Started with Sasview <../../../../sasview/media/getting_started_with_sasview.pdf>`
+
+:download:`Old Tutorial <../../../../sasview/media/Tutorial.pdf>`

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

@@ -15 +15 @@
    Test Data <../test/testdata_help.rst>
       
-   Tutorial <tutorial.rst>
+   Tutorials <tutorial.rst>
    
    Writing a Plugin Model <sasgui/perspectives/fitting/plugin.rst>

docs/sphinx-docs/source/rst_prolog

@@ -2 +2 @@
 .. Remove |biggamma|, etc. when they are no longer needed.
 
+    .. |alpha| unicode:: U+03B1
+    .. |beta| unicode:: U+03B2
+    .. |gamma| unicode:: U+03B3
+    .. |delta| unicode:: U+03B4
+    .. |epsilon| unicode:: U+03B5
+    .. |zeta| unicode:: U+03B6
+    .. |eta| unicode:: U+03B7
+    .. |theta| unicode:: U+03B8
+    .. |iota| unicode:: U+03B9
+    .. |kappa| unicode:: U+03BA
+    .. |lambda| unicode:: U+03BB
+    .. |mu| unicode:: U+03BC
+    .. |nu| unicode:: U+03BD
+    .. |xi| unicode:: U+03BE
+    .. |omicron| unicode:: U+03BF
+    .. |pi| unicode:: U+03C0
+    .. |rho| unicode:: U+03C1
+    .. |sigma| unicode:: U+03C3
+    .. |tau| unicode:: U+03C4
+    .. |upsilon| unicode:: U+03C5
+    .. |phi| unicode:: U+03C6
+    .. |chi| unicode:: U+03C7
+    .. |psi| unicode:: U+03C8
+    .. |omega| unicode:: U+03C9
 
-.. |alpha| unicode:: U+03B1
-.. |beta| unicode:: U+03B2
-.. |gamma| unicode:: U+03B3
-.. |delta| unicode:: U+03B4
-.. |epsilon| unicode:: U+03B5
-.. |zeta| unicode:: U+03B6
-.. |eta| unicode:: U+03B7
-.. |theta| unicode:: U+03B8
-.. |iota| unicode:: U+03B9
-.. |kappa| unicode:: U+03BA
-.. |lambda| unicode:: U+03BB
-.. |mu| unicode:: U+03BC
-.. |nu| unicode:: U+03BD
-.. |xi| unicode:: U+03BE
-.. |omicron| unicode:: U+03BF
-.. |pi| unicode:: U+03C0
-.. |rho| unicode:: U+03C1
-.. |sigma| unicode:: U+03C3
-.. |tau| unicode:: U+03C4
-.. |upsilon| unicode:: U+03C5
-.. |phi| unicode:: U+03C6
-.. |chi| unicode:: U+03C7
-.. |psi| unicode:: U+03C8
-.. |omega| unicode:: U+03C9
+    .. |biggamma| unicode:: U+0393
+    .. |bigdelta| unicode:: U+0394
+    .. |bigzeta| unicode:: U+039E
+    .. |bigpsi| unicode:: U+03A8
+    .. |bigphi| unicode:: U+03A6
+    .. |bigsigma| unicode:: U+03A3
+    .. |Gamma| unicode:: U+0393
+    .. |Delta| unicode:: U+0394
+    .. |Zeta| unicode:: U+039E
+    .. |Psi| unicode:: U+03A8
+
+    .. |drho| replace:: |Delta|\ |rho|
+
+    .. |equiv| unicode:: U+2261
+    .. |noteql| unicode:: U+2260
+    .. |TM| unicode:: U+2122
 
 
-.. |biggamma| unicode:: U+0393
-.. |bigdelta| unicode:: U+0394
-.. |bigzeta| unicode:: U+039E
-.. |bigpsi| unicode:: U+03A8
-.. |bigphi| unicode:: U+03A6
-.. |bigsigma| unicode:: U+03A3
-.. |Gamma| unicode:: U+0393
-.. |Delta| unicode:: U+0394
-.. |Zeta| unicode:: U+039E
-.. |Psi| unicode:: U+03A8
 
-
-.. |drho| replace:: |Delta|\ |rho|
 .. |Ang| unicode:: U+212B
 .. |Ang^-1| replace:: |Ang|\ :sup:`-1`
@@ -60 +64 @@
 .. |A2| replace:: A\ :sub:`2`\
 
-
-.. |equiv| unicode:: U+2261
-.. |noteql| unicode:: U+2260
-.. |TM| unicode:: U+2122
-
-
 .. |cdot| unicode:: U+00B7
 .. |deg| unicode:: U+00B0