From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 27 Feb 2019 22:29:13 +0000 (-0800)
Subject: [3.7] Update FAQ to point to Infrastructure Team website. (GH-12077) (GH-12078)
X-Git-Tag: v3.7.3rc1~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=197e46829b440484c030a4d9734867551acae79d;p=thirdparty%2FPython%2Fcpython.git

[3.7] Update FAQ to point to Infrastructure Team website. (GH-12077) (GH-12078)



(cherry picked from commit ccb92e814d289b89bccf9ad1b7d2ec6ecdebbfcb)


Co-authored-by: Ned Deily <nad@python.org>
---

diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst
index 90fd69e72960..7ee340d7957c 100644
--- a/Doc/faq/general.rst
+++ b/Doc/faq/general.rst
@@ -268,14 +268,8 @@ Python references; or perhaps search for "Python" and "language".
 Where in the world is www.python.org located?
 ---------------------------------------------
 
-The Python project's infrastructure is located all over the world.
-`www.python.org <https://www.python.org>`_ is graciously hosted by `Rackspace
-<https://www.rackspace.com>`_, with CDN caching provided by `Fastly
-<https://www.fastly.com>`_.  `Upfront Systems
-<http://www.upfrontsoftware.co.za>`_ hosts `bugs.python.org
-<https://bugs.python.org>`_.  Many other Python services like `the Wiki
-<https://wiki.python.org>`_ are hosted by `Oregon State
-University Open Source Lab <https://osuosl.org>`_.
+The Python project's infrastructure is located all over the world and is managed
+by the Python Infrastructure Team. Details `here <http://infra.psf.io>`__.
 
 
 Why is it called Python?