merge 3.3

benjaminp · benjaminp · commit ce8d153b0245 · 2014-01-25T13:27:53.000-05:00
diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst
@@ -181,8 +181,8 @@ at http://docs.python.org/.  PDF, plain text, and downloadable HTML versions are
 also available at http://docs.python.org/download.html.
 
 The documentation is written in reStructuredText and processed by `the Sphinx
-documentation tool <http://sphinx.pocoo.org/>`__.  The reStructuredText source
-for the documentation is part of the Python source distribution.
+documentation tool <http://sphinx-doc.org/>`__.  The reStructuredText source for
+the documentation is part of the Python source distribution.
 
 
 I've never programmed before. Is there a Python tutorial?
@@ -269,9 +269,10 @@ Where in the world is www.python.org located?
 ---------------------------------------------
 
 The Python project's infrastructure is located all over the world.
-www.python.org is currently in Amsterdam, graciously hosted by `XS4ALL
-<http://www.xs4all.nl>`_.  `Upfront Systems <http://www.upfrontsystems.co.za>`_
-hosts bugs.python.org.  Most other Python services like `PyPI
+`www.python.org <http://www.python.org>`_ is currently in Amsterdam, graciously
+hosted by `XS4ALL <http://www.xs4all.nl>`_.  `Upfront Systems
+<http://www.upfrontsystems.co.za>`_ hosts `bugs.python.org
+<http://bugs.python.org>`_.  Most other Python services like `PyPI
 <https://pypi.python.org>`_ and hg.python.org are hosted by `Oregon State
 University Open Source Lab <https://osuosl.org>`_.
 
