Changeset 845144e in sasview for docs/sphinx-docs/source/user

Timestamp:

Oct 17, 2018 4:30:31 PM (6 years ago)

Author:

krzywon

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload

Children:

9fb4572

Parents:

b204004 (diff), 67ed543 (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-1111

Location:

docs/sphinx-docs/source/user

Files:

• RELEASE.rst (added)
• tutorial.rst (modified) (2 diffs)

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

@@ -8 +8 @@
 .. note:: In Windows use [Alt]-[Cursor left] to return to the previous page
 
+The following tutorial was written for Version 2.x but is still a useful overview of 
+much of the analysis capability in SasView (but disregard Appendix XIII if using 
+Version 4.2 or later)
+
+:download:`Old Tutorial <sasview/Tutorial.pdf>`
+
+The following tutorials have been written for Version 4.x
+
 :download:`Getting Started with Sasview <sasview/getting_started_with_sasview.pdf>`
 
@@ -14 +22 @@
 :download:`Simultaneous 1D Fitting in Sasview <sasview/simultaneous_1d_fitting_in_sasview_v3x_4x.pdf>`
 
-:download:`Old Tutorial <sasview/Tutorial.pdf>`
+:download:`Correlation Function Analysis in SasView <sasview/correlation_function_analysis_in_sasview_v4x.pdf>`