Sync with the source at d388086.

pavoljuhas · pavoljuhas · commit 8a410294df22 · 2018-10-11T17:59:32.000-04:00
diff --git a/_sources/products/SrMise.rst.txt b/_sources/products/SrMise.rst.txt
@@ -2,6 +2,8 @@
 SrMise
 ##########
 
+.. include:: ../abbreviations.txt
+
 SrMise is the DiffPy tool for peak extraction and peak fitting from atomic
 pair distribution functions (PDFs). It implements a powerful
 information-theoretic multimodeling approach based on the  Akaike information
@@ -62,11 +64,13 @@ individual and/or academic use, but some also have commercial version.  Links to
 executables, installation instructions, and licensing information
 for some popular options are listed below.
 
-* `Anaconda <http://www.continuum.io/downloads>`_
+* `Anaconda`_
 * `Enthought Canopy <https://www.enthought.com/products/canopy/>`_
 * `Python(x,y) <https://code.google.com/p/pythonxy/>`_
 * `WinPython <http://winpython.github.io>`_
 
+.. _Anaconda: anaconda-download_
+
 Alternately, individual Windows executables for Python and the required
 components can be downloaded and installed.  The official Windows releases of
 Numpy and SciPy do not currently support 64-bit Python installations, so be
diff --git a/_sources/products/diffpycmi/index.rst.txt b/_sources/products/diffpycmi/index.rst.txt
@@ -37,7 +37,7 @@ Use of this software is subject to the conditions in
 As of version 2.0 DiffPy-CMI is available for Linux and
 Mac as a collection of packages for Anaconda Python.  As
 a first step download and install **Anaconda for Python 2.7**
-from http://www.continuum.io/downloads.
+from |anaconda-download|.
 
 .. note::
    If you already have Anaconda for Python 3.5, create a separate
diff --git a/_sources/products/mPDF.rst.txt b/_sources/products/mPDF.rst.txt
@@ -2,6 +2,8 @@
 mpdf
 ##########
 
+.. include:: ../abbreviations.txt
+
 The diffpy.mpdf package provides a convenient method for computing the magnetic PDF
 (mPDF) from magnetic structures and performing fits to neutron total scattering
 data. The mPDF is calculated by an MPDFcalculator object, which extracts the spin
@@ -40,7 +42,7 @@ Installation
 ------------
 
 The recommended way to install this package is through conda. For help installing conda,
-please visit `https://www.continuum.io/downloads <https://www.continuum.io/downloads>`__.
+please visit |anaconda-download|.
 Once conda is installed, you can follow the simple steps below to install diffpy.mpdf.
 You will also install the full diffpy-cmi suite along the way.
 
diff --git a/_sources/products/pdfgui.rst.txt b/_sources/products/pdfgui.rst.txt
@@ -1,4 +1,5 @@
 .. highlight:: bash
+.. include:: ../abbreviations.txt
 
 ######
 PDFgui
@@ -39,7 +40,7 @@ for all operating systems supported by Anaconda, namely for 32 and
 
 As a prerequisite for PDFgui installation, download and
 install **Anaconda for Python 2.7** from
-https://www.continuum.io/downloads.
+|anaconda-download|.
 
 .. note::
    If you already use Anaconda for Python 3.5, create a separate
diff --git a/_sources/products/xinterpdf.rst.txt b/_sources/products/xinterpdf.rst.txt
@@ -49,7 +49,7 @@ Installation
 
 xINTERPDF can be installed on Linux and Mac OS machines. The recommended
 way to install this package is through conda. Please visit
-https://www.continuum.io/downloads, and select Python 2.7 version
+|anaconda-download|, and select Python 2.7 version
 to download and install. Once conda is installed, you can follow the
 steps below to install xINTERPDF.
 
diff --git a/doc/xinterpdf/Shi-jac-2018.pdf b/doc/xinterpdf/Shi-jac-2018.pdf
diff --git a/products/SrMise.html b/products/SrMise.html
@@ -148,7 +148,7 @@ <h2>Getting Started<a class="headerlink" href="#getting-started" title="Permalin
 executables, installation instructions, and licensing information
 for some popular options are listed below.</p>
 <ul class="simple">
-<li><a class="reference external" href="http://www.continuum.io/downloads">Anaconda</a></li>
+<li><a class="reference external" href="https://www.anaconda.com/download">Anaconda</a></li>
 <li><a class="reference external" href="https://www.enthought.com/products/canopy/">Enthought Canopy</a></li>
 <li><a class="reference external" href="https://code.google.com/p/pythonxy/">Python(x,y)</a></li>
 <li><a class="reference external" href="http://winpython.github.io">WinPython</a></li>
diff --git a/products/diffpycmi/index.html b/products/diffpycmi/index.html
@@ -124,7 +124,7 @@ <h2>Installation<a class="headerlink" href="#installation" title="Permalink to t
 <p>As of version 2.0 DiffPy-CMI is available for Linux and
 Mac as a collection of packages for Anaconda Python.  As
 a first step download and install <strong>Anaconda for Python 2.7</strong>
