From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 25 Jan 2014 04:59:57 +0000 (-0500)
Subject: update hosting faq
X-Git-Tag: v2.7.8~88
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d8be9feb45baab60959d4076dc997062b307206f;p=python

update hosting faq
---

diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst
index 8cd139c880..d035a8de05 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?