summaryrefslogtreecommitdiffstats
path: root/Doc/faq
diff options
context:
space:
mode:
Diffstat (limited to 'Doc/faq')
-rw-r--r--Doc/faq/design.rst2
-rw-r--r--Doc/faq/general.rst6
2 files changed, 4 insertions, 4 deletions
diff --git a/Doc/faq/design.rst b/Doc/faq/design.rst
index 02417b1..1f3135a 100644
--- a/Doc/faq/design.rst
+++ b/Doc/faq/design.rst
@@ -667,7 +667,7 @@ construction of large programs.
Python 2.6 adds an :mod:`abc` module that lets you define Abstract Base Classes
(ABCs). You can then use :func:`isinstance` and :func:`issubclass` to check
whether an instance or a class implements a particular ABC. The
-:mod:`collections` module defines a set of useful ABCs such as
+:mod:`collections.abc` module defines a set of useful ABCs such as
:class:`Iterable`, :class:`Container`, and :class:`MutableMapping`.
For Python, many of the advantages of interface specifications can be obtained
diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst
index 111e312..21a5ee5 100644
--- a/Doc/faq/general.rst
+++ b/Doc/faq/general.rst
@@ -166,7 +166,7 @@ and run out of the box on most UNIX platforms.
.. XXX update link once the dev faq is relocated
-Consult the `Developer FAQ <http://www.python.org/dev/faq/>`__ for more
+Consult the `Developer FAQ <http://docs.python.org/devguide/faq>`__ for more
information on getting the source code and compiling it.
@@ -224,7 +224,7 @@ news is available.
.. XXX update link once the dev faq is relocated
You can also access the development version of Python through Subversion. See
-http://www.python.org/dev/faq/ for details.
+http://docs.python.org/devguide/faq for details.
How do I submit bug reports and patches for Python?
@@ -242,7 +242,7 @@ report bugs to Python, you can obtain your Roundup password through Roundup's
.. XXX adapt link to dev guide
For more information on how Python is developed, consult `the Python Developer's
-Guide <http://python.org/dev/>`_.
+Guide <http://docs.python.org/devguide/>`_.
Are there any published articles about Python that I can reference?