From 41ba29ecb853d87c9c6c75fc7887872b13d1abc5 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Sun, 08 May 2016 09:03:30 +0200
Subject: [PATCH] Merge pull request #2557 from stevepiercy/1.5-branch
---
docs/narr/install.rst | 11 +++++------
docs/quick_tour.rst | 4 ++--
docs/quick_tutorial/requirements.rst | 6 +++---
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index 43dc62f..acdf6ca 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -197,8 +197,8 @@
~~~~~~~~~~~~~~~~~~~~~
To install setuptools by hand under Python 2, first download `ez_setup.py
-<https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py>`_ then invoke
-it using the Python interpreter into which you want to install setuptools.
+<https://bootstrap.pypa.io/ez_setup.py>`_ then invoke it using the Python
+interpreter into which you want to install setuptools.
.. code-block:: text
@@ -325,10 +325,9 @@
version.
#. Install latest :term:`setuptools` distribution into the Python from step 1
- above: download `ez_setup.py
- <https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py>`_ and run
- it using the ``python`` interpreter of your Python 2.7 or 3.3 installation
- using a command prompt:
+ above: download `ez_setup.py <https://bootstrap.pypa.io/ez_setup.py>`_ and
+ run it using the ``python`` interpreter of your Python 2.7 or 3.3
+ installation using a command prompt:
.. code-block:: text
diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst
index a7c1847..4b01143 100644
--- a/docs/quick_tour.rst
+++ b/docs/quick_tour.rst
@@ -25,7 +25,7 @@
.. parsed-literal::
$ pyvenv env33
- $ wget https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py -O - | env33/bin/python
+ $ wget https://bootstrap.pypa.io/ez_setup.py -O - | env33/bin/python
$ env33/bin/easy_install "pyramid==\ |release|\ "
For Windows:
@@ -33,7 +33,7 @@
.. parsed-literal::
# Use your browser to download:
- # https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py
+ # https://bootstrap.pypa.io/ez_setup.py
c:\\> c:\\Python33\\python -m venv env33
c:\\> env33\\Scripts\\python ez_setup.py
c:\\> env33\\Scripts\\easy_install "pyramid==\ |release|\ "
diff --git a/docs/quick_tutorial/requirements.rst b/docs/quick_tutorial/requirements.rst
index c05f559..b1630cf 100644
--- a/docs/quick_tutorial/requirements.rst
+++ b/docs/quick_tutorial/requirements.rst
@@ -188,12 +188,12 @@
.. code-block:: bash
# Mac and Linux
- $ wget https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py -O - | $VENV/bin/python
+ $ wget https://bootstrap.pypa.io/ez_setup.py -O - | $VENV/bin/python
# Windows
#
# Use your web browser to download this file:
- # https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py
+ # https://bootstrap.pypa.io/ez_setup.py
#
# ...and save it to:
# c:\projects\quick_tutorial\ez_setup.py
@@ -207,7 +207,7 @@
.. code-block:: bash
# Mac and Linux
- $ wget --no-check-certificate https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py -O - | $VENV/bin/python
+ $ wget --no-check-certificate https://bootstrap.pypa.io/ez_setup.py -O - | $VENV/bin/python
.. _install-pyramid:
--
Gitblit v1.9.3