Changeset 391 for python/trunk/Doc/faq/general.rst

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Doc/faq/general.rst (modified) (5 diffs)

python/trunk/Doc/faq/general.rst

@@ -5 +5 @@
 ==================
 
-.. contents::
+.. only:: html
+
+   .. contents::
+
 
 General Information
@@ -158 +161 @@
 The latest Python source distribution is always available from python.org, at
 http://www.python.org/download/.  The latest development sources can be obtained
-via anonymous Subversion at http://svn.python.org/projects/python/trunk.
+via anonymous Mercurial access at http://hg.python.org/cpython.
 
 The source distribution is a gzipped tar file containing the complete C source,
@@ -165 +168 @@
 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.
 
@@ -222 +223 @@
 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.
 
 
@@ -240 +239 @@
 `password reset procedure <http://bugs.python.org/user?@template=forgotten>`_.
 
-.. 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/>`_.