Index: src/sas/sasgui/perspectives/fitting/media/fitting_help.rst
===================================================================
--- src/sas/sasgui/perspectives/fitting/media/fitting_help.rst	(revision ca383a0379b7c34a82f7245aa76f89169ddeb5d1)
+++ src/sas/sasgui/perspectives/fitting/media/fitting_help.rst	(revision ca383a0379b7c34a82f7245aa76f89169ddeb5d1)
@@ -4,13 +4,13 @@
 .. by S King, ISIS, during SasView CodeCamp-III in Feb 2015.
 
-.. |inlineimage004| image:: sm_image004.gif
-.. |inlineimage005| image:: sm_image005.gif
-.. |inlineimage008| image:: sm_image008.gif
-.. |inlineimage009| image:: sm_image009.gif
-.. |inlineimage010| image:: sm_image010.gif
-.. |inlineimage011| image:: sm_image011.gif
-.. |inlineimage012| image:: sm_image012.gif
-.. |inlineimage018| image:: sm_image018.gif
-.. |inlineimage019| image:: sm_image019.gif
+.. |inlineimage004| image:: sm_image004.png
+.. |inlineimage005| image:: sm_image005.png
+.. |inlineimage008| image:: sm_image008.png
+.. |inlineimage009| image:: sm_image009.png
+.. |inlineimage010| image:: sm_image010.png
+.. |inlineimage011| image:: sm_image011.png
+.. |inlineimage012| image:: sm_image012.png
+.. |inlineimage018| image:: sm_image018.png
+.. |inlineimage019| image:: sm_image019.png
 
 
@@ -90,5 +90,5 @@
 *View* option on the menubar, or click on the *Modify* button on the *Fit Page*.
 
-.. image:: cat_fig0.bmp
+.. image:: cat_fig0.png
 
 The categorization of all models except the user supplied Plugin Models can be
@@ -96,5 +96,5 @@
 hidden from view in the drop-down menus.
 
-.. image:: cat_fig1.bmp
+.. image:: cat_fig1.png
 
 Changing category
@@ -105,5 +105,5 @@
 to make the required changes.
 
-.. image:: cat_fig2.bmp
+.. image:: cat_fig2.png
 
 To create a category for the selected model, click the *Add* button. In order
@@ -179,5 +179,5 @@
 GUI using the *New Plugin Model Function*.
 
-.. image:: new_model.bmp
+.. image:: new_model.png
 
 When using this feature, be aware that even if your code has errors, including 
@@ -228,5 +228,5 @@
 ^^^^^^^^^^^^^^^^
 
-.. image:: sum_model.bmp
+.. image:: sum_model.png
 
 This option creates a custom Plugin Model of the form::
@@ -449,5 +449,5 @@
 
 In the bottom left corner of the *Fit Page* is a box displaying the normalised value
-of the statistical |chi|\  :sup:`2` parameter returned by the optimiser.
+of the statistical $\chi^2$ parameter returned by the optimiser.
 
 Now check the box for another model parameter and click *Fit* again. Repeat this
@@ -455,5 +455,5 @@
 fit of the theory to the experimental data improves the value of 'chi2/Npts' will
 decrease. A good model fit should easily produce values of 'chi2/Npts' that are
-close to zero, and certainly <100. See :ref:`Assessing_Fit_Quality`.
+close to one, and certainly <100. See :ref:`Assessing_Fit_Quality`.
 
 SasView has a number of different optimisers (see the section :ref:`Fitting_Options`).
@@ -579,5 +579,5 @@
 at the bottom of that panel and *Send To Fitting*. A *BatchPage* will be created.
 
-.. image:: batch_button_area.bmp
+.. image:: batch_button_area.png
 
 *NB: The Batch Page can also be created by checking the Batch Mode radio button*
@@ -601,5 +601,5 @@
 will all appear on one graph.
 
-.. image:: view_button.bmp
+.. image:: view_button.png
 
 *NB: In theory, returning to the BatchPage and changing the name of the I(Q)*
@@ -637,5 +637,5 @@
 bar.
 
-.. image:: restore_batch_window.bmp
+.. image:: restore_batch_window.png
 
 Once a batch fit is completed, all model parameters are displayed but *not*
@@ -653,5 +653,5 @@
 label.
 
-.. image:: edit_menu.bmp
+.. image:: edit_menu.png
 
 *NB: If there is an existing Grid Window and another batch fit is performed,*
@@ -666,5 +666,5 @@
 *Window* menu bar. The loaded parameters will appear in a new table tab.
 
-.. image:: file_menu.bmp
+.. image:: file_menu.png
 
 *NB: Saving the Grid Window does not save any experimental data, residuals*
@@ -684,5 +684,5 @@
 but different labels and units can be entered manually.
 
