[Python-checkins] cpython (merge 3.3 -> default): Merge from 3.3: improve FAQ link in documentation (for issue #16435).

[chris.jerdonek]

http://hg.python.org/cpython/rev/7cfe8cd4d65e
changeset:   80331:7cfe8cd4d65e
parent:      80327:aa02f7be68f6
parent:      80330:3951264b0763
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Fri Nov 09 17:54:21 2012 -0800
summary:
  Merge from 3.3: improve FAQ link in documentation (for issue #16435).

files:
  Doc/faq/index.rst        |  2 ++
  Doc/tutorial/whatnow.rst |  5 ++---
  2 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/Doc/faq/index.rst b/Doc/faq/index.rst
--- 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
--- a/Doc/tutorial/whatnow.rst
+++ b/Doc/tutorial/whatnow.rst
@@ -59,9 +59,8 @@
 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.

-- 
Repository URL: http://hg.python.org/cpython