diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-01-25 18:27:53 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-01-25 18:27:53 (GMT) |
| commit | ce8d153b0245d324735cdb72e4267f1dd9e52e1e (patch) | |
| tree | 47e93cf26f7115402d934784058c09a41c3c0206 /Doc/faq | |
| parent | c0b0bb6e01f7ea6a1a857609e794842223c4aa5c (diff) | |
| parent | 714d7ffd0d652e187deb13b96aae7a1bbfcdecca (diff) | |
| download | cpython-ce8d153b0245d324735cdb72e4267f1dd9e52e1e.zip cpython-ce8d153b0245d324735cdb72e4267f1dd9e52e1e.tar.gz cpython-ce8d153b0245d324735cdb72e4267f1dd9e52e1e.tar.bz2 | |
merge 3.3
Diffstat (limited to 'Doc/faq')
| -rw-r--r-- | Doc/faq/general.rst | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst index cc2cbda..da2c933 100644 --- 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>`_. |