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


Ignore:
Timestamp:
Jun 29, 2015 4:13:16 PM (9 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, 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:
60d08fd
Parents:
eddf6af5 (diff), 5a73356a (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 github.com:sasview/sasview

Location:
docs/sphinx-docs/source
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed

  • docs/sphinx-docs/source/conf.py

    reddf6af5 rf4c0513  
    5353# General information about the project. 
    5454project = u'SasView' 
    55 copyright = u'2013, The SasView Project' 
     55copyright = u'2015, The SasView Project' 
    5656 
    5757# The version info for the project you're documenting, acts as replacement for 
    … …  
    6060# 
    6161# The short X.Y version. 
    62 version = '3.0.0' 
     62version = '3.1.0' 
    6363# The full version, including alpha/beta/rc tags. 
    64 release = '3.0.0' 
     64release = '3.1.0' 
    6565 
    6666# The language for content autogenerated by Sphinx. Refer to documentation 

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

    r8042dbb r5a73356a  
    44   contain the root `toctree` directive. 
    55 
    6 SasView Documentation 
    7 ===================== 
     6SasView Documentation Index 
     7=========================== 
    88 
    99.. toctree:: 
    1010   :maxdepth: 1 
    1111 
    12    Model Documentation <user/models/model_functions> 
    13     
    1412   User Documentation <user/user> 
    1513 

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

    r28812b8 r2e5ca08  
    1 User Documentation 
    2 ================== 
     1SasView User Documentation 
     2========================== 
     3 
     4.. note:: In Windows use [Alt]-[Cursor left] to return to the previous page 
    35 
    46.. toctree:: 
    … …  
    3739   Python Shell Tool <perspectives/calculator/python_shell_help> 
    3840    
    39    Test Data <test/testdata.rst> 
     41   Test Data <../test/testdata_help.rst> 
Note: See TracChangeset for help on using the changeset viewer.