diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-01-25 05:00:28 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-01-25 05:00:28 (GMT) |
| commit | e4e7199c50ffa6a513a1838f769137837f2e3883 (patch) | |
| tree | b847bdbc01029f3f88a0bce15298d6d677b86acf /Doc/faq | |
| parent | 021bb87845e5727b370d6d05986d08f930bcc664 (diff) | |
| parent | f580d5b6f7468abf768a2ee6360168ad92893457 (diff) | |
| download | cpython-e4e7199c50ffa6a513a1838f769137837f2e3883.zip cpython-e4e7199c50ffa6a513a1838f769137837f2e3883.tar.gz cpython-e4e7199c50ffa6a513a1838f769137837f2e3883.tar.bz2 | |
merge 3.3
Diffstat (limited to 'Doc/faq')
| -rw-r--r-- | Doc/faq/general.rst | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst index 9a893ec..cc2cbda 100644 --- a/Doc/faq/general.rst +++ b/Doc/faq/general.rst @@ -268,9 +268,12 @@ Python references; or perhaps search for "Python" and "language". Where in the world is www.python.org located? --------------------------------------------- -It's currently in Amsterdam, graciously hosted by `XS4ALL -<http://www.xs4all.nl>`_. Thanks to Thomas Wouters for his work in arranging -python.org's hosting. +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 +<https://pypi.python.org>`_ and hg.python.org are hosted by `Oregon State +University Open Source Lab <https://osuosl.org>`_. Why is it called Python? |