[Python-checkins] cpython (merge 3.5 -> default): Merge with 3.5

[steve.dower]

https://hg.python.org/cpython/rev/0d1a052e42ee
changeset:   97916:0d1a052e42ee
parent:      97913:60e4ae9e2e01
parent:      97915:df60218959fc
user:        Steve Dower <steve.dower at microsoft.com>
date:        Fri Sep 11 08:47:55 2015 -0700
summary:
  Merge with 3.5

files:
  Doc/using/windows.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst
--- a/Doc/using/windows.rst
+++ b/Doc/using/windows.rst
@@ -77,8 +77,8 @@
 suppressing the UI in order to change some of the defaults.
 
 To completely hide the installer UI and install Python silently, pass the
-``/quiet`` (``/q``) option. To skip past the user interaction but still display
-progress and errors, pass the ``/passive`` (``/p``) option. The ``/uninstall``
+``/quiet`` option. To skip past the user interaction but still display
+progress and errors, pass the ``/passive`` option. The ``/uninstall``
 option may be passed to immediately begin removing Python - no prompt will be
 displayed.
 

-- 
Repository URL: https://hg.python.org/cpython