diff options
| author | Donald Stufft <donald@stufft.io> | 2014-05-03 02:37:03 -0400 |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2014-05-03 02:37:03 -0400 |
| commit | a4fec67bbadd35afbd9d205594cf701654cf810c (patch) | |
| tree | a7f9151e85782f13eff698ac68839d6814be7652 /README.rst | |
| parent | e59455593b128fbdc471cc51079401df1cba1742 (diff) | |
| parent | 0e72f65bf4e5ea6b8fd17d02fe4cae0ba7da5113 (diff) | |
| download | pip-a4fec67bbadd35afbd9d205594cf701654cf810c.tar.gz | |
Merge branch 'master' into develop
Conflicts:
.travis.yml
CHANGES.txt
PROJECT.txt
README.rst
docs/installing.rst
pip/__init__.py
pip/_vendor/vendor.txt
setup.py
tox.ini
Diffstat (limited to 'README.rst')
| -rw-r--r-- | README.rst | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/README.rst b/README.rst index 0130d6281..5a3dcd762 100644 --- a/README.rst +++ b/README.rst @@ -5,9 +5,9 @@ The `PyPA recommended <https://python-packaging-user-guide.readthedocs.org/en/latest/current.html>`_ tool for installing Python packages. -* `Installation <http://www.pip-installer.org/en/latest/installing.html>`_ -* `Documentation <http://www.pip-installer.org>`_ -* `Changelog <http://www.pip-installer.org/en/latest/news.html>`_ +* `Installation <https://pip.pypa.io/en/latest/installing.html>`_ +* `Documentation <https://pip.pypa.io/>`_ +* `Changelog <https://pip.pypa.io/en/latest/news.html>`_ * `Github Page <https://github.com/pypa/pip>`_ * `Issue Tracking <https://github.com/pypa/pip/issues>`_ * `Mailing list <http://groups.google.com/group/python-virtualenv>`_ @@ -20,5 +20,3 @@ tool for installing Python packages. .. image:: https://secure.travis-ci.org/pypa/pip.png?branch=develop :target: http://travis-ci.org/pypa/pip - - |