From 9ed92906b3b9096464e293d2e636ac25f3c279e6 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Tue, 5 Aug 2014 08:23:34 -0400 Subject: [PATCH] [1.7.x] Fixed broken links in docs. Backport of 0efd72dc90 from master --- docs/internals/contributing/writing-code/unit-tests.txt | 2 +- docs/internals/contributing/writing-documentation.txt | 6 +----- docs/ref/contrib/sitemaps.txt | 2 +- docs/ref/django-admin.txt | 2 +- docs/releases/1.0-alpha-2.txt | 3 +-- docs/releases/1.1.txt | 3 +-- docs/topics/install.txt | 2 +- docs/topics/python3.txt | 2 +- 8 files changed, 8 insertions(+), 14 deletions(-) diff --git a/docs/internals/contributing/writing-code/unit-tests.txt b/docs/internals/contributing/writing-code/unit-tests.txt index 3571fb0c26..3d0df101bd 100644 --- a/docs/internals/contributing/writing-code/unit-tests.txt +++ b/docs/internals/contributing/writing-code/unit-tests.txt @@ -199,7 +199,7 @@ associated tests will be skipped. .. _gettext: http://www.gnu.org/software/gettext/manual/gettext.html .. _selenium: https://pypi.python.org/pypi/selenium .. _sqlparse: https://pypi.python.org/pypi/sqlparse -.. _pip requirements files: http://www.pip-installer.org/en/latest/cookbook.html#requirements-files +.. _pip requirements files: http://www.pip-installer.org/en/latest/user_guide.html#requirements-files Code coverage ~~~~~~~~~~~~~ diff --git a/docs/internals/contributing/writing-documentation.txt b/docs/internals/contributing/writing-documentation.txt index 8ef9490d57..dbec9921d0 100644 --- a/docs/internals/contributing/writing-documentation.txt +++ b/docs/internals/contributing/writing-documentation.txt @@ -154,7 +154,7 @@ Django-specific markup Besides the `Sphinx built-in markup`__, Django's docs defines some extra description units: -__ http://sphinx-doc.org/markup/desc.html +__ http://sphinx-doc.org/markup/ * Settings:: @@ -319,10 +319,6 @@ look better: This will probably be a continuing, never-ending project. -* Add `info field lists`__ where appropriate. - - __ http://sphinx-doc.org/markup/desc.html#info-field-lists - * Whenever possible, use links. So, use ``:setting:`ADMINS``` instead of ````ADMINS````. diff --git a/docs/ref/contrib/sitemaps.txt b/docs/ref/contrib/sitemaps.txt index fefe90a420..fb1223af77 100644 --- a/docs/ref/contrib/sitemaps.txt +++ b/docs/ref/contrib/sitemaps.txt @@ -454,7 +454,7 @@ generate a Google News compatible sitemap: {% endspaceless %} -.. _`Google news sitemaps`: https://support.google.com/webmasters/answer/74288?hl=en +.. _`Google news sitemaps`: https://support.google.com/news/publisher/answer/74288?hl=en Pinging Google ============== diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index f656c3703e..03fbef028f 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -1754,7 +1754,7 @@ Support for color-coded output from ``django-admin.py`` / ``manage.py`` utilities on Windows by relying on the ANSICON application was added in Django 1.7. -.. _ANSICON: http://adoxa.hostmyway.net/ansicon/ +.. _ANSICON: http://adoxa.altervista.org/ansicon/ Bash completion --------------- diff --git a/docs/releases/1.0-alpha-2.txt b/docs/releases/1.0-alpha-2.txt index a26a214aff..786cfc56ad 100644 --- a/docs/releases/1.0-alpha-2.txt +++ b/docs/releases/1.0-alpha-2.txt @@ -26,7 +26,7 @@ features have landed, including: ``django.contrib.gis`` (`GeoDjango`_) A project over a year in the making, this adds world-class GIS (`Geographic Information Systems`_) support to Django, in the form - of a ``contrib`` application. `Its documentation`_ is currently + of a ``contrib`` application. Its documentation is currently being maintained externally, and will be merged into the main Django documentation prior to the final 1.0 release. Huge thanks go to Justin Bronn, Jeremy Dunck, Brett Hoerner and Travis Pinney @@ -56,7 +56,6 @@ mapper -- is now significantly faster. .. _GeoDjango: http://geodjango.org/ .. _Geographic Information Systems: http://en.wikipedia.org/wiki/Geographic_information_system -.. _Its documentation: http://geodjango.org/docs/ .. _Jython: http://www.jython.org/ diff --git a/docs/releases/1.1.txt b/docs/releases/1.1.txt index 3ea25e6704..2788f1fded 100644 --- a/docs/releases/1.1.txt +++ b/docs/releases/1.1.txt @@ -362,11 +362,10 @@ features: * A new list interface methods for ``GEOSGeometry`` objects. -For more details, see the `GeoDjango documentation`_. +For more details, see the GeoDjango documentation. .. _geodjango: http://geodjango.org/ .. _spatialite: http://www.gaia-gis.it/gaia-sins/ -.. _geodjango documentation: http://geodjango.org/docs/ Other improvements ------------------ diff --git a/docs/topics/install.txt b/docs/topics/install.txt index 53d9cc3263..3012810a1a 100644 --- a/docs/topics/install.txt +++ b/docs/topics/install.txt @@ -208,7 +208,7 @@ This is the recommended way to install Django. .. _pip: http://www.pip-installer.org/ .. _virtualenv: http://www.virtualenv.org/ .. _virtualenvwrapper: http://virtualenvwrapper.readthedocs.org/en/latest/ -.. _standalone pip installer: http://www.pip-installer.org/en/latest/installing.html#using-the-installer +.. _standalone pip installer: http://www.pip-installer.org/en/latest/installing.html#install-pip Installing an official release manually ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/docs/topics/python3.txt b/docs/topics/python3.txt index c10f2b42ab..9daba275c6 100644 --- a/docs/topics/python3.txt +++ b/docs/topics/python3.txt @@ -245,7 +245,7 @@ consequence, the following pattern is sometimes necessary:: Be cautious if you have to `index bytestrings`_. -.. _index bytestrings: http://docs.python.org/3/howto/pyporting.html#bytes-literals +.. _index bytestrings: https://docs.python.org/3/howto/pyporting.html#indexing-bytes-objects Exceptions ~~~~~~~~~~