Merge pull request #1515 from stevepiercy/1.2-branch

Steve Piercy

2014-12-27 dfb5acf4fe6d7f78a9d3b0fbae338c6a5a15805b

Merge pull request #1515 from stevepiercy/1.2-branch

backport. closes #460, #552

 docs/narr/install.rst

@@ -257,7 +257,10 @@
.. code-block:: text

   $ cd env
   $ bin/easy_install pyramid

   .. parsed-literal::

   $ bin/easy_install "pyramid==\ |release|\ "

The ``easy_install`` command will take longer than the previous ones to
complete, as it downloads and installs a number of dependencies.
@@ -312,9 +315,9 @@
#. Use ``easy_install`` pointed at the "current" index to get
   :app:`Pyramid` and its direct dependencies installed:

   .. code-block:: text

      c:\env> Scripts\easy_install pyramid
   .. parsed-literal::
      
      c:\\env> Scripts\\easy_install "pyramid==\ |release|\ "

.. index::
   single: installing on Google App Engine