Remove references to pip

3 files changed, 10 insertions, 30 deletions

diff --git a/docs/tutorials/wiki2/design.rst b/docs/tutorials/wiki2/design.rst
index 929bc7806..45e2fddd0 100644
--- a/docs/tutorials/wiki2/design.rst
+++ b/docs/tutorials/wiki2/design.rst
@@ -10,7 +10,7 @@ Overall
 
 We choose to use :term:`reStructuredText` markup in the wiki text. Translation
 from reStructuredText to HTML is provided by the widely used ``docutils``
-Python module.  We will add this module to the dependency list in the project's
+Python module.  We will add this module in the dependency list on the project
 ``setup.py`` file.
 
 Models
diff --git a/docs/tutorials/wiki2/index.rst b/docs/tutorials/wiki2/index.rst
index 18e9f552e..74fb5bfd5 100644
--- a/docs/tutorials/wiki2/index.rst
+++ b/docs/tutorials/wiki2/index.rst
@@ -1,15 +1,15 @@
 .. _bfg_sql_wiki_tutorial:
 
-SQLAlchemy + URL dispatch wiki tutorial
+SQLAlchemy + URL Dispatch Wiki Tutorial
 =======================================
 
-This tutorial introduces an :term:`SQLAlchemy` and :term:`URL dispatch`-based
+This tutorial introduces a :term:`SQLAlchemy` and :term:`url dispatch`-based
 :app:`Pyramid` application to a developer familiar with Python.  When the
-tutorial is finished, the developer will have created a basic wiki
-application with authentication and authorization.
+tutorial is finished, the developer will have created a basic Wiki
+application with authentication.
 
-For cut and paste purposes, the source code for all stages of this tutorial can
-be browsed on GitHub at `docs/tutorials/wiki2/src
+For cut and paste purposes, the source code for all stages of this
+tutorial can be browsed on GitHub at `docs/tutorials/wiki2/src
 <https://github.com/Pylons/pyramid/tree/master/docs/tutorials/wiki2/src>`_,
 which corresponds to the same location if you have Pyramid sources.
 
diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst
index 1dd71cb76..eb6cf50e0 100644
--- a/docs/tutorials/wiki2/installation.rst
+++ b/docs/tutorials/wiki2/installation.rst
@@ -9,9 +9,9 @@ This tutorial assumes that you have already followed the steps in
 :ref:`installing_chapter`, except **do not create a virtualenv or install
 Pyramid**.  Thereby you will satisfy the following requirements.
 
-* A Python interpreter is installed on your operating system.
-* :term:`virtualenv` is installed.
-* :term:`pip` will be installed when we create a virtual environment.
+* Python interpreter is installed on your operating system
+* :term:`setuptools` or :term:`distribute` is installed
+* :term:`virtualenv` is installed
 
 Create directory to contain the project
 ---------------------------------------
@@ -70,14 +70,6 @@ Python 3.5:
    c:\> c:\Python35\Scripts\virtualenv %VENV%
 
 
-.. Upgrade pip in the virtual environment
-   --------------------------------------
-
-.. .. code-block:: bash
-
-..    $ $VENV/bin/pip install --upgrade pip
-
-
 Install Pyramid into the virtual Python environment
 ---------------------------------------------------
 
@@ -88,8 +80,6 @@ On UNIX
 
    $ $VENV/bin/easy_install pyramid
 
-..   $ $VENV/bin/pip install pyramid
-
 On Windows
 ^^^^^^^^^^
 
@@ -97,8 +87,6 @@ On Windows
 
    c:\> %VENV%\Scripts\easy_install pyramid
 
-..   c:\> %VENV%\Scripts\pip install pyramid
-
 Install SQLite3 and its development packages
 --------------------------------------------
 
@@ -197,8 +185,6 @@ On UNIX
    $ cd tutorial
    $ $VENV/bin/python setup.py develop
 
-..   $ $VENV/bin/pip install -e .
-
 On Windows
 ----------
 
@@ -207,8 +193,6 @@ On Windows
    c:\pyramidtut> cd tutorial
    c:\pyramidtut\tutorial> %VENV%\Scripts\python setup.py develop
 
-..   c:\pyramidtut\tutorial> %VENV%\Scripts\pip install -e .
-
 The console will show ``setup.py`` checking for packages and installing
 missing packages. Success executing this command will show a line like
 the following::
@@ -230,8 +214,6 @@ On UNIX
 
    $ $VENV/bin/python setup.py test -q
 
-.. py.test? See https://github.com/Pylons/pyramid/issues/2104#issuecomment-155852046
-
 On Windows
 ----------
 
@@ -239,8 +221,6 @@ On Windows
 
    c:\pyramidtut\tutorial> %VENV%\Scripts\python setup.py test -q
 
-.. py.test? See https://github.com/Pylons/pyramid/issues/2104#issuecomment-155852046
-
 For a successful test run, you should see output that ends like this::
 
   .