summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Jerdonek <chris.jerdonek@gmail.com>2012-11-10 01:54:21 (GMT)
committerChris Jerdonek <chris.jerdonek@gmail.com>2012-11-10 01:54:21 (GMT)
commit86b305341161b1e19eb6682944115da32b1fa101 (patch)
tree914e822e9626f10b9f7c940a912f271fe08ad836
parent90378b48077a1bb9a4805719b658312d7a35cbdd (diff)
parentfe08756743477eda3030c6da2d61dddeee3b8bfd (diff)
downloadcpython-86b305341161b1e19eb6682944115da32b1fa101.zip
cpython-86b305341161b1e19eb6682944115da32b1fa101.tar.gz
cpython-86b305341161b1e19eb6682944115da32b1fa101.tar.bz2
Merge from 3.3: improve FAQ link in documentation (for issue #16435).
-rw-r--r--Doc/faq/index.rst2
-rw-r--r--Doc/tutorial/whatnow.rst5
2 files changed, 4 insertions, 3 deletions
diff --git a/Doc/faq/index.rst b/Doc/faq/index.rst
index b956521..46ed3db 100644
--- a/Doc/faq/index.rst
+++ b/Doc/faq/index.rst
@@ -1,3 +1,5 @@
+.. _faq-index:
+
###################################
Python Frequently Asked Questions
###################################
diff --git a/Doc/tutorial/whatnow.rst b/Doc/tutorial/whatnow.rst
index ac1721d..7fcbdc3f 100644
--- a/Doc/tutorial/whatnow.rst
+++ b/Doc/tutorial/whatnow.rst
@@ -59,9 +59,8 @@ python-list@python.org. The newsgroup and mailing list are gatewayed, so
messages posted to one will automatically be forwarded to the other. There are
around 120 postings a day (with peaks up to several hundred), asking (and
answering) questions, suggesting new features, and announcing new modules.
-Before posting, be sure to check the list of `Frequently Asked Questions
-<http://www.python.org/3/doc/faq/>`_ (also called the FAQ),
-or look for it in the :file:`Misc/` directory of the Python source distribution.
+Before posting, be sure to check the list of :ref:`Frequently Asked Questions
+<faq-index>` (also called the FAQ).
Mailing list archives are available at http://mail.python.org/pipermail/.
The FAQ answers many of the questions that come up again and again,
and may already contain the solution for your problem.