-.. image:: plot_button.bmp
+.. image:: plot_button.png
 
 The *X/Y-axis Selection Range* can be edited manually. The text control box
Index: src/sas/sasgui/perspectives/fitting/media/mag_help.rst
===================================================================
--- src/sas/sasgui/perspectives/fitting/media/mag_help.rst	(revision eca66a1e1d34267aaf9e3dd7b24b04ab5ea44bc1)
+++ src/sas/sasgui/perspectives/fitting/media/mag_help.rst	(revision 5ed76f8390eac56ff5d3779fd9c454d0c8fe1dc0)
@@ -4,13 +4,13 @@
 .. by S King, ISIS, during SasView CodeCamp-III in Feb 2015.
 
-.. |inlineimage004| image:: sm_image004.gif
-.. |inlineimage005| image:: sm_image005.gif
-.. |inlineimage008| image:: sm_image008.gif
-.. |inlineimage009| image:: sm_image009.gif
-.. |inlineimage010| image:: sm_image010.gif
-.. |inlineimage011| image:: sm_image011.gif
-.. |inlineimage012| image:: sm_image012.gif
-.. |inlineimage018| image:: sm_image018.gif
-.. |inlineimage019| image:: sm_image019.gif
+.. |inlineimage004| image:: sm_image004.png
+.. |inlineimage005| image:: sm_image005.png
+.. |inlineimage008| image:: sm_image008.png
+.. |inlineimage009| image:: sm_image009.png
+.. |inlineimage010| image:: sm_image010.png
+.. |inlineimage011| image:: sm_image011.png
+.. |inlineimage012| image:: sm_image012.png
+.. |inlineimage018| image:: sm_image018.png
+.. |inlineimage019| image:: sm_image019.png
 
 
@@ -20,5 +20,5 @@
 --------------------------------
 
-Magnetic scattering is implemented in five (2D) models 
+Magnetic scattering is implemented in five (2D) models
 
 *  *sphere*
@@ -28,20 +28,20 @@
 *  *parallelepiped*
 
-In general, the scattering length density (SLD, = |beta|) in each region where the
+In general, the scattering length density (SLD, = $\beta$) in each region where the
 SLD is uniform, is a combination of the nuclear and magnetic SLDs and, for polarised
 neutrons, also depends on the spin states of the neutrons.
 
-For magnetic scattering, only the magnetization component, *M*\ :sub:`perp`,
-perpendicular to the scattering vector *Q* contributes to the the magnetic
+For magnetic scattering, only the magnetization component, $M_\perp$,
+perpendicular to the scattering vector $Q$ contributes to the the magnetic
 scattering length.
 
-.. image:: mag_vector.bmp
+.. image:: mag_vector.png
 
 The magnetic scattering length density is then
 
-.. image:: dm_eq.gif
+.. image:: dm_eq.png
 
-where |gamma| = -1.913 is the gyromagnetic ratio, |mu|\ :sub:`B` is the
-Bohr magneton, *r*\ :sub:`0` is the classical radius of electron, and |sigma|
+where $\gamma = -1.913$ is the gyromagnetic ratio, $\mu_B$ is the
+Bohr magneton, $r_0$ is the classical radius of electron, and $\sigma$
 is the Pauli spin.
 
@@ -53,39 +53,39 @@
 Spin-flips    (+ -) and (- +)
 
-.. image:: M_angles_pic.bmp
+.. image:: M_angles_pic.png
 
