mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-12 15:09:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge 3.3

Browse source
This commit is contained in:
Benjamin Peterson 2014-01-25 13:27:53 -05:00
commit ce8d153b02
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Doc/faq/general.rst
View file

@ -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. also available at http://docs.python.org/download.html.
The documentation is written in reStructuredText and processed by `the Sphinx The documentation is written in reStructuredText and processed by `the Sphinx
documentation tool <http://sphinx.pocoo.org/>`__. The reStructuredText source documentation tool <http://sphinx-doc.org/>`__. The reStructuredText source for
for the documentation is part of the Python source distribution. the documentation is part of the Python source distribution.
I've never programmed before. Is there a Python tutorial? 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. The Python project's infrastructure is located all over the world.
www.python.org is currently in Amsterdam, graciously hosted by `XS4ALL `www.python.org <http://www.python.org>`_ is currently in Amsterdam, graciously
<http://www.xs4all.nl>`_. `Upfront Systems <http://www.upfrontsystems.co.za>`_ hosted by `XS4ALL <http://www.xs4all.nl>`_. `Upfront Systems
hosts bugs.python.org. Most other Python services like `PyPI <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 <https://pypi.python.org>`_ and hg.python.org are hosted by `Oregon State
University Open Source Lab <https://osuosl.org>`_. University Open Source Lab <https://osuosl.org>`_.