summaryrefslogtreecommitdiff
path: root/docs/narr/install.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-01-10 14:45:12 -0500
committerChris McDonough <chrism@plope.com>2012-01-10 14:45:12 -0500
commit26484029f9d4d591e9541547f6d5e381ce3a0be2 (patch)
treeaba3132e660b320a6734adb0d93a3b6bbdcf5877 /docs/narr/install.rst
parenta21278872884809cfec7d5de8c64518c404f2b02 (diff)
parentcf3a11e990adda800e284effb006f1c28335da4d (diff)
downloadpyramid-26484029f9d4d591e9541547f6d5e381ce3a0be2.tar.gz
pyramid-26484029f9d4d591e9541547f6d5e381ce3a0be2.tar.bz2
pyramid-26484029f9d4d591e9541547f6d5e381ce3a0be2.zip
Merge branch '1.3-branch'
Diffstat (limited to 'docs/narr/install.rst')
-rw-r--r--docs/narr/install.rst11
1 files changed, 1 insertions, 10 deletions
diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index 3de4d6e27..172cfd6d3 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -20,7 +20,7 @@ run :app:`Pyramid`.
:app:`Pyramid` is known to run on all popular UNIX-like systems such as
Linux, MacOS X, and FreeBSD as well as on Windows platforms. It is also
-known to run on Google's App Engine, and :term:`PyPy` (1.6+).
+known to run on :term:`PyPy` (1.6+).
:app:`Pyramid` installation does not require the compilation of any
C code, so you need only a Python interpreter that meets the
@@ -315,15 +315,6 @@ Installing :app:`Pyramid` on a Windows System
c:\env> Scripts\easy_install pyramid
-.. index::
- single: installing on Google App Engine
-
-Installing :app:`Pyramid` on Google App Engine
--------------------------------------------------
-
-:ref:`appengine_tutorial` documents the steps required to install a
-:app:`Pyramid` application on Google App Engine.
-
What Gets Installed
-------------------