-If the angles of the *Q* vector and the spin-axis (*x'*) to the *x*-axis are |phi|
-and |theta|\ :sub:`up`, respectively, then, depending on the spin state of the
+If the angles of the $Q$ vector and the spin-axis (*x'*) to the *x*-axis are $\phi$
+and $\theta_\text{up}$, respectively, then, depending on the spin state of the
 neutrons, the scattering length densities, including the nuclear scattering
-length density (|beta|\ :sub:`N`) are
+length density ($\beta_N$) are
 
-.. image:: sld1.gif
+.. image:: sld1.png
 
 when there are no spin-flips, and
 
-.. image:: sld2.gif
+.. image:: sld2.png
 
 when there are, and
 
-.. image:: mxp.gif
+.. image:: mxp.png
 
-.. image:: myp.gif
+.. image:: myp.png
 
-.. image:: mzp.gif
+.. image:: mzp.png
 
-.. image:: mqx.gif
+.. image:: mqx.png
 
-.. image:: mqy.gif
+.. image:: mqy.png
 
-Here, *M*\ :sub:`0x`, *M*\ :sub:`0y` and *M*\ :sub:`0z` are the x, y and z components
-of the magnetization vector given in the laboratory xyz frame given by
+Here, $M_{0x}$, $M_{0y}$ and $M_{0z}$ are the $x$, $y$ and $z$ components
+of the magnetization vector given in the laboratory $xyz$ frame given by
 
-.. image:: m0x_eq.gif
+.. image:: m0x_eq.png
 
-.. image:: m0y_eq.gif
+.. image:: m0y_eq.png
 
-.. image:: m0z_eq.gif
+.. image:: m0z_eq.png
 
-and the magnetization angles |theta|\ :sub:`M` and |phi|\ :sub:`M` are defined in
+and the magnetization angles $\theta_M$ and $\phi_M$ are defined in
 the figure above.
 
@@ -93,8 +93,8 @@
 
 ===========   ================================================================
- M0_sld        = *D*\ :sub:`M` *M*\ :sub:`0`
- Up_theta      = |theta|\ :sub:`up`
- M_theta       = |theta|\ :sub:`M`
- M_phi         = |phi|\ :sub:`M`
+ M0_sld        = $D_M M_0$
+ Up_theta      = $\theta_\text{up}$
+ M_theta       = $\theta_M$
+ M_phi         = $\phi_M$
  Up_frac_i     = (spin up)/(spin up + spin down) neutrons *before* the sample
  Up_frac_f     = (spin up)/(spin up + spin down) neutrons *after* the sample
Index: src/sas/sasgui/perspectives/fitting/media/pd_help.rst
===================================================================
--- src/sas/sasgui/perspectives/fitting/media/pd_help.rst	(revision b64b87c874ab0edc565e9c415decc839e3214c8c)
+++ src/sas/sasgui/perspectives/fitting/media/pd_help.rst	(revision 5ed76f8390eac56ff5d3779fd9c454d0c8fe1dc0)
@@ -4,13 +4,13 @@
 .. by S King, ISIS, during SasView CodeCamp-III in Feb 2015.
 
-.. |inlineimage004| image:: sm_image004.gif
-.. |inlineimage005| image:: sm_image005.gif
-.. |inlineimage008| image:: sm_image008.gif
-.. |inlineimage009| image:: sm_image009.gif
-.. |inlineimage010| image:: sm_image010.gif
-.. |inlineimage011| image:: sm_image011.gif
-.. |inlineimage012| image:: sm_image012.gif
-.. |inlineimage018| image:: sm_image018.gif
-.. |inlineimage019| image:: sm_image019.gif
+.. |inlineimage004| image:: sm_image004.png
+.. |inlineimage005| image:: sm_image005.png
+.. |inlineimage008| image:: sm_image008.png
+.. |inlineimage009| image:: sm_image009.png
+.. |inlineimage010| image:: sm_image010.png
+.. |inlineimage011| image:: sm_image011.png
+.. |inlineimage012| image:: sm_image012.png
+.. |inlineimage018| image:: sm_image018.png
+.. |inlineimage019| image:: sm_image019.png
 
 
@@ -24,8 +24,10 @@
 form factor is normalized by the average particle volume such that
 
-*P(q) = scale* * \ <F*\F> / *V + bkg*
+.. math::
 
-where F is the scattering amplitude and the \<\> denote an average over the size
-distribution.
+    P(q) = \text{scale} \langle F^*F rangle V + \text{background}
+
+where $F$ is the scattering amplitude and $\langle\cdot\rangle$ denotes an average
+over the size distribution.
 
 Users should note that this computation is very intensive. Applying polydispersion
@@ -57,8 +59,8 @@
 .. image:: pd_image001.png
 
-where *xmean* is the mean of the distribution, *w* is the half-width, and *Norm* is a
-normalization factor which is determined during the numerical calculation.
+where $x_{mean}$ is the mean of the distribution, $w$ is the half-width, and $Norm$
+is a normalization factor which is determined during the numerical calculation.
 
-Note that the standard deviation and the half width *w* are different!
+Note that the standard deviation and the half width $w$ are different!
 
 The standard deviation is
@@ -81,5 +83,5 @@
 .. image:: pd_image005.png
 
-where *xmean* is the mean of the distribution and *Norm* is a normalization factor
+where $x_{mean}$ is the mean of the distribution and $Norm$ is a normalization factor
 which is determined during the numerical calculation.
 
@@ -100,6 +102,6 @@
 .. image:: pd_image007.png
 
-where |mu|\ =ln(*xmed*), *xmed* is the median value of the distribution, and
-*Norm* is a normalization factor which will be determined during the numerical
+where $\mu=\ln(x_{med})$, $x_{med}$ is the median value of the distribution, and
+$Norm$ is a normalization factor which will be determined during the numerical
 calculation.
 
@@ -107,5 +109,5 @@
 size parameter in the *FitPage*, for example, radius = 60.
 
-The polydispersity is given by |sigma|
+The polydispersity is given by $\sigma$
 
 .. image:: pd_image008.png
@@ -115,10 +117,10 @@
 .. image:: pd_image009.png
 
-The mean value is given by *xmean*\ =exp(|mu|\ +p\ :sup:`2`\ /2). The peak value
-is given by *xpeak*\ =exp(|mu|-p\ :sup:`2`\ ).
+The mean value is given by $x_{mean} =\exp(\mu + p^2 /2)$. The peak value
+is given by $x_{peak} =\exp(\mu-p^2)$.
 
 .. image:: pd_image010.jpg
 
-This distribution function spreads more, and the peak shifts to the left, as *p*
+This distribution function spreads more, and the peak shifts to the left, as $p$
 increases, requiring higher values of Nsigmas and Npts.
 
@@ -132,9 +134,11 @@
 .. image:: pd_image011.png
 
-where *xmean* is the mean of the distribution and *Norm* is a normalization factor
-which is determined during the numerical calculation, and *z* is a measure of the
+where $x_{mean}$ is the mean of the distribution and $Norm$ is a normalization factor
+which is determined during the numerical calculation, and $z$ is a measure of the
 width of the distribution such that
 
-z = (1-p\ :sup:`2`\ ) / p\ :sup:`2`
+.. math::
+
+    z = (1-p^2 ) / p^2
 
 The polydispersity is
@@ -156,5 +160,5 @@
 
 This user-definable distribution should be given as as a simple ASCII text file
-where the array is defined by two columns of numbers: *x* and *f(x)*. The *f(x)*
+where the array is defined by two columns of numbers: $x$ and $f(x)$. The $f(x)$
 will be normalized by SasView during the computation.
 
@@ -172,5 +176,5 @@
 
 SasView only uses these array values during the computation, therefore any mean
-value of the parameter represented by *x* present in the *FitPage*
+value of the parameter represented by $x$ present in the *FitPage*
 will be ignored.
 
@@ -181,5 +185,5 @@
 
 Many commercial Dynamic Light Scattering (DLS) instruments produce a size
-polydispersity parameter, sometimes even given the symbol *p*! This parameter is
+polydispersity parameter, sometimes even given the symbol $p$! This parameter is
 defined as the relative standard deviation coefficient of variation of the size
 distribution and is NOT the same as the polydispersity parameters in the Lognormal
Index: src/sas/sasgui/perspectives/fitting/media/plugin.rst
===================================================================
--- src/sas/sasgui/perspectives/fitting/media/plugin.rst	(revision e081946a83f80fc072f03a743f0869493b2c2850)
+++ src/sas/sasgui/perspectives/fitting/media/plugin.rst	(revision e081946a83f80fc072f03a743f0869493b2c2850)
@@ -49,5 +49,5 @@
 
 Other models are available for download from our
-`Model Marketplace <http://marketplace.sasview.org/>`_. You can contribute your own models to the 
+`Model Marketplace <http://marketplace.sasview.org/>`_. You can contribute your own models to the
 Marketplace aswell.
 
@@ -83,5 +83,5 @@
     - without any capitalization or CamelCase
     - without incorporating the word "model"
-    - examples: *barbell* **not** *BarBell*; *broad_peak* **not** *BroadPeak*; 
+    - examples: *barbell* **not** *BarBell*; *broad_peak* **not** *BroadPeak*;
       *barbell* **not** *BarBellModel*
 
@@ -103,5 +103,5 @@
      at the top of the *.py* file
    - what you write here is abstracted into the SasView help documentation
-   - this is what other users will refer to when they want to know what your model does; 
+   - this is what other users will refer to when they want to know what your model does;
      so please be helpful!
 
@@ -128,5 +128,5 @@
      converted/created the model file
 
-Models that do not conform to these requirements will *never* be incorporated 
+Models that do not conform to these requirements will *never* be incorporated
 into the built-in library.
 
@@ -309,7 +309,7 @@
 defines the parameters that form the model.
 
-**Note: The order of the parameters in the definition will be the order of the 
-parameters in the user interface and the order of the parameters in Iq(), 
-Iqxy() and form_volume(). And** *scale* **and** *background* **parameters are 
+**Note: The order of the parameters in the definition will be the order of the
+parameters in the user interface and the order of the parameters in Iq(),
+Iqxy() and form_volume(). And** *scale* **and** *background* **parameters are
 implicit to all models, so they do not need to be included in the parameter table.**
 
@@ -492,5 +492,5 @@
 and it includes orientation parameters.
 
-*form_volume* defines the volume of the shape. As in python models, it 
+*form_volume* defines the volume of the shape. As in python models, it
 includes only the volume parameters.
 
@@ -626,5 +626,5 @@
 
     sas_gamma(x):
-        Gamma function $\text{sas_gamma}(x) = \Gamma(x)$.
+        Gamma function sas_gamma\ $(x) = \Gamma(x)$.
 
         The standard math function, tgamma(x) is unstable for $x < 1$
@@ -636,7 +636,7 @@
     sas_erf(x), sas_erfc(x):
         Error function
-        $\text{sas_erf}(x) = \frac{2}{\sqrt\pi}\int_0^x e^{-t^2}\,dt$
+        sas_erf\ $(x) = \frac{2}{\sqrt\pi}\int_0^x e^{-t^2}\,dt$
         and complementary error function
-        $\text{sas_erfc}(x) = \frac{2}{\sqrt\pi}\int_x^{\infty} e^{-t^2}\,dt$.
+        sas_erfc $(x) = \frac{2}{\sqrt\pi}\int_x^{\infty} e^{-t^2}\,dt$.
 
         The standard math functions erf(x) and erfc(x) are slower and broken
@@ -647,5 +647,5 @@
 
     sas_J0(x):
-        Bessel function of the first kind $\text{sas_J0}(x)=J_0(x)$ where
+        Bessel function of the first kind sas_J0\ $(x)=J_0(x)$ where
         $J_0(x) = \frac{1}{\pi}\int_0^\pi \cos(x\sin(\tau))\,d\tau$.
 
@@ -656,5 +656,5 @@
 
     sas_J1(x):
-        Bessel function of the first kind  $\text{sas_J1}(x)=J_1(x)$ where
+        Bessel function of the first kind  sas_J1\ $(x)=J_1(x)$ where
         $J_1(x) = \frac{1}{\pi}\int_0^\pi \cos(\tau - x\sin(\tau))\,d\tau$.
 
@@ -666,5 +666,5 @@
     sas_JN(n, x):
         Bessel function of the first kind and integer order $n$:
-        $\text{sas_JN}(n, x)=J_n(x)$ where
+        sas_JN\ $(n, x)=J_n(x)$ where
         $J_n(x) = \frac{1}{\pi}\int_0^\pi \cos(n\tau - x\sin(\tau))\,d\tau$.
         If $n$ = 0 or 1, it uses sas_J0(x) or sas_J1(x), respectively.
@@ -676,5 +676,5 @@
 
     sas_Si(x):
-        Sine integral $\text{Si}(x) = \int_0^x \tfrac{\sin t}{t}\,dt$.
+        Sine integral Si\ $(x) = \int_0^x \tfrac{\sin t}{t}\,dt$.
 
         This function uses Taylor series for small and large arguments:
@@ -701,5 +701,5 @@
     sas_3j1x_x(x):
         Spherical Bessel form
-        $\text{sph_j1c}(x) = 3 j_1(x)/x = 3 (\sin(x) - x \cos(x))/x^3$,
+        sph_j1c\ $(x) = 3 j_1(x)/x = 3 (\sin(x) - x \cos(x))/x^3$,
         with a limiting value of 1 at $x=0$, where $j_1(x)$ is the spherical
         Bessel function of the first kind and first order.
@@ -712,5 +712,5 @@
 
     sas_2J1x_x(x):
-        Bessel form $\text{sas_J1c}(x) = 2 J_1(x)/x$, with a limiting value
+        Bessel form sas_J1c\ $(x) = 2 J_1(x)/x$, with a limiting value
         of 1 at $x=0$, where $J_1(x)$ is the Bessel function of first kind
         and first order.
@@ -835,5 +835,5 @@
 one return value for each point in the mesh grid.
 
-*NOTE: we may be removing or modifying this feature soon. As of the 
+*NOTE: we may be removing or modifying this feature soon. As of the
 time of writing, core-shell sphere returns (1., 1.) for VR, giving a volume
 ratio of 1.0.*
@@ -881,9 +881,9 @@
 ...............
 
-Either open the :ref:`Python_shell` (*Tools* > *Python Shell/Editor*) or the :ref:`Advanced_Plugin_Editor` (*Fitting* > *Plugin Model Operations* > *Advanced 
-Plugin Editor*), load your model, and then select *Run > Check Model* from the 
+Either open the :ref:`Python_shell` (*Tools* > *Python Shell/Editor*) or the :ref:`Advanced_Plugin_Editor` (*Fitting* > *Plugin Model Operations* > *Advanced
+Plugin Editor*), load your model, and then select *Run > Check Model* from the
 menu bar.
 
-An *Info* box will appear with the results of the compilation and a check that 
+An *Info* box will appear with the results of the compilation and a check that
 the model runs.
 
@@ -950,5 +950,5 @@
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-**NB: For now we are not providing pylint with the installer version of SasView; 
+**NB: For now we are not providing pylint with the installer version of SasView;
 so unless you have a SasView build environment available, you can ignore this section!**
 
Index: src/sas/sasgui/perspectives/fitting/media/residuals_help.rst
===================================================================
--- src/sas/sasgui/perspectives/fitting/media/residuals_help.rst	(revision 780545820bf596bf3709c434f3eb26bcc29a1236)
+++ src/sas/sasgui/perspectives/fitting/media/residuals_help.rst	(revision 940d034ea7562ca2e4afc05df3a79bc972ca4095)
@@ -18,5 +18,5 @@
 also provides two other measures of the quality of a fit:
 
-*  |chi|\  :sup:`2` (or 'Chi2'; pronounced 'chi-squared')
+*  $\chi^2$ (or 'Chi2'; pronounced 'chi-squared')
 *  *Residuals*
 
@@ -32,15 +32,17 @@
 *Npts* such that
 
-  *Chi2/Npts* = { SUM[(*Y_i* - *Y_theory_i*)^2 / (*Y_error_i*)^2] } / *Npts*
+.. math::
 
-This differs slightly from what is sometimes called the 'reduced chi-squared'
+  \chi^2/N_{pts} =  \sum[(Y_i - \mathrm{theory}_i)^2 / \mathrm{error}_i^2] / N_{pts}
+
+This differs slightly from what is sometimes called the 'reduced $\chi^2$'
 because it does not take into account the number of fitting parameters (to
-calculate the number of 'degrees of freedom'), but the 'normalized chi-squared'
-and the 'reduced chi-squared' are very close to each other when *Npts* >> number of
-parameters.
+calculate the number of 'degrees of freedom'), but the 'normalized $\chi^2$
+and the 'reduced $\chi^2$ are very close to each other when $N_{pts} \gg
+\text{number of parameters}.
 
-For a good fit, *Chi2/Npts* tends to 0.
+For a good fit, $\chi^2/N_{pts}$ tends to 1.
 
-*Chi2/Npts* is sometimes referred to as the 'goodness-of-fit' parameter.
+$\chi^2/N_{pts}$ is sometimes referred to as the 'goodness-of-fit' parameter.
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
@@ -53,10 +55,12 @@
 value and its *true* value is its error).
 
