http://hg.python.org/cpython/rev/fae92299eb68 changeset: 88708:fae92299eb68 parent: 88703:b30e57756686 parent: 88705:8c5876a6b3ed user: Benjamin Peterson <benjamin at python.org> date: Sat Jan 25 13:27:53 2014 -0500 summary: merge 3.3 files: Doc/faq/general.rst | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst --- a/Doc/faq/general.rst +++ b/Doc/faq/general.rst @@ -181,8 +181,8 @@ 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 @@ --------------------------------------------- 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>`_. -- Repository URL: http://hg.python.org/cpython