- Timestamp:
- Mar 20, 2016 6:04:20 PM (9 years ago)
- 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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- 832fea2
- Parents:
- 9e531f2 (diff), 5f5c596 (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. - Location:
- docs/sphinx-docs/source/user
- Files:
-
- 5 edited
-
sasgui/perspectives/fitting/fitting.rst (modified) (1 diff)
-
sasgui/perspectives/invariant/invariant_help.rst (modified) (1 diff)
-
sasgui/perspectives/pr/pr_help.rst (modified) (1 diff)
-
shape-cylinder.rst (modified) (1 diff)
-
shape-sphere.rst (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
docs/sphinx-docs/source/user/sasgui/perspectives/fitting/fitting.rst
re2c22b5 r5f5c596 1 1 .. _Fitting_Documentation: 2 2 3 Model Fitting 4 ============= 3 Fitting Documentation 4 ===================== 5 5 6 6 .. toctree:: -
docs/sphinx-docs/source/user/sasgui/perspectives/invariant/invariant_help.rst
r8dcc9bc6 r5f5c596 4 4 .. by S King, ISIS, during SasView CodeCamp-III in Feb 2015. 5 5 6 Invariant Calculation 7 ===================== 6 Invariant Calculation Perspective 7 ================================= 8 8 9 9 Description -
docs/sphinx-docs/source/user/sasgui/perspectives/pr/pr_help.rst
rca5f55f r5f5c596 4 4 .. by S King, ISIS, during SasView CodeCamp-III in Feb 2015. 5 5 6 P(r) Inversion 7 ============== 6 P(r) Inversion Perspective 7 ========================== 8 8 9 9 Description -
docs/sphinx-docs/source/user/shape-cylinder.rst
r9dcd5ed rc90bce6 17 17 models/hollow_cylinder.rst 18 18 models/pearl_necklace.rst 19 models/pringle.rst 19 20 models/stacked_disks.rst -
docs/sphinx-docs/source/user/shape-sphere.rst
re565eaf re4ca2eb 13 13 models/linear_pearls.rst 14 14 models/multi_shell.rst 15 models/onion.rst 15 16 models/raspberry.rst 16 17 models/sphere.rst
Note: See TracChangeset
for help on using the changeset viewer.
