From 9cd5b66b9d3cd59e0aac11460077a1722b420924 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Sun, 15 Jan 2017 13:37:36 -0800
Subject: Update Windows installation docs

---
 docs/narr/install.rst | 51 +++++++++++++++++++++++++--------------------------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index 10173aec8..59ef9210d 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -91,29 +91,22 @@ If your Windows system doesn't have a Python interpreter, you'll need to
 install it by downloading a Python 3.x-series interpreter executable from
 `python.org's download section <https://www.python.org/downloads/>`_ (the files
 labeled "Windows Installer").  Once you've downloaded it, double click on the
-executable, and select appropriate options during the installation process. To
+executable and select appropriate options during the installation process. To
 standardize this documentation, we used the GUI installer and selected the
 following options:
 
 - Screen 1: Install Python 3.x.x (32- or 64-bit)
-    - Check "Install launcher for all users (recommended)"
-    - Check "Add Python 3.x to PATH"
-    - Click "Customize installation"
-- Screen 2: Optional Features
-    - Check all options
-    - Click "Next"
-- Screen 3: Advanced Options
-    - Check all options
-    - Customize install location: "C:\\Python3x", where "x" is the minor
-      version of Python
-    - Click "Next"
-
-You might also need to download and install the Python for Windows extensions.
+    - Check "Install launcher for all users (recommended)".
+    - Check "Add Python 3.x to PATH".
+    - Click "Install Now".
+- Screen 2: User Account Control
+    - Click "Yes".
 
 .. seealso:: See the official Python documentation :ref:`Using Python on
    Windows <python:using-on-windows>` for full details.
 
-.. seealso:: Download and install the `Python for Windows extensions
+.. seealso:: You might also need to download and install the `Python for
+   Windows extensions
    <https://sourceforge.net/projects/pywin32/files/pywin32/>`_. Carefully read
    the README.txt file at the end of the list of builds, and follow its
    directions. Make sure you get the proper 32- or 64-bit build and Python
@@ -123,15 +116,21 @@ You might also need to download and install the Python for Windows extensions.
    <https://docs.python.org/3/using/windows.html#launcher>`_ provides a command
    ``py`` that allows users to run any installed version of Python.
 
-.. warning::
-
-   After you install Python on Windows, you might need to add the
-   ``c:\Python3x`` directory to your environment's ``Path``, where ``x`` is the
-   minor version of installed Python, in order to make it possible to invoke
-   Python from a command prompt by typing ``python``. To do so, right click
-   ``My Computer``, select ``Properties`` --> ``Advanced Tab`` -->
-   ``Environment Variables``, and add that directory to the end of the ``Path``
-   environment variable.
+.. warning:: After you install Python on Windows, you might need to add the
+   directory where Python and other programs—such as pip, setuptools, and
+   cookiecutter—are installed to your environment's ``Path``. This will make it
+   possible to invoke them from a command prompt.
+
+   To do so, search for "Environment Variables" on your computer (on Windows
+   10, it is under ``System Properties`` --> ``Advanced``) and append that
+   directory to the end of the ``Path`` environment variable, separating each
+   path segment with a semi-colon (;) or use the GUI to add New or Edit
+   existing path segments. Example segments should look like
+   ``C:\Users\<username>\AppData\Local\Programs\Python3x-32``, where you have
+   your username instead of the bracketed example, and your version of Python
+   and whether it is 32- or 64-bit. Additionally ensure you have the path
+   segment ending with ``\Scripts``, i.e.,
+   ``C:\Users\<username>\AppData\Local\Programs\Python3x-32\Scripts``.
 
    .. seealso:: See `Configuring Python (on Windows)
       <https://docs.python.org/3/using/windows.html#configuring-python>`_ for
@@ -231,9 +230,9 @@ After installing Python as described previously in
 
    .. code-block:: doscon
 
+      c:\> cd \dir
       c:\> set VENV=c:\env
-      # replace "x" with your minor version of Python 3
-      c:\> c:\Python3x\python -m venv %VENV%
+      c:\> python -m venv %VENV%
       c:\> cd %VENV%
 
    You can either follow the use of the environment variable ``%VENV%``, or
-- 
cgit v1.2.3