-from <a class="reference external" href="http://www.continuum.io/downloads">http://www.continuum.io/downloads</a>.</p>
+from <a class="reference external" href="https://www.anaconda.com/download">https://www.anaconda.com/download</a>.</p>
 <div class="admonition note">
 <p class="first admonition-title">Note</p>
 <p>If you already have Anaconda for Python 3.5, create a separate
diff --git a/products/mPDF.html b/products/mPDF.html
@@ -128,7 +128,7 @@ <h2>Getting Started<a class="headerlink" href="#getting-started" title="Permalin
 <div class="section" id="installation">
 <h3>Installation<a class="headerlink" href="#installation" title="Permalink to this headline">¶</a></h3>
 <p>The recommended way to install this package is through conda. For help installing conda,
-please visit <a class="reference external" href="https://www.continuum.io/downloads">https://www.continuum.io/downloads</a>.
+please visit <a class="reference external" href="https://www.anaconda.com/download">https://www.anaconda.com/download</a>.
 Once conda is installed, you can follow the simple steps below to install diffpy.mpdf.
 You will also install the full diffpy-cmi suite along the way.</p>
 <p><em>Step 1: Add the appropriate conda channels to your conda configuration.</em></p>
diff --git a/products/pdfgui.html b/products/pdfgui.html
@@ -125,7 +125,7 @@ <h2>Installation<a class="headerlink" href="#installation" title="Permalink to t
 64-bit Linux, Mac OS X, and 32 and 64-bit Windows.</p>
 <p>As a prerequisite for PDFgui installation, download and
 install <strong>Anaconda for Python 2.7</strong> from
-<a class="reference external" href="https://www.continuum.io/downloads">https://www.continuum.io/downloads</a>.</p>
+<a class="reference external" href="https://www.anaconda.com/download">https://www.anaconda.com/download</a>.</p>
 <div class="admonition note">
 <p class="first admonition-title">Note</p>
 <p>If you already use Anaconda for Python 3.5, create a separate
diff --git a/products/xinterpdf.html b/products/xinterpdf.html
@@ -138,7 +138,7 @@ <h2>Getting Started<a class="headerlink" href="#getting-started" title="Permalin
 <h3>Installation<a class="headerlink" href="#installation" title="Permalink to this headline">¶</a></h3>
 <p>xINTERPDF can be installed on Linux and Mac OS machines. The recommended
 way to install this package is through conda. Please visit
-<a class="reference external" href="https://www.continuum.io/downloads">https://www.continuum.io/downloads</a>, and select Python 2.7 version
+<a class="reference external" href="https://www.anaconda.com/download">https://www.anaconda.com/download</a>, and select Python 2.7 version
 to download and install. Once conda is installed, you can follow the
 steps below to install xINTERPDF.</p>
 <p><em>Step 1: Add the diffpy conda channel to your conda configuration.</em></p>
@@ -173,9 +173,11 @@ <h3>References<a class="headerlink" href="#references" title="Permalink to this
 papers:</p>
 <ul class="simple">
 <li>C. Shi,
-xINTERPDF: a GUI program for analyzing intermolecular pair
-distribution functions of organic compounds from X-ray total
-scattering data, under review, <em>J. Appl. Crystallogr.</em>, (2018).</li>
+<a class="reference external" href="https://doi.org/10.1107/S1600576718012359">xINTERPDF: a graphical user interface for analyzing
+intermolecular pair distribution functions of organic compounds
+from X-ray total scattering data</a>,
+<em>J. Appl. Crystallogr.</em> <strong>51</strong>, 1498-1499 (2018)
+<a class="reference external" href="/doc/xinterpdf/Shi-jac-2018.pdf"><img alt="downloadShiJac18" src="../_images/pdficon_small.png" /></a></li>
 <li>P. Juhás, C. L. Farrow, X. Yang, K. R. Knox and S. J. L. Billinge,
 <a class="reference external" href="http://dx.doi.org/10.1107/S2053273315014473">Complex modeling: a strategy and software program for combining
 multiple information sources to solve ill posed structure and
diff --git a/products/xinterpdflicense.html b/products/xinterpdflicense.html
@@ -99,9 +99,10 @@
 leads to publication, we ask that you acknowledge use of the
 program by citing the following papers in your publication:
 
-    * Chenyang Shi, &quot;xINTERPDF: a GUI program for analyzing intermolecular
-      pair distribution functions of organic compounds from X-ray total
-      scattering data&quot;, under review, J. Appl. Cryst., 2018.
+    * Chenyang Shi, &quot;xINTERPDF: a graphical use interface for
+      analyzing intermolecular pair distribution functions of
+      organic compounds from X-ray total scattering data&quot;,
+      J. Appl. Crystallogr. 51, 1498-1499 (2018).
 
     * Pavol Juhás, Christopher L. Farrow, Xiaohao Yang, Kevin R. Knox,
       and Simon J. L. Billinge, &quot;Complex modeling: a strategy and software
diff --git a/searchindex.js b/searchindex.js