-*SasView* calculates 'normalized residuals', *R_i*, for each data point in the
+*SasView* calculates 'normalized residuals', $R_i$, for each data point in the
 fit:
 
-  *R_i* = (*Y_i* - *Y_theory_i*) / (*Y_err_i*)
+.. math::
 
-For a good fit, *R_i* ~ 0.
+  R_i = (Y_i - Y_theory_i) / (Y_err_i)
+
+For a good fit, $R_i \sim 0$.
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
Index: src/sas/sasgui/perspectives/fitting/media/sm_help.rst
===================================================================
--- src/sas/sasgui/perspectives/fitting/media/sm_help.rst	(revision 27aabc18ac7747d6e4078aa2f94c97a7a3a3ee12)
+++ src/sas/sasgui/perspectives/fitting/media/sm_help.rst	(revision 5ed76f8390eac56ff5d3779fd9c454d0c8fe1dc0)
@@ -4,13 +4,13 @@
 .. by S King, ISIS, during SasView CodeCamp-III in Feb 2015.
 
-.. |inlineimage004| image:: sm_image004.gif
-.. |inlineimage005| image:: sm_image005.gif
-.. |inlineimage008| image:: sm_image008.gif
-.. |inlineimage009| image:: sm_image009.gif
-.. |inlineimage010| image:: sm_image010.gif
-.. |inlineimage011| image:: sm_image011.gif
-.. |inlineimage012| image:: sm_image012.gif
-.. |inlineimage018| image:: sm_image018.gif
-.. |inlineimage019| image:: sm_image019.gif
+.. |inlineimage004| image:: sm_image004.png
+.. |inlineimage005| image:: sm_image005.png
+.. |inlineimage008| image:: sm_image008.png
+.. |inlineimage009| image:: sm_image009.png
+.. |inlineimage010| image:: sm_image010.png
+.. |inlineimage011| image:: sm_image011.png
+.. |inlineimage012| image:: sm_image012.png
+.. |inlineimage018| image:: sm_image018.png
+.. |inlineimage019| image:: sm_image019.png
 
 
@@ -20,14 +20,14 @@
 ==================
 
