summaryrefslogtreecommitdiff
path: root/docs/tutorials
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2017-01-15 17:53:26 -0600
committerGitHub <noreply@github.com>2017-01-15 17:53:26 -0600
commit17ee4dc30b9576b516ee3a5fd9db0c5f21fe9126 (patch)
tree8eea9208aae9032b0698b5f3ccb31499e308cf99 /docs/tutorials
parent07bfdb4fdbbccd5fb05eaea753198f26bd7546e1 (diff)
parent7ed8e2e83a7b71d171989600c6c04dc50c1be34d (diff)
downloadpyramid-17ee4dc30b9576b516ee3a5fd9db0c5f21fe9126.tar.gz
pyramid-17ee4dc30b9576b516ee3a5fd9db0c5f21fe9126.tar.bz2
pyramid-17ee4dc30b9576b516ee3a5fd9db0c5f21fe9126.zip
Merge pull request #2900 from stevepiercy/windows-install
Windows documentation updates
Diffstat (limited to 'docs/tutorials')
-rw-r--r--docs/tutorials/wiki/installation.rst7
-rw-r--r--docs/tutorials/wiki2/installation.rst4
2 files changed, 5 insertions, 6 deletions
diff --git a/docs/tutorials/wiki/installation.rst b/docs/tutorials/wiki/installation.rst
index 6cd7fbbc2..c735bdf9d 100644
--- a/docs/tutorials/wiki/installation.rst
+++ b/docs/tutorials/wiki/installation.rst
@@ -102,7 +102,7 @@ On UNIX
On Windows
^^^^^^^^^^
-Each version of Python uses different paths, so you will need to adjust the path to the command for your Python version.
+Each version of Python uses different paths, so you might need to adjust the path to the command for your Python version. Recent versions of the Python 3 installer for Windows now install a Python launcher.
Python 2.7:
@@ -114,7 +114,7 @@ Python 3.6:
.. code-block:: doscon
- c:\tutorial> c:\Python36\Scripts\python -m venv %VENV%
+ c:\tutorial> python -m venv %VENV%
Upgrade packaging tools in the virtual environment
@@ -242,8 +242,7 @@ On Windows
.. code-block:: doscon
- c:\tutorial> %VENV%\Scripts\py.test --cov \
- --cov-report=term-missing
+ c:\tutorial> %VENV%\Scripts\py.test --cov --cov-report=term-missing
If successful, you will see output something like this:
diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst
index 794566985..fd323fcfc 100644
--- a/docs/tutorials/wiki2/installation.rst
+++ b/docs/tutorials/wiki2/installation.rst
@@ -114,7 +114,7 @@ On UNIX
On Windows
^^^^^^^^^^
-Each version of Python uses different paths, so you will need to adjust the path to the command for your Python version.
+Each version of Python uses different paths, so you will need to adjust the path to the command for your Python version. Recent versions of the Python 3 installer for Windows now install a Python launcher.
Python 2.7:
@@ -126,7 +126,7 @@ Python 3.6:
.. code-block:: doscon
- c:\tutorial> c:\Python36\Scripts\python -m venv %VENV%
+ c:\tutorial> python -m venv %VENV%
Upgrade packaging tools in the virtual environment