summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorRogério Yokomizo <me@ro.ger.io>2013-09-22 14:34:30 -0300
committerRogério Yokomizo <me@ro.ger.io>2013-09-22 14:44:09 -0300
commit1b4b710355057b279c1e7d10b6b0d846ee98444e (patch)
tree1ced553087adb40976413f0749e6df19a09bc6a5 /docs
parentce0c5c38ea77a32e5d6d24082d3a8119ad8714cd (diff)
Fixed #21141 -- Update Sphinx URL
Updated Sphinx URL from http://sphinx.pocoo.org/ to http://sphinx-doc.org/.
Diffstat (limited to 'docs')
-rw-r--r--docs/README2
-rw-r--r--docs/conf.py2
-rw-r--r--docs/internals/contributing/writing-documentation.txt6
-rw-r--r--docs/intro/whatsnext.txt2
-rw-r--r--docs/releases/1.0-beta-2.txt2
5 files changed, 7 insertions, 7 deletions
diff --git a/docs/README b/docs/README
index 05133d8917..5001eef57e 100644
--- a/docs/README
+++ b/docs/README
@@ -14,4 +14,4 @@ To create an HTML version of the docs:
The documentation in _build/html/index.html can then be viewed in a web browser.
[1] http://docutils.sourceforge.net/rst.html
-[2] http://sphinx.pocoo.org/
+[2] http://sphinx-doc.org/
diff --git a/docs/conf.py b/docs/conf.py
index 0c35e935e6..3b3816f69b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -111,7 +111,7 @@ pygments_style = 'trac'
# branch, which is located at this URL.
intersphinx_mapping = {
'python': ('http://docs.python.org/2.7', None),
- 'sphinx': ('http://sphinx.pocoo.org/', None),
+ 'sphinx': ('http://sphinx-doc.org/', None),
'six': ('http://pythonhosted.org/six/', None),
'simplejson': ('http://simplejson.readthedocs.org/en/latest/', None),
}
diff --git a/docs/internals/contributing/writing-documentation.txt b/docs/internals/contributing/writing-documentation.txt
index 52ad7b7599..e565b4d54f 100644
--- a/docs/internals/contributing/writing-documentation.txt
+++ b/docs/internals/contributing/writing-documentation.txt
@@ -42,7 +42,7 @@ Django's documentation uses the Sphinx__ documentation system, which in turn
is based on docutils__. The basic idea is that lightly-formatted plain-text
documentation is transformed into HTML, PDF, and any other output format.
-__ http://sphinx.pocoo.org/
+__ http://sphinx-doc.org/
__ http://docutils.sourceforge.net/
To actually build the documentation locally, you'll currently need to install
@@ -141,7 +141,7 @@ Django-specific markup
Besides the `Sphinx built-in markup`__, Django's docs defines some extra
description units:
-__ http://sphinx.pocoo.org/markup/desc.html
+__ http://sphinx-doc.org/markup/desc.html
* Settings::
@@ -305,7 +305,7 @@ look better:
* Add `info field lists`__ where appropriate.
- __ http://sphinx.pocoo.org/markup/desc.html#info-field-lists
+ __ http://sphinx-doc.org/markup/desc.html#info-field-lists
* Whenever possible, use links. So, use ``:setting:`ADMIN_FOR``` instead
of ````ADMIN_FOR````.
diff --git a/docs/intro/whatsnext.txt b/docs/intro/whatsnext.txt
index 638d219afe..e2a0c75b95 100644
--- a/docs/intro/whatsnext.txt
+++ b/docs/intro/whatsnext.txt
@@ -192,7 +192,7 @@ You can get a local copy of the HTML documentation following a few easy steps:
Generation of the Django documentation will work with Sphinx version 0.6
or newer, but we recommend going straight to Sphinx 1.0.2 or newer.
-__ http://sphinx.pocoo.org/
+__ http://sphinx-doc.org/
__ http://www.gnu.org/software/make/
.. _differences-between-doc-versions:
diff --git a/docs/releases/1.0-beta-2.txt b/docs/releases/1.0-beta-2.txt
index fac64d8433..0c5225b6e1 100644
--- a/docs/releases/1.0-beta-2.txt
+++ b/docs/releases/1.0-beta-2.txt
@@ -45,7 +45,7 @@ Refactored documentation
have Sphinx installed, build the HTML yourself from the
documentation files bundled with Django.
-.. _Sphinx: http://sphinx.pocoo.org/
+.. _Sphinx: http://sphinx-doc.org/
.. _online: https://docs.djangoproject.com/
Along with these new features, the Django team has also been hard at