Changeset 2d707e3 in sasview for docs/sphinx-docs


Ignore:
Timestamp:
Jun 28, 2015 11:30:09 PM (9 years ago)
Author:
butler
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:
aceae8c
Parents:
22d92da (diff), a15e754 (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://github.com/SasView/sasview.git

Location:
docs/sphinx-docs
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • docs/sphinx-docs/build_sphinx.py

    r9bf64f6 r2fb09c4  
    2727SASVIEW_BUILD = os.path.abspath(os.path.join(CURRENT_SCRIPT_DIR, "..", "..", "build", "lib"+platform)) 
    2828SASVIEW_DOCS = os.path.join(SASVIEW_BUILD, "doc") 
     29SASVIEW_TEST = os.path.join(SASVIEW_SRC, "..", "sasview", "test", "media") 
    2930 
    3031SPHINX_BUILD = os.path.join(CURRENT_SCRIPT_DIR, "build") 
     
    3435SPHINX_SOURCE_MODELS = os.path.join(SPHINX_SOURCE, "user", "models") 
    3536SPHINX_SOURCE_PERSPECTIVES = os.path.join(SPHINX_SOURCE, "user", "perspectives") 
     37SPHINX_SOURCE_TEST = os.path.join(SPHINX_SOURCE, "test") 
    3638 
    3739BUMPS_DOCS = os.path.join(CURRENT_SCRIPT_DIR, "..", "..", "..", 
     
    5557    _remove_dir(SPHINX_SOURCE_MODELS) 
    5658    _remove_dir(SPHINX_SOURCE_PERSPECTIVES) 
     59    _remove_dir(SPHINX_SOURCE_TEST) 
    5760 
    5861def retrieve_user_docs(): 
     
    8790 
    8891            copy_tree(docs, dest_dir) 
     92             
     93    # Now pickup testdata_help.rst 
     94#    print os.path.abspath(SASVIEW_TEST) 
     95#    print os.path.abspath(SPHINX_SOURCE_TEST) 
     96    if os.path.exists(SASVIEW_TEST): 
     97       print "Found docs folder at ", SASVIEW_TEST 
     98       shutil.copytree(SASVIEW_TEST, SPHINX_SOURCE_TEST)        
    8999 
    90100def retrieve_bumps_docs(): 
  • docs/sphinx-docs/source/user/user.rst

    r28812b8 rb69edaa  
    3737   Python Shell Tool <perspectives/calculator/python_shell_help> 
    3838    
    39    Test Data <test/testdata.rst> 
     39   Test Data <../test/testdata_help.rst> 
  • docs/sphinx-docs/source/index.rst

    r8042dbb r22d92da  
    1010   :maxdepth: 1 
    1111 
    12    Model Documentation <user/models/model_functions> 
    13     
    1412   User Documentation <user/user> 
    1513 
Note: See TracChangeset for help on using the changeset viewer.