-Sometimes the instrumental geometry used to acquire the experimental data has 
-an impact on the clarity of features in the reduced scattering curve. For 
-example, peaks or fringes might be slightly broadened. This is known as 
-*Q resolution smearing*. To compensate for this effect one can either try and 
-remove the resolution contribution - a process called *desmearing* - or add the 
-resolution contribution into a model calculation/simulation (which by definition 
-will be exact) to make it more representative of what has been measured 
+Sometimes the instrumental geometry used to acquire the experimental data has
+an impact on the clarity of features in the reduced scattering curve. For
+example, peaks or fringes might be slightly broadened. This is known as
+*Q resolution smearing*. To compensate for this effect one can either try and
+remove the resolution contribution - a process called *desmearing* - or add the
+resolution contribution into a model calculation/simulation (which by definition
+will be exact) to make it more representative of what has been measured
 experimentally - a process called *smearing*. SasView will do the latter.
 
-Both smearing and desmearing rely on functions to describe the resolution 
+Both smearing and desmearing rely on functions to describe the resolution
 effect. SasView provides three smearing algorithms:
 
@@ -36,5 +36,5 @@
 *  *2D Smearing*
 
-SasView also has an option to use Q resolution data (estimated at the time of 
+SasView also has an option to use $Q$ resolution data (estimated at the time of
 data reduction) supplied in a reduced data file: the *Use dQ data* radio button.
 
@@ -43,6 +43,6 @@
 dQ Smearing
 -----------
- 
-If this option is checked, SasView will assume that the supplied dQ values 
+
+If this option is checked, SasView will assume that the supplied $dQ$ values
 represent the standard deviations of Gaussian functions.
 
@@ -57,18 +57,18 @@
 The slit-smeared scattering intensity is defined by
 
-.. image:: sm_image002.gif
+.. image:: sm_image002.png
 
 where *Norm* is given by
 
-.. image:: sm_image003.gif
+.. image:: sm_image003.png
 
 **[Equation 1]**
 
-The functions |inlineimage004| and |inlineimage005|
-refer to the slit width weighting function and the slit height weighting 
-determined at the given *q* point, respectively. It is assumed that the weighting
+The functions $W_v(v)$ and $W_u(u)$
+refer to the slit width weighting function and the slit height weighting
+determined at the given $q$ point, respectively. It is assumed that the weighting
 function is described by a rectangular function, such that
 
-.. image:: sm_image006.gif
+.. image:: sm_image006.png
 
 **[Equation 2]**
@@ -76,55 +76,57 @@
 and
 
-.. image:: sm_image007.gif
+.. image:: sm_image007.png
 
 **[Equation 3]**
 
-so that |inlineimage008| |inlineimage009| for |inlineimage010| and *u*\ .
-
-Here |inlineimage011| and |inlineimage012| stand for
-the slit height (FWHM/2) and the slit width (FWHM/2) in *q* space.
+so that $\Delta q_\alpha = \int_0^\infty d\alpha W_\alpha(\alpha)$
+for $\alpha = v$ and $u$.
+
+Here $\Delta q_u$ and $\Delta q_v$ stand for
+the slit height (FWHM/2) and the slit width (FWHM/2) in $q$ space.
 
 This simplifies the integral in Equation 1 to
 
-.. image:: sm_image013.gif
+.. image:: sm_image013.png
 
 **[Equation 4]**
 
-which may be solved numerically, depending on the nature of |inlineimage011| and |inlineimage012| .
+which may be solved numerically, depending on the nature of
+$\Delta q_u$ and $\Delta q_v$.
 
 Solution 1
 ^^^^^^^^^^
 
-**For** |inlineimage012| **= 0 and** |inlineimage011| **= constant.**
-
-.. image:: sm_image016.gif
-
-For discrete *q* values, at the *q* values of the data points and at the *q*
-values extended up to *q*\ :sub:`N`\ = *q*\ :sub:`i` + |inlineimage011| the smeared
+**For $\Delta q_v= 0$ and $\Delta q_u = \text{constant}$.**
+
+.. image:: sm_image016.png
+
+For discrete $q$ values, at the $q$ values of the data points and at the $q$
+values extended up to $q_N = q_i + \Delta q_u$ the smeared
 intensity can be approximately calculated as
 
-.. image:: sm_image017.gif
+.. image:: sm_image017.png
 
 **[Equation 5]**
 
-where |inlineimage018| = 0 for *I*\ :sub:`s` when *j* < *i* or *j* > *N-1*.
+where |inlineimage018| = 0 for $I_s$ when $j < i$ or $j > N-1$.
 
 Solution 2
 ^^^^^^^^^^
 
-**For** |inlineimage012| **= constant and** |inlineimage011| **= 0.**
+**For $\Delta q_v = \text{constant}$ and $\Delta q_u= 0$.**
 
 Similar to Case 1
 
-|inlineimage019| for *q*\ :sub:`p` = *q*\ :sub:`i` - |inlineimage012| and *q*\ :sub:`N` = *q*\ :sub:`i` + |inlineimage012|
+|inlineimage019| for $q_p = q_i - \Delta q_v$ and $q_N = q_i + \Delta q_v$
 
 **[Equation 6]**
 
-where |inlineimage018| = 0 for *I*\ :sub:`s` when *j* < *p* or *j* > *N-1*.
+where |inlineimage018| = 0 for $I_s$ when $j < p$ or $j > N-1$.
 
 Solution 3
 ^^^^^^^^^^
 
-**For** |inlineimage011| **= constant and** |inlineimage011| **= constant.**
+**For $\Delta q_u = \text{constant}$ and $\Delta q_v = \text{constant}$.**
 
 In this case, the best way is to perform the integration of Equation 1
@@ -138,11 +140,10 @@
 numerical integration for the slit width. Then
 
-.. image:: sm_image020.gif
+.. image:: sm_image020.png
 
 **[Equation 7]**
 
-for *q*\ :sub:`p` = *q*\ :sub:`i` - |inlineimage012| and *q*\ :sub:`N` = *q*\ :sub:`i` + |inlineimage012|
-
-where |inlineimage018| = 0 for *I*\ :sub:`s` when *j* < *p* or *j* > *N-1*.
+for *q_p = q_i - \Delta q_v$ and $q_N = q_i + \Delta q_v$
+where |inlineimage018| = 0 for *I_s$ when $j < p$ or $j > N-1$.
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
@@ -158,5 +159,5 @@
 Equation 6 becomes
 
-.. image:: sm_image021.gif
+.. image:: sm_image021.png
 
 **[Equation 8]**
@@ -171,33 +172,34 @@
 Thus
 
-.. image:: sm_image022.gif
+.. image:: sm_image022.png
 
 **[Equation 9]**
 
-In Equation 9, *x*\ :sub:`0` = *q* cos(|theta|), *y*\ :sub:`0` = *q* sin(|theta|), and
-the primed axes, are all in the coordinate rotated by an angle |theta| about
-the z-axis (see the figure below) so that *x'*\ :sub:`0` = *x*\ :sub:`0` cos(|theta|) +
-*y*\ :sub:`0` sin(|theta|) and *y'*\ :sub:`0` = -*x*\ :sub:`0` sin(|theta|) +
-*y*\ :sub:`0` cos(|theta|). Note that the rotation angle is zero for a x-y symmetric
-elliptical Gaussian distribution. The *A* is a normalization factor.
-
-.. image:: sm_image023.gif
-
-Now we consider a numerical integration where each of the bins in |theta| and *R* are
-*evenly* (this is to simplify the equation below) distributed by |bigdelta|\ |theta|
-and |bigdelta|\ R, respectively, and it is further assumed that *I(x',y')* is constant
+In Equation 9, $x_0 = q \cos(\theta)$, $y_0 = q \sin(\theta)$, and
+the primed axes, are all in the coordinate rotated by an angle $\theta$ about
+the z-axis (see the figure below) so that
+$x'_0 = x_0 \cos(\theta) + y_0 \sin(\theta)$ and
+$y'_0 = -x_0 \sin(\theta) + y_0 \cos(\theta)$.
+Note that the rotation angle is zero for a $xy$ symmetric
+elliptical Gaussian distribution. The $A$ is a normalization factor.
+
+.. image:: sm_image023.png
+
+Now we consider a numerical integration where each of the bins in $\theta$ and $R$ are
+*evenly* (this is to simplify the equation below) distributed by $\Delta \theta$
+and $\Delta R$, respectively, and it is further assumed that $I(x',y')$ is constant
 within the bins. Then
 
-.. image:: sm_image024.gif
+.. image:: sm_image024.png
 
 **[Equation 10]**
 
 Since the weighting factor on each of the bins is known, it is convenient to
-transform *x'-y'* back to *x-y* coordinates (by rotating it by -|theta| around the
-*z* axis).
+transform $x'y'$ back to $xy$ coordinates (by rotating it by $-\theta$ around the
+$z$ axis).
 
 Then, for a polar symmetric smear
 
-.. image:: sm_image025.gif
+.. image:: sm_image025.png
 
 **[Equation 11]**
@@ -205,9 +207,9 @@
 where
 
-.. image:: sm_image026.gif
-
-while for a *x-y* symmetric smear
-
-.. image:: sm_image027.gif
+.. image:: sm_image026.png
+
+while for a $xy$ symmetric smear
+
+.. image:: sm_image027.png
 
 **[Equation 12]**
@@ -215,5 +217,5 @@
 where
 
-.. image:: sm_image028.gif
+.. image:: sm_image028.png
 
 The current version of the SasView uses Equation 11 for 2D smearing, assuming
@@ -225,9 +227,9 @@
 -------------------------
 
-In all the cases above, the weighting matrix *W* is calculated on the first call
-to a smearing function, and includes ~60 *q* values (finely and evenly binned)
-below (>0) and above the *q* range of data in order to smear all data points for
-a given model and slit/pinhole size. The *Norm*  factor is found numerically with the
-weighting matrix and applied on the computation of *I*\ :sub:`s`.
+In all the cases above, the weighting matrix $W$ is calculated on the first call
+to a smearing function, and includes ~60 $q$ values (finely and evenly binned)
+below (>0) and above the $q$ range of data in order to smear all data points for
+a given model and slit/pinhole size. The $Norm$  factor is found numerically with the
+weighting matrix and applied on the computation of $I_s$.
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
