traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge with 3.4

This commit is contained in:
Georg Brandl 2014-10-29 08:52:51 +01:00
parent cadc3fdcb5 485922ea1f
commit d64fa1e11e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Doc/faq/general.rst
View File

@ -270,11 +270,12 @@ 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 <https://www.python.org>`_ is currently in Amsterdam, graciously `www.python.org <https://www.python.org>`_ is graciously hosted by `Rackspace
hosted by `XS4ALL <http://www.xs4all.nl>`_. `Upfront Systems <http://www.rackspace.com>`_, with CDN caching provided by `Fastly
<https://www.fastly.com>`_. `Upfront Systems
<http://www.upfrontsystems.co.za>`_ hosts `bugs.python.org <http://www.upfrontsystems.co.za>`_ hosts `bugs.python.org
<https://bugs.python.org>`_. Most other Python services like `PyPI <https://bugs.python.org>`_. Many other Python services like `the Wiki
<https://pypi.python.org>`_ and hg.python.org are hosted by `Oregon State <https://wiki.python.org>`_ are hosted by `Oregon State
University Open Source Lab <https://osuosl.org>`_. University Open Source Lab <https://osuosl.org>`_.