From 74cf44544cb2c6dbd4a0ae7b01881ab450194f53 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Tue, 12 Apr 2016 02:16:47 -0700
Subject: - removed "now" per
 https://github.com/Pylons/pyramid/pull/2468#discussion_r59310317

---
 docs/narr/install.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/narr')

diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index 5e2abb236..febdc87cc 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -5,8 +5,8 @@ Installing :app:`Pyramid`
 
 .. note::
 
-    This installation guide now emphasizes the use of Python 3.4 and greater
-    for simplicity.
+    This installation guide emphasizes the use of Python 3.4 and greater for
+    simplicity.
 
 
 .. index::
-- 
cgit v1.2.3


From d603697517d56a1e2f2a5707ebba922db24f5c71 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Tue, 12 Apr 2016 02:47:57 -0700
Subject: - replace `pyvenv` with `python3 -m venv`

---
 docs/narr/install.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'docs/narr')

diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index febdc87cc..548d040f1 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -126,8 +126,8 @@ also need to download and install the Python for Windows extensions.
 Requirements for Installing Packages
 ------------------------------------
 
-Use :term:`pip` for installing packages and :term:`pyvenv` for creating a
-virtual environment. A virtual environment is a semi-isolated Python
+Use :term:`pip` for installing packages and ``python3 -m venv env`` for
+creating a virtual environment. A virtual environment is a semi-isolated Python
 environment that allows packages to be installed for use by a particular
 application, rather than being installed system wide.
 
@@ -155,7 +155,7 @@ After installing Python as described previously in :ref:`for-mac-os-x-users` or
    .. code-block:: bash
 
       $ export VENV=~/env
-      $ pyvenv $VENV
+      $ python3 -m venv $VENV
 
    You can either follow the use of the environment variable ``$VENV``, or
    replace it with the root directory of the virtual environment. If you choose
@@ -190,7 +190,7 @@ After installing Python as described previously in
 
       c:\> set VENV=c:\env
       # replace "x" with your minor version of Python 3
-      c:\> c:\Python3x\Scripts\pyvenv %VENV%
+      c:\> c:\Python3x\Scripts\python3 -m venv %VENV%
 
    You can either follow the use of the environment variable ``%VENV%``, or
    replace it with the root directory of the virtual environment. If you choose
-- 
cgit v1.2.3


From b485166239091c620c96ca71369c69f6fa7a8be7 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Tue, 12 Apr 2016 02:51:20 -0700
Subject: - replace `python -m` with `python3 -m`

---
 docs/narr/commandline.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/narr')

diff --git a/docs/narr/commandline.rst b/docs/narr/commandline.rst
index bc04f4c7a..3e164ee8d 100644
--- a/docs/narr/commandline.rst
+++ b/docs/narr/commandline.rst
@@ -578,10 +578,10 @@ Using Custom Arguments to Python when Running ``p*`` Scripts
 .. versionadded:: 1.5
 
 Each of Pyramid's console scripts (``pserve``, ``pviews``, etc.) can be run
-directly using ``python -m``, allowing custom arguments to be sent to the
+directly using ``python3 -m``, allowing custom arguments to be sent to the
 Python interpreter at runtime. For example::
 
-      python -3 -m pyramid.scripts.pserve development.ini
+      python3 -m pyramid.scripts.pserve development.ini
 
 
 .. index::
-- 
cgit v1.2.3