Merge ~cjwatson/launchpad:remove-ec2-docs into launchpad:master

[Colin Watson]

Remove mentions of testing on EC2

We haven't done this for years.

[Jürgen Gmach (jugmac00)]

LGTM

review: Approve

diff --git a/doc/pip.txt b/doc/pip.txt
index 5726e2e..bba65d0 100644
--- a/doc/pip.txt
+++ b/doc/pip.txt
@@ -252,14 +252,6 @@ Let's suppose that we want to add the "lazr.foo" package as a dependency.
 
 7.  Test.
 
-    Note that you can tell ``ec2 test`` to include all uncommitted
-    distributions from the local download-cache in its tests with the
-    ``--include-download-cache-changes`` flag (or ``-c``).  If you do
-    this, you cannot use the ec2 test feature to submit on test
-    success.  Also, if you have uncommitted distributions and you do
-    *not* explicitly tell ec2 test to include or ignore the
-    uncommitted distributions, it will refuse to start an instance.
-
 8.  Check old versions in the download-cache.  If you are sure that
     they are not in use any more, *anywhere*, then remove them to save
     checkout space.  More explicitly, check with the LOSAs to see if
diff --git a/lib/lp/testing/yuixhr.py b/lib/lp/testing/yuixhr.py
index 616f680..7bb18a0 100644
--- a/lib/lp/testing/yuixhr.py
+++ b/lib/lp/testing/yuixhr.py
@@ -473,12 +473,12 @@ class YUIAppServerTestCase(AbstractYUITestCase):
     # 12 seconds for each test.  Hopefully they are three or less for
     # yuixhr tests, and less than one for pure JS tests, but
     # occasionally buildbot runs over six seconds even for tests that
-    # are well-behaved locally and on ec2, so we up the limit to 12..
+    # are well-behaved locally, so we up the limit to 12..
     incremental_timeout = 12000
     # 45 seconds for the first test, to include warmup time.  These times
-    # are wildly large, and they are only necessary on buildbot.  ec2 and
-    # local instances are much, much faster.  We have not yet investigated
-    # why buildbot is so slow for these.
+    # are wildly large, and they are only necessary on buildbot.  Local
+    # instances are much, much faster.  We have not yet investigated why
+    # buildbot is so slow for these.
     initial_timeout = 45000
 
     def __init__(self, module_name, facet='mainsite'):