Index: docs/sphinx-docs/build_sphinx.py
===================================================================
--- docs/sphinx-docs/build_sphinx.py	(revision 9bf64f65441fe276eb820729b6f98aa17921310c)
+++ docs/sphinx-docs/build_sphinx.py	(revision 2fb09c45b38fabcf2370ba6a7b104a494ed35de3)
@@ -27,4 +27,5 @@
 SASVIEW_BUILD = os.path.abspath(os.path.join(CURRENT_SCRIPT_DIR, "..", "..", "build", "lib"+platform))
 SASVIEW_DOCS = os.path.join(SASVIEW_BUILD, "doc")
+SASVIEW_TEST = os.path.join(SASVIEW_SRC, "..", "sasview", "test", "media")
 
 SPHINX_BUILD = os.path.join(CURRENT_SCRIPT_DIR, "build")
@@ -34,4 +35,5 @@
 SPHINX_SOURCE_MODELS = os.path.join(SPHINX_SOURCE, "user", "models")
 SPHINX_SOURCE_PERSPECTIVES = os.path.join(SPHINX_SOURCE, "user", "perspectives")
+SPHINX_SOURCE_TEST = os.path.join(SPHINX_SOURCE, "test")
 
 BUMPS_DOCS = os.path.join(CURRENT_SCRIPT_DIR, "..", "..", "..",
@@ -55,4 +57,5 @@
     _remove_dir(SPHINX_SOURCE_MODELS)
     _remove_dir(SPHINX_SOURCE_PERSPECTIVES)
+    _remove_dir(SPHINX_SOURCE_TEST)
 
 def retrieve_user_docs():
@@ -87,4 +90,11 @@
 
             copy_tree(docs, dest_dir)
+            
+    # Now pickup testdata_help.rst
+#    print os.path.abspath(SASVIEW_TEST)
+#    print os.path.abspath(SPHINX_SOURCE_TEST)
+    if os.path.exists(SASVIEW_TEST):
+       print "Found docs folder at ", SASVIEW_TEST
+       shutil.copytree(SASVIEW_TEST, SPHINX_SOURCE_TEST)       
 
 def retrieve_bumps_docs():
Index: docs/sphinx-docs/source/test/testdata_help.rst
===================================================================
--- docs/sphinx-docs/source/test/testdata_help.rst	(revision 2fb09c45b38fabcf2370ba6a7b104a494ed35de3)
+++ docs/sphinx-docs/source/test/testdata_help.rst	(revision 2fb09c45b38fabcf2370ba6a7b104a494ed35de3)
@@ -0,0 +1,27 @@
+.. testdata_help.rst
+
+Test Data
+=========
+
+Test data sets are included as a convenience to our users. Look in the \test 
+sub-folder in your SasView installation folder.
+
+The data sets are organized based on their data structure; 1D data, 2D data, 
+SASVIEW saved states, and data in formats that are not yet implemented but 
+which are in the works for future versions.
+
+1D data sets have at least two columns of data with Intensity (assumed 
+absolute units) on the Y-axis and Q on the X-axis. 
+
+2D data sets are data sets that give the deduced intensity for each detector 
+pixel. Depending on the file extension, uncertainty and meta data may also be 
+available.
+
+Saved states are projects and analyses saved by the SasView program. A single 
+analysis file contains the data and parameters for a single fit (.fit), p(r) 
+inversion (.pr), or invariant calculation (.inv). A project file (.svs) contains 
+the results for every active analysis.
+
+.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
+
+.. note::  This help document was last changed by Steve King, 17Jun2015
Index: docs/sphinx-docs/source/user/user.rst
===================================================================
--- docs/sphinx-docs/source/user/user.rst	(revision 28812b8c479e622f069e76c620af8135f55e76f9)
+++ docs/sphinx-docs/source/user/user.rst	(revision b69edaa13c163f3d750f96a4fadc26a74a028f55)
@@ -37,3 +37,3 @@
    Python Shell Tool <perspectives/calculator/python_shell_help>
    
-   Test Data <test/testdata.rst>
+   Test Data <../test/testdata_help.rst>
Index: sasview/README.txt
===================================================================
--- sasview/README.txt	(revision 42dbcfb416b9f03388ec270f7769cd40aa9fb35c)
+++ sasview/README.txt	(revision d47b9ce111606e7ec986edb683939984a93a9919)
@@ -2,285 +2,308 @@
 =============
 
-SasView 3.1.0
-    -The documentation/help has had a complete overhaul including
-      - A completely new interface.
-      - The text has had a clean-up and been brought up to date with the latest
-        features.
-      - A Help (or sometimes ?) button has been added to every panel, and some
-        sub panels if appropriate, linking to the appropriate section in the
-        documentation.
-      - The model help has been split so that the details button now brings up
-        a very short pop-up giving the equation being used while HELP goes to 
-        the section in the full documentation describing the model.
-      - Extensive help has also been added for the new optimizer engine (see 
-        below) including rules of thumb on how and when to choose a given
-        optimizer and what the parameter do.
-    - The optimizer package has been completely replaced.  The new optimizer
-      still defaults to the standard Levenberg-Marquardt algorithm.  However 4
-      other optimizers are now available. Each starts with a set of default
-      parameters which can be tuned.  The DREAM optimizer takes the longest but
-      is the most powerful and yields rich information including full parameter
-      correlation and uncertainty plots.  A results panel has been added to
-      accommodate this.  The five optimizers are:
-      - A Levenberg-Marquardt optimizer
-      - A Quasi-Newton BFGS optimizer
-      - A Nelder-Mead Simplex optimizer
-      - A Differential Evolution optimizer
-      - A Monte Carlo optimizer DREAM optimizer 
-    - Several new models added (what are they)
-    - Infrastructure to allow SESANS data to bit fit with models in a future
-      release was added and can currently be used from command line with some
-      caveats.
-    - A number of bugs were fixed including a thread crashing issue and a
-      incorrect resolution slit smearing.
-    - Implemented much more robust error logging to better enable much easier
-      debugging in general and particularly debugging an issue reported by
-      SasView user.
-    - A number of infrastructure tasks under the hood to enhance maintainability
-      - Upgrade from Wx 2.9 to 3.0.2 which allows several new features but
-        required significant other rework as well.
-      - Fully implemented Sphinx to the build process to produce both better
-        user documentation and developer documentation.
-      - Restructuring of code base to more unified nomenclature and structure
-        so that source installation tree more closely matches the installer
-        version tree.
-      - Code cleanup (an ongoing task) 
-      - Migration of repository to github simplifying contributions from
-        non-project personnel through pull requests
-
-
-    - New in Version 3.0.0
-      - The GUI look and feel has been refactored to be more familiar for
-        Windows users by using MDI frames. Graph windows are also now free-
-        floating.
-      - Five new models have been added: PringlesModel, CoreShellEllipsoidXTModel,
-        RectangularPrismModel, RectangularHollowPrismModel and 
-        RectangularHollowPrismInfThinWallsModel.
-      - The data loader now supports ILL DAT data files and reads the full meta 
-        information from canSAS file formats.
-      - Redefined convention for specifying angular parameters for anisotropic
-        models.
-      - A number of minor features have been added such as permitting a log 
-        distribution of points when using a model to simulate data, and the 
-        addition of a Kratky plot option to the linear plots.
-      - A number of bugs have also been fixed.
-      - Save Project and Save Analysis now work more reliably.
-      - BETA: Magnetic contrast supporting full polarization analysis has been 
-            implemented for some spherical and cylindrical models.
-      - BETA: Two new tools have been added:
-            * A generic scattering calculator which takes an atomic, magnetic or 
-              SLD distribution in space and generates the appropriate 2D 
-              scattering pattern. In some cases the orientationally averaged 
-              (powder) 1D scattering can also be computed. Supported formats 
-              include: SLD or text, PDB, and OMF magnetic moment distribution 
-              file.
-            * An image viewer/converter for data in image format; this reads in 
-              an image file and will attempt to convert the image pixels to 
-              data. Supported formats include: TIFF, TIF, PNG, BMP, JPG.
-
-    - New in Version 2.2.1
-      - Minor patch to support CanSAS XML v1.1 file format
-      - Added DataInfo for data in the DataExplorer and plots
-      - Added Maximize/Restore button in the title bar of the graphs
-      - Added a hide button in the toolbar of the graph panel
-      - The 'x' button now deletes a graph
-      - Edit SUM Model from the menubar can now generate and save more than one sum model
-      - Reports can now be saved in pdf format on WIN and MAC
-      - Made significant improvements to the batch/grid panel and fixed several bugs
-      - Fixed a number of other minor bugs
-
-    - New in Version 2.2.0
-      - Application name changed to SasView
-      - New fully customizable Category Manager added for better management of
-        increasing number of models
-      - Improved the Grid Window functionality in the batch fitting mode
-      - Added a simpler Graph/Plot modification interface
-      - Added a new 'Data Operation' tool for addition, subtraction, multiplication,
-        division, of two data sets.
-      - The 'Sum Model' editor was extended and renamed 'Summation and Multiplication'
-        editor
-      - Added more plot symbols options for 1d plots
-      - Added improved trapping of compiling errors to the 'New model editor'
-      - Added some intelligent outputs (e.g., Rg, background, or rod diameter depending on the choice of axis scale of the plot) to the linear fits
-      - Added more models
-
-    - Feature set from Previous Versions: 	
+1- Features
+===========
+
+   - New in Version 3.1.0
+     --------------------
+     - The documentation/help has had a complete overhaul including:
+       - A completely new presentation interface (Sphinx).
+       - Proof reading!
+       - Updating for latest features.
+       - A Help (or sometimes ?) button has been added to every panel, and some
+         sub panels if appropriate, linking to the appropriate section in the
+         documentation.
+       - The model help has been split so that the Details button now brings up
+         a very short pop-up giving the equation being used while HELP goes to 
+         the section in the full documentation describing the model.
+       - Extensive help has also been added for the new optimizer engine (see 
+         below) including rules of thumb on how and when to choose a given
+         optimizer and what the parameters do.
+     - The optimizer engine has been completely replaced. The new optimizer
+       still defaults to the standard Levenberg-Marquardt algorithm. However 4
+       other optimizers are now also available. Each starts with a set of default
+       parameters which can be tuned. The DREAM optimizer takes the longest but
+       is the most powerful and yields rich information including full parameter
+       correlation and uncertainty plots. A results panel has been added to
+       accommodate this.
+       - The five new optimizers are:
+         - A Levenberg-Marquardt optimizer
+         - A Quasi-Newton BFGS optimizer
+         - A Nelder-Mead Simplex optimizer
+         - A Differential Evolution optimizer
+         - A Monte Carlo optimizer (DREAM) 
+     - New models were added:
+         - MicelleSphCoreModel (currently residing in the Uncategorized category)
+     - Existing models were updated:
+         - RectangularPrismModel
+         - RectangularHollowPrismModel
+         - RectangularHollowPrismInfThinWallsModel
+     - Infrastructure to allow SESANS data to be fit with models was added. This
+       will become available in a future release but can currently be used from 
+       the command line with some caveats.
+     - A number of bugs were fixed including a thread crashing issue and an
+       incorrect slit smearing resolution calculation.
+     - Implemented much more robust error logging to enable much easier
+       debugging in general but particularly the debugging of issues reported by
+       SasView users.
+     - A number of infrastructure tasks under the hood to enhance maintainability
+     - Upgrade from Wx 2.8 to Wx 3.0.2 which allows several new features but
+       required significant additional rework as well.
+     - Fully implemented Sphinx to the build process to produce both better
+       user documentation and developer documentation.
+     - Restructuring of the code base to more unified nomenclature and structure
+       so that the source installation tree more closely matches the installer
+       version tree.
+     - Code cleanup (an ongoing task) .
+     - Migration of the repository to github simplifying contributions from
+       non-project personnel through pull requests.
+
+   - New in Version 3.0.0
+     --------------------
+     - The GUI look and feel has been refactored to be more familiar for
+       Windows users by using MDI frames. Graph windows are also now free-
+       floating.
+     - Five new models have been added: PringlesModel, CoreShellEllipsoidXTModel,
+       RectangularPrismModel, RectangularHollowPrismModel and 
+       RectangularHollowPrismInfThinWallsModel.
+     - The data loader now supports ILL DAT data files and reads the full meta 
+       information from canSAS file formats.
+     - Redefined convention for specifying angular parameters for anisotropic
+       models.
+     - A number of minor features have been added such as permitting a log 
+       distribution of points when using a model to simulate data, and the 
+       addition of a Kratky plot option to the linear plots.
+     - A number of bugs have also been fixed.
+     - Save Project and Save Analysis now work more reliably.
+     - BETA: Magnetic contrast supporting full polarization analysis has been 
+       implemented for some spherical and cylindrical models.
+     - BETA: Two new tools have been added:
+       - A generic scattering calculator which takes an atomic, magnetic or 
+         SLD distribution in space and generates the appropriate 2D 
+         scattering pattern. In some cases the orientationally averaged 
+         (powder) 1D scattering can also be computed. Supported formats 
+         include: SLD or text, PDB, and OMF magnetic moment distribution 
+         file.
+       - An image viewer/converter for data in image format; this reads in 
+         an image file and will attempt to convert the image pixels to 
+         data. Supported formats include: TIFF, TIF, PNG, BMP, JPG.
+
+   - New in Version 2.2.1
+     --------------------
+     - Minor patch to support CanSAS XML v1.1 file format
+     - Added DataInfo for data in the DataExplorer and plots
+     - Added Maximize/Restore button in the title bar of the graphs
+     - Added a hide button in the toolbar of the graph panel
+     - The 'x' button now deletes a graph
+     - Edit SUM Model from the menubar can now generate and save more than one sum model
+     - Reports can now be saved in pdf format on WIN and MAC
+     - Made significant improvements to the batch/grid panel and fixed several bugs
+     - Fixed a number of other minor bugs
+
+   - New in Version 2.2.0
+     --------------------
+     - Application name changed to SasView
+     - New fully customizable Category Manager added for better management of
+       increasing number of models
+     - Improved the Grid Window functionality in the batch fitting mode
+     - Added a simpler Graph/Plot modification interface
+     - Added a new 'Data Operation' tool for addition, subtraction, multiplication,
+       division, of two data sets.
+     - The 'Sum Model' editor was extended and renamed 'Summation and Multiplication'
+       editor
+     - Added more plot symbols options for 1d plots
+     - Added improved trapping of compiling errors to the 'New model editor'
+     - Added some intelligent outputs (e.g., Rg, background, or rod diameter 
+       depending on the choice of axis scale of the plot) to the linear fits
+     - Added more models
+     
+   - Feature set from previous versions 	
+     -----------------------------------
+     - Perspectives Available
+       - Invariant calculator: Calculates the invariant, volume fraction, and
+         specific surface area.
+       - P(r) inversion calculator: Indirect Fourier transformation method.
+       - Fitting: the tool used for modeling and fitting 1D and 2D data to 
+         analytical model functions
+       - Tools: provides a number of useful supplementary tools such as SLD
+         calculation  
     
-    - Perspectives Available
-      - Invariant calculator: Calculates the invariant, volume fraction, and
-        specific surface area.
-      - P(r) inversion calculator: Indirect Fourier transformation method.
-      - Fitting: the tool used for modeling and fitting 1D and 2D data to 
-        analytical model functions
-      - Tools: provides a number of useful supplementary tools such as SLD
-        calculation  
-    
-    - Fitting 
-      - Includes a large number of model functions, both form factors and structure factors.
-      - Support P(Q)*S(Q) for form factors that flag they can be so multiplied.
-      - Supports Gaussian, lognormal, Shulz, rectangular and custom distribution
-        functions for models that need to include polydispersity or for orientational
-        distributions if appropriate.
-      - Anisotropic shapes and magnetic moment modeling in 2D allow for a non-uniform
-        distribution of orientations of a given axis leading to modeling and fitting
-        capabilities of non azimuthaly symmetric data.  
-      - User can choose to weight fits or not. If using weights, the user can choose
-        the error bar on each point if provided in the file, the square root
-        of the intensity or the intensity itself. 
-      - Instrumental resolution smearing of model or fits is provided with several
-        options: read the resolution/point fromt he file. Input a pinhole resolution
-        or a slit resolution.
-      - Users can define the Qrange (Qmin and Qmax) for both 1D and 2D data for
-        fitting and modeling, but not graphically.  The range can be reset to the
-        defaults (limits of q in data set for a fit) with the reset button.
-      - A mask can be applied to 2D calculation and fitting.
-      - Normalized residual plots are provided with every fit.
-      - Model function help available through detail button or from the fitting panel.
-      - Simultaneous/(advanced)constrained fitting allows for fitting a single
-        data set or several different sets simultaneously with the application
-        of advanced constraints relating fit parameters to functions of other
-        parameters (including from a different set). For example thickness of 
-        shell = sin(30) times the length.  
-      - Models that are the sum of two other models can be easily generated through the
-        SUM Model menubar item.
-      - New Python models can be added on the fly by creating an appropriate Python
-        file in the model plugin directory. Two tools are provided to help:
-        An easy to use custom model editor allows the quick generation of new Python
-        models by supplying only the parameters and their default value (box 1)
-        and the mathematical function of the model (box 2) and generating the
-        necessary *.py file.  A separate advanced model editor provides a full Python
-        file editor.  Either way once saved the model becomes immediately available 
-        to the application. 
-      - A batch fittng capability allows for the analysis of a series of data sets to
-        a sinble model and provides the results in a tabular form suitable for saving
-        or plotting the evolution of the fit parameters with error bars (from within
-        the application).
+     - Fitting 
+       - Includes a large number of model functions, both form factors and structure factors.
+       - Support P(Q)*S(Q) for form factors that flag they can be so multiplied.
+       - Supports Gaussian, lognormal, Shulz, rectangular and custom distribution
+         functions for models that need to include polydispersity or for orientational
+         distributions if appropriate.
+       - Anisotropic shapes and magnetic moment modeling in 2D allow for a non-uniform
+         distribution of orientations of a given axis leading to modeling and fitting
+         capabilities of non azimuthaly symmetric data.  
+       - User can choose to weight fits or not. If using weights, the user can choose
+         the error bar on each point if provided in the file, the square root
+         of the intensity or the intensity itself. 
+       - Instrumental resolution smearing of model or fits is provided with several
+         options: read the resolution/point fromt he file. Input a pinhole resolution
+         or a slit resolution.
+       - Users can define the Qrange (Qmin and Qmax) for both 1D and 2D data for
+         fitting and modeling, but not graphically.  The range can be reset to the
+         defaults (limits of q in data set for a fit) with the reset button.
+       - A mask can be applied to 2D calculation and fitting.
+       - Normalized residual plots are provided with every fit.
+       - Model function help available through detail button or from the fitting panel.
+       - Simultaneous/(advanced)constrained fitting allows for fitting a single
+         data set or several different sets simultaneously with the application
+         of advanced constraints relating fit parameters to functions of other
+         parameters (including from a different set). For example thickness of 
+         shell = sin(30) times the length.  
+       - Models that are the sum of two other models can be easily generated through the
+         SUM Model menubar item.
+       - New Python models can be added on the fly by creating an appropriate Python
+         file in the model plugin directory. Two tools are provided to help:
+         An easy to use custom model editor allows the quick generation of new Python
+         models by supplying only the parameters and their default value (box 1)
+         and the mathematical function of the model (box 2) and generating the
+         necessary *.py file.  A separate advanced model editor provides a full Python
+         file editor.  Either way once saved the model becomes immediately available 
+         to the application. 
+       - A batch fitting capability allows for the analysis of a series of data sets to
+         a single model and provides the results in a tabular form suitable for saving
+         or plotting the evolution of the fit parameters with error bars (from within
+         the application).
  
-    - Tools
-      - A scattering length density calculator,including some X-ray information
-        is provided.
-      - A density to vol. fraction converter is provided
-      - In application access to a Python shell/editor (PyCrust) is provided
-      - An instrument resolution calculator, including possible gravitational and
-        TOF effects is provided
-      - A slit size calculator optimized for Anton Paar Saxess is provided.
-      - A kiessig fringe thickness calculator is provided
-    - Plots and plot management
-      - A 3D graphing option (for 2d data/results) is provided with the view
-        controlled by the mouse
-      - 2D plots are shown with an intensity color bar. 2D Color map can be user
-        adjusted.
-      - Supports output of plot to a variety of graphic formats. Supported formats
-        include: png, eps, emf, jpg/jpeg, pdf, ps, tif/tiff, rawRGBbitmap(raw, rgba),
-        and scalable vector graphic (svg/svgz)
-      - Supports ouput of data in plot (1 or 2D) to limited data formats
-      - Multiple data sets can be loaded into a single graph for viewing (but a fit
-        plot can currently only have a single plot).
-      - Extensive context sensitive plot/fitting/manipulation options are available
-        through a right mouse click pop-up menu on plots.  
-    - Data management
-      - Supports 2 + column 1D ASCII data, NIST 1D and 2D data, and canSAS data
-        via plug-in mechanism which can easily allow other readers as appropriate. 
-      - 2D data is expected in Q space but for historical reasons accepts the
-        NIST 2D raw pixel format and will do conversion internally.
-      - The full data and metadata available to SasView is viewable in ASCII via
-        right clicking on a data set and choosing Data Info in the DataExplorer
-        or on the plots
-      - Supports loading a single file, multiple files, or a whole folder   
-      - An optional Data Explorer is provided (default) which simplifies managing,
-        plotting, deleting, or setup for computation. Most functions however do
-        not require access to the explorer/manager and can be accessed through
-        right click menus and the toolbar.  The data explorer can be re-started
-        from the menu bar.
-    - Data manipulation
-      - Support various 2D averaging methods : Circular, sectors, annular,
-        boxsum, boxQx and boxQy.
-      - A 2D data maks editor is provided
-      - 2D mask can be applied to the circular averaging.
-    - Miscellaneous features
-      - limited reports can be generated in pdf format
-      - Provides multiprocessor support(Windows only)
-      - Limited startup customization currently includes default startup
-        data folder and choice of default starting with data manager
-      - Limited support for saving(opening) a SasView project or a SasView analysis
-        (subproject) is provided.
-      - SasView can be launched and loaded with a file of interesty by double-clicking
-        on that file (recognized extension)
-      - A data file or data folder can be passed to SasView when launched from
-        the command line.
-      - Limited bookmarking capability to later recall the results of a fit calculation
-        is provided.
-      - Extensive help is provided through context sensitive mouse roll-over,
-        information bar (at the bottom of the panel), the console menu, and
-        access to the help files in several different ways.
-
+     - Tools
+       - A scattering length density calculator,including some X-ray information
+         is provided.
+       - A density to vol. fraction converter is provided
+       - In application access to a Python shell/editor (PyCrust) is provided
+       - An instrument resolution calculator, including possible gravitational and
+         TOF effects is provided
+       - A slit size calculator optimized for Anton Paar Saxess is provided.
+       - A kiessig fringe thickness calculator is provided
+         
+     - Plots and plot management
+       - A 3D graphing option (for 2d data/results) is provided with the view
+         controlled by the mouse
+       - 2D plots are shown with an intensity color bar. 2D Color map can be user
+         adjusted.
+       - Supports output of plot to a variety of graphic formats. Supported formats
+         include: png, eps, emf, jpg/jpeg, pdf, ps, tif/tiff, rawRGBbitmap(raw, rgba),
+         and scalable vector graphic (svg/svgz)
+       - Supports ouput of data in plot (1 or 2D) to limited data formats
+       - Multiple data sets can be loaded into a single graph for viewing (but a fit
+         plot can currently only have a single plot).
+       - Extensive context sensitive plot/fitting/manipulation options are available
+         through a right mouse click pop-up menu on plots.
+           
+     - Data management
+       - Supports 2 + column 1D ASCII data, NIST 1D and 2D data, and canSAS data
+         via plug-in mechanism which can easily allow other readers as appropriate. 
+       - 2D data is expected in Q space but for historical reasons accepts the
+         NIST 2D raw pixel format and will do conversion internally.
+       - The full data and metadata available to SasView is viewable in ASCII via
+         right clicking on a data set and choosing Data Info in the DataExplorer
+         or on the plots
+       - Supports loading a single file, multiple files, or a whole folder   
+       - An optional Data Explorer is provided (default) which simplifies managing,
+         plotting, deleting, or setup for computation. Most functions however do
+         not require access to the explorer/manager and can be accessed through
+         right click menus and the toolbar.  The data explorer can be re-started
+         from the menu bar.
+           
+     - Data manipulation
+       - Support various 2D averaging methods : Circular, sectors, annular,
+         boxsum, boxQx and boxQy.
+       - A 2D data maks editor is provided
+       - 2D mask can be applied to the circular averaging.
+         
+     - Miscellaneous features
+       - limited reports can be generated in pdf format
+       - Provides multiprocessor support(Windows only)
+       - Limited startup customization currently includes default startup
+         data folder and choice of default starting with data manager
+       - Limited support for saving(opening) a SasView project or a SasView analysis
+         (subproject) is provided.
+       - SasView can be launched and loaded with a file of interesty by double-clicking
+         on that file (recognized extension)
+       - A data file or data folder can be passed to SasView when launched from
+         the command line.
+       - Limited bookmarking capability to later recall the results of a fit calculation
+         is provided.
+       - Extensive help is provided through context sensitive mouse roll-over,
+         information bar (at the bottom of the panel), the console menu, and
+         access to the help files in several different ways.
 
 
 2- Downloading and Installing
+=============================
 	
-    *** Note 1:  Much more information is available at www.sasview.org under links.
-	             Look in the 'For Developers' section and particularly the wiki at
-	             www.sasview.org/trac/wiki.
-    *** Note 2:  If you have EXE or ZIP SasView installer, you won't need any of
-                 the following.  However it is highly recommended that any
-                 previous versions be un-installed prior to installing the
-                 new version.
-
-    2.1- System Requirements:
+   *** Note 1:  Much more information is available at www.sasview.org under links.
+	            Look in the 'For Developers' section and particularly the wiki at
+                www.sasview.org/trac/wiki.
+   *** Note 2:  If you have EXE or ZIP SasView installer, you won't need any of
+                the following.  However it is highly recommended that any
+                previous versions be un-installed prior to installing the
+                new version.
+
+   2.1- System Requirements
         - Python version >= 2.5 and < 3.0 should be running on the system
         - We currently use Python 2.7
 
-    2.2- Installing from source:
+   2.2- Installing from source
         - Get the code from GitHub at https://github.com/SasView/sasview.git
           for this release version use: https://github.com/SasView/sasview/releases
-            - run 'python setup.py install' under the 'sasview-x.x.x' folder
-            - run 'python sasview.py' under the 'sasview' folder.
+          - run 'python setup.py install' under the 'sasview-x.x.x' folder
+          - run 'python sasview.py' under the 'sasview' folder.
+          
         - The following modules are required (version numbers are what are used
           in the windows release build):
-        - Common Packages
-          - reportlab 3.1.44
-          - lxml 3.4.4.0 (MAC 3.4.2.0)
-          - PIL 1.1.7
-          - xhtml2pdf 3.0.33 (MAC = not installed on build server)
-          - unittest-xml-reporting 1.12.0 (MAC 1.10.0)
-          - matplotlib Version Installed: 1.4.3 (MAC 1.1.1)
-          - bumps Version Installed: 0.7.5.6
-          - scipy Version Installed: 0.16.0b2 (MAC 0.11.0)
-          - periodictable Version Installed: 1.4.1
-          - setuptools Version Installed: 7.0 (MAC 12.0.5)
-          - sphinx Version Installed: 1.3.1 (MAC 1.3b2)
-          - pyparsing Version Installed: 2.0.3
-          - numpy Version Installed: 1.9.2 (MAC 1.6.2)
-          - html5lib Version Installed: 0.99999
-          - wx Version Installed: 3.0.2.0
-          
-
-        - Windows Specific Packages:
-          - pywin 219
-          - py2exe 0.6.9
-          - comtypes 1.1.1
-          - MinGW w/ gcc version 4.6.1 (WIN)
-          - vcredist_x86.exe (version 9.0.21022.8  -microsoft visual C 2008 
+          
+          - Common Packages
+            - reportlab 3.1.44
+            - lxml 3.4.4.0 (MAC 3.4.2.0)
+            - PIL 1.1.7
+            - xhtml2pdf 3.0.33 (MAC = not installed on build server)
+            - unittest-xml-reporting 1.12.0 (MAC 1.10.0)
+            - matplotlib Version Installed: 1.4.3 (MAC 1.1.1)
+            - bumps Version Installed: 0.7.5.6
+            - scipy Version Installed: 0.16.0b2 (MAC 0.11.0)
+            - periodictable Version Installed: 1.4.1
+            - setuptools Version Installed: 7.0 (MAC 12.0.5)
+            - sphinx Version Installed: 1.3.1 (MAC 1.3b2)
+            - pyparsing Version Installed: 2.0.3
+            - numpy Version Installed: 1.9.2 (MAC 1.6.2)
+            - html5lib Version Installed: 0.99999
+            - wx Version Installed: 3.0.2.0
+          
+          - Windows Specific Packages
+            - pywin 219
+            - py2exe 0.6.9
+            - comtypes 1.1.1
+            - MinGW w/ gcc version 4.6.1 (WIN)
+            - vcredist_x86.exe (version 9.0.21022.8  -microsoft visual C 2008 
               re-distributable)
-          - Innosetup (WIN - isetup 5.4.2-unicode) - used to create distributable
+            - Innosetup (WIN - isetup 5.4.2-unicode) - used to create distributable
+
+            *** Note: Windows build dependencies can be set up using anaconda. Instructions
+                can be found at http://trac.sasview.org/wiki/AnacondaSetup
             
-        - MAC Specifci Packages:
-          - py2app 0.7.1
-        - Windows build dependencies can be set up using anaconda. Instructions
-          can be found at http://trac.sasview.org/wiki/AnacondaSetup
-
+          - MAC Specifc Packages
+            - py2app 0.7.1
+          
 
 3- Known Issues
-
-    3.1- All systems:
-        - Documentation Window may take a few seconds to load the first time
-          it i called.  Also, an internet connection is required before
+===============
+
+   3.1- All systems:
+        - The documentation window may take a few seconds to load the first time
+          it is called. Also, an internet connection is required before
           equations will render properly. Until then they will show in their
           original TeX format.
+        - If the documentation window remains stubbornly blank, try installing a 
+          different browser and set that as your default browser. Issues have
+          been noted with Internet Explorer 11.
         - The copy and paste functions (^C, ^V) in the batch mode results grid
           require two clicks: one to select the cell and a second to select the
           contents of the cell. 
-        - Tutorial has not yet been updated and is somewhat out of date
-        - Very old computers may not be able to run
+        - The tutorial has not yet been updated and is somewhat out of date
+        - Very old computers may struggle to run the 3.x and later releases
         - Polydispersity on multiple parameters included in a simultaneous/
           constrained fit will likely not be correct
@@ -296,6 +319,5 @@
           some cases lead to incorrect calculations(ticket #332)
           
-
-    3.2- Windows:
+   3.2- Windows:
         - If installed to same directory as old version without first removing
           the old version, the old desktop icon will remain but point to the
@@ -304,29 +326,35 @@
           safest to uninstall old version prior to installing new version anyway.
 		
-    3.3- MAC:
+   3.3- MAC:
         - Application normally starts up hidden. Click icon in Dock to view/use
           application. 
-        - multiprocessing does not currently work on MAC OS
+        - Multiprocessing does not currently work on MAC OS
 		
-    3.4- Linux:
+   3.4- Linux:
         - Not well tested
 
+
 4- SasView website
-
-    - www.sasview.org.  This main project site is the gateway to all 
-      information about the sasview project.  It includes information
-      about the project, a FAQ page and links to all developer and user
-      information, tools and resources.
+==================
+
+   - www.sasview.org.  This main project site is the gateway to all 
+     information about the sasview project.  It includes information
+     about the project, a FAQ page and links to all developer and user
+     information, tools and resources.
+
 
 5- Frequently Asked Questions
-
-    - www.sasview.org/faq.html
+=============================
+
+   - www.sasview.org/faq.html
+
 
 6- Installer download website
-
-    - Latest release Version
-        - https://github.com/SasView/sasview/releases
-    - Latest developer builds
-        - https://jenkins.esss.dk/sasview/view/Master-Builds/
+=============================
+
+   - Latest release Version
+     - https://github.com/SasView/sasview/releases
+   - Latest developer builds
+     - https://jenkins.esss.dk/sasview/view/Master-Builds/
 
     
Index: sasview/test/media/testdata_help.rst
===================================================================
--- sasview/test/media/testdata_help.rst	(revision e5160aadaf222f79b2c01f26ab49a61b1cb990d9)
+++ sasview/test/media/testdata_help.rst	(revision 0d10aab56277baf1b553bdb9324d32d39233301b)
@@ -25,3 +25,74 @@
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
-.. note::  This help document was last changed by Steve King, 17Jun2015
+1D Test Data
+^^^^^^^^^^^^
+
+AOT_Microemulsion
+  - Aerosol-OT surfactant stabilised oil-in-water microemulsion data at three 
+    contrasts: core (oil core), drop (oil core + surfactant layer), and shell 
+    (surfactant layer).
+  - Suitable for testing simultaneous fitting.
+  
+hSDS_D2O
+  - h25-sodium dodecyl sulphate solutions at two concentrations: 0.5wt% (just 
+    above the cmc), 2wt% (well above the cmc), and 2wt% but with 0.2mM NaCl 
+    electrolyte.
+  - Suitable for testing charged S(Q) models.
+
+P123_D2O
+  - Lyotropic liquid crystalline solutions of non-ionic ABA block copolymer 
+    Pluronic P123 in water at three concentrations: 10wt%, 30wt%, and 40wt%.
+  - Suitable for testing paracrystal models.
+
+ISIS_Polymer_Blend_TK49
+  - Monodisperse (Mw/Mn~1.02) 49wt% d8-polystyrene : 51wt% h8-polystyrene 
+    polymer blend.
+  - Suitable for testing Poly_GaussCoil and RPA10 models.
+
+.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
+
+2D Test Data
+^^^^^^^^^^^^
+
+P123_D2O
+  - Lyotropic liquid crystalline solutions of non-ionic ABA block copolymer 
+    Pluronic P123 in water at three concentrations: 10wt%, 30wt%, and 40wt%.
+  - Suitable for testing paracrystal models.
+
+.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
+
+Saved State Test Data
+^^^^^^^^^^^^^^^^^^^^^
+
+_phi_weights.txt
+
+_radius_dist.txt
+
+_THETA_weights.txt
+
+fitstate.fitv
+
+newone.svs
+
+prstate.prv
+
+sld_file.sld
+
+test.inv
+
+test002.inv
+
+.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
+
+Other Test Data
+^^^^^^^^^^^^^^^
+
+1000A_sphere_sm.xml
+
+diamond.pdb
+
+dna.pdb
+
+.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
+
+.. note::  This help document was last changed by Steve King, 26Jun2015
Index: src/sas/guiframe/gui_manager.py
===================================================================
--- src/sas/guiframe/gui_manager.py	(revision 22d92da19f710f2771dcf5a52644e2a6dbf749cc)
+++ src/sas/guiframe/gui_manager.py	(revision 22d92da19f710f2771dcf5a52644e2a6dbf749cc)
@@ -1303,5 +1303,4 @@
             if menu_list:
                 for (menu, name) in menu_list:
-                    print "[%s]" % name
                     self._menubar.Replace(pos, menu, name)
                     self._applications_menu_name = name
Index: src/sas/models/media/model_functions.rst
===================================================================
--- src/sas/models/media/model_functions.rst	(revision 5e880fe151fbbfd475a657688918da68ca70cf87)
+++ src/sas/models/media/model_functions.rst	(revision ee9fa94ad234dea9b74e46361b38743f09195c2c)
@@ -20,5 +20,7 @@
 
 
-.. note::  The contents of this document are awaiting proof reading. Feb2015
+.. note::  The contents of this document are presented in good faith and are 
+           believed to be mostly correct and accurate, however they have not 
+           yet been rigorously checked for errors. June2015
 
 
@@ -83,26 +85,4 @@
 =======================
 
-Contents
---------
-1. Background_
-
-2. Model_ Functions
-
- 2.1 Shape-based_ Functions
- 
- 2.2 Shape-independent_ Functions
- 
- 2.3 Structure-factor_ Functions
- 
- 2.4 Customised_ Functions
-
-3. References_
-
-
-
-.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
-
-
-
 .. _Background:
 
@@ -290,4 +270,6 @@
 - sph_bessel_jn_
 
+Also see the documentation on :ref:`Adding_your_own_models` under Fitting Data. 
+
 
 
Index: src/sas/perspectives/fitting/pagestate.py
===================================================================
--- src/sas/perspectives/fitting/pagestate.py	(revision acf8e4a58aad50df871a259b771db1d582942abb)
+++ src/sas/perspectives/fitting/pagestate.py	(revision a15e75428603d97dea2f7a7aa8da0b557e9c3151)
@@ -545,8 +545,5 @@
                     paramval_string += CENTRE % param + "\n"
 
-        text_string = "\n\n\n" + title + "\n\n" + file + \
-                      "\n" + q_name + \
-                      "\n" + chi2 + \
-                      "\n\n" + paramval
+        text_string = "\n\n\n%s\n\n%s\n%s\n%s\n\n%s" % (title, file, q_name, chi2, paramval)
 
         title_name = self._check_html_format(title_name)
Index: src/sas/perspectives/fitting/report_dialog.py
===================================================================
--- src/sas/perspectives/fitting/report_dialog.py	(revision 2f4b43041eaa7b7f496750f223a299cb33cd268e)
+++ src/sas/perspectives/fitting/report_dialog.py	(revision a15e75428603d97dea2f7a7aa8da0b557e9c3151)
@@ -44,5 +44,5 @@
                 self.report_html = self.report_list[0] % \
                                     "memory:img_fit0.png"
-            elif len(self.report_list) == 2:
+            elif len(self.report_list[2]) == 2:
                 self.report_html = self.report_list[0] % \
                                     ("memory:img_fit0.png",
