Backport from 3.2: improve FAQ link in documentation (for issue #16435).
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 157cc9f..48ff5c8 100644
--- a/Doc/tutorial/whatnow.rst
+++ b/Doc/tutorial/whatnow.rst
@@ -54,9 +54,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/doc/faq/>`_ (also called the FAQ), or look for it in the
-:file:`Misc/` directory of the Python source distribution. Mailing list
+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.