Skip to content

Commit 5c272af

Browse files
committed
Update URLs per suggestions from make linkcheck
1 parent d6ff2f7 commit 5c272af

File tree

7 files changed

+22
-22
lines changed

7 files changed

+22
-22
lines changed

Diff for: NSFnugget.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ the beamtime is over. PDFgui has numerous extensions
3636
that are described in more detail in [#]_. The beta version of PDFgui
3737
is now in public release, available for Windows, Linux and Mac OSX platforms,
3838
and in the first month has been downloaded 220 times. More information can be
39-
found at http://www.diffpy.org.
39+
found at https://www.diffpy.org.
4040

4141
.. [#] |citeFarrowJpcm07|

Diff for: abbreviations.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
33
.. Named web links -----------------------------------------------------
44
5-
.. |anaconda-download| replace:: https://www.anaconda.com/download
6-
.. _anaconda-download: https://www.anaconda.com/download
5+
.. |anaconda-download| replace:: https://www.anaconda.com/distribution
6+
.. _anaconda-download: https://www.anaconda.com/distribution
77
.. _diffpy-users: https://groups.google.com/d/forum/diffpy-users
88
.. _ctv-xpdfsuite: https://columbia.resoluteinnovation.com/technologies/M11-120
99

@@ -46,7 +46,7 @@
4646
C. L. Farrow, P. Juhás, J. W. Liu, D. Bryndin, E. S. Božin, J. Bloch,
4747
Th. Proffen and S. J. L. Billinge, `PDFfit2 and PDFgui: computer
4848
programs for studying nanostructure in crystals
49-
<http://iopscience.iop.org/0953-8984/19/33/335219/>`__,
49+
<https://doi.org/10.1088/0953-8984/19/33/335219>`__,
5050
*J. Phys.: Condens. Mat.* **19**, 335219 (2007)
5151
|downloadFarrowJpcm07|
5252

Diff for: index.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ centered at Columbia University and, before that, Michigan State University.
4747

4848
.. _danse: http://danse.us/
4949

50-
.. _national science foundation: http://www.nsf.gov/
50+
.. _national science foundation: https://www.nsf.gov/
5151

5252
.. _department of energy, office of basic energy sciences: https://science.energy.gov/bes/
5353

54-
.. _brookhaven national laboratory: http://www.bnl.gov/
54+
.. _brookhaven national laboratory: https://www.bnl.gov/
5555

5656
.. image:: images/blank1x1.png
5757
:align: left

Diff for: products/SrMise.rst

+10-10
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ executables, installation instructions, and licensing information
6565
for some popular options are listed below.
6666

6767
* `Anaconda`_
68-
* `Enthought Canopy <https://www.enthought.com/products/canopy/>`_
69-
* `Python(x,y) <https://code.google.com/p/pythonxy/>`_
68+
* `Enthought Canopy <https://www.enthought.com/product/canopy/>`_
69+
* `Python(x,y) <https://python-xy.github.io>`_
7070
* `WinPython <http://winpython.github.io>`_
7171

7272
.. _Anaconda: anaconda-download_
@@ -77,14 +77,14 @@ Numpy and SciPy do not currently support 64-bit Python installations, so be
7777
sure to download the 32-bit versions of these packages.
7878

7979
* `Python 2.6/2.7 <https://www.python.org/downloads/windows/>`_
80-
* `NumPy <http://sourceforge.net/projects/numpy/files/NumPy/>`_
81-
* `SciPy <http://sourceforge.net/projects/scipy/files/scipy/>`_
82-
* `matplotlib <http://matplotlib.org/downloads.html>`_
80+
* `NumPy <https://sourceforge.net/projects/numpy/files/NumPy/>`_
81+
* `SciPy <https://sourceforge.net/projects/scipy/files/scipy/>`_
82+
* `matplotlib <https://matplotlib.org/downloads.html>`_
8383

8484
After installing Python and the required packages, we can install SrMise.
8585
The simplest way to obtain diffpy.srmise on Windows systems
8686
is using ``pip`` to download and install the latest release from the
87-
`Python Package Index <https://pypi.python.org>`_ (PyPI). To do so, open a
87+
`Python Package Index <https://pypi.org>`_ (PyPI). To do so, open a
8888
command window by running ``cmd`` from the Start Menu's application search box
8989
(Windows 7/8/10) or Run command (Windows Vista and earlier). Verify that the
9090
``pip`` program is installed by running ::
@@ -124,13 +124,13 @@ in MacPorts::
124124

125125
The simplest way to obtain diffpy.srmise on Mac OS X systems
126126
is using ``pip`` to download and install the latest release from
127-
`PyPI <https://pypi.python.org>`_. ::
127+
`PyPI <https://pypi.org>`_. ::
128128

129129
sudo pip install diffpy.srmise
130130

131131
If you prefer to install from sources, download them from the
132132
`GitHub <https://github.com/diffpy/diffpy.srmise/releases>`__ or
133-
`PyPI <https://pypi.python.org/pypi/diffpy.srmise>`__ pages for SrMise.
133+
`PyPI <https://pypi.org/project/diffpy.srmise>`__ pages for SrMise.
134134
Uncompress them to a directory, and from that directory run ::
135135

136136
sudo python setup.py install
@@ -159,13 +159,13 @@ For other Linux distributions consult the appropriate package manager.
159159

160160
The simplest way to obtain diffpy.srmise on Linux systems
161161
is using ``pip`` to download and install the latest release from
162-
`PyPI <https://pypi.python.org>`_. ::
162+
`PyPI <https://pypi.org>`_. ::
163163

164164
sudo pip install diffpy.srmise
165165

166166
If you prefer to install from sources, download them from the
167167
`GitHub <https://github.com/diffpy/diffpy.srmise/releases>`__ or
168-
`PyPI <https://pypi.python.org/pypi/diffpy.srmise>`__ pages for SrMise.
168+
`PyPI <https://pypi.org/project/diffpy.srmise>`__ pages for SrMise.
169169
Uncompress them to a directory, and from that directory run ::
170170

171171
sudo python setup.py install

Diff for: products/diffpycmi/install.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ Mac OS X
4141
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4242

4343
For Mac OS X the system dependencies can be installed using the
44-
`MacPorts <http://www.macports.org>`_ software manager. A similar
45-
package system `Homebrew <http://brew.sh>`_ works as well, but has
44+
`MacPorts <https://www.macports.org>`_ software manager. A similar
45+
package system `Homebrew <https://brew.sh>`_ works as well, but has
4646
been considerably less tested with DiffPy-CMI.
4747

4848
For best results with MacPorts follow these tips:

Diff for: products/mPDF.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ prerequisite software and then use the command ::
7979
*Alternative option: Download and install from source.*
8080

8181
If you prefer to install from source, you can also zip and download the entire package
82-
from `PyPI <https://pypi.python.org/pypi/diffpy.mpdf>`__ or
82+
from `PyPI <https://pypi.org/project/diffpy.mpdf>`__ or
8383
`GitHub <https://github.com/benfrandsen/diffpy.magpdf>`__, then unzip the file and
8484
execute the following command from inside the unzipped directory ::
8585

@@ -89,7 +89,7 @@ Note that this will only work if all the dependencies are already properly insta
8989

9090
Documentation
9191
-------------
92-
Please see `http://pythonhosted.org/diffpy.mpdf/ <http://pythonhosted.org/diffpy.mpdf/>`__
92+
Please see https://pythonhosted.org/diffpy.mpdf
9393
for the documentation.
9494

9595
What next?

Diff for: products/pdfgui.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ By downloading and using this software you are agreeing to the
3434
conditions specified in the :doc:`software license <pdfguilicense>`.
3535

3636
PDFgui is distributed as a software package for
37-
`Anaconda Python <https://www.continuum.io>`__. PDFgui is available
37+
`Anaconda Python <https://www.anaconda.com>`__. PDFgui is available
3838
for all operating systems supported by Anaconda, namely for
3939
Linux, Mac OS X, and Windows.
4040

@@ -110,7 +110,7 @@ Other versions
110110

111111
When Anaconda Python is not available, PDFgui can be installed from
112112
sources. The latest source package is at the `Python Package
113-
Index <https://pypi.python.org/pypi/diffpy.pdfgui>`__ and the
113+
Index <https://pypi.org/project/diffpy.pdfgui>`__ and the
114114
prior versions are at
115115
https://github.com/diffpy/diffpy.pdfgui/releases. See the `README
116116
<https://github.com/diffpy/diffpy.pdfgui#pdfgui>`__ document

0 commit comments

Comments
 (0)