Skip to content

[3.7]Documentation minor update related to 3.6 - 3.7 migration #9501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miss-islington merged 2 commits into from
Sep 24, 2018
Merged

[3.7]Documentation minor update related to 3.6 - 3.7 migration #9501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74c2d7a
[3.7]Documentation minor update related to 3.6 - 3.7 migration
christopheNan Sep 22, 2018
6662d30
Use more explicit examples according to comments from @gvanrossum
christopheNan Sep 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Doc/tutorial/interpreter.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ Python guru or system administrator. (E.g., :file:`/usr/local/python` is a
popular alternative location.)

On Windows machines, the Python installation is usually placed in
:file:`C:\\Python36`, though you can change this when you're running the
:file:`C:\\Python37`, though you can change this when you're running the
installer. To add this directory to your path, you can type the following
command into the command prompt in a DOS box::

set path=%path%;C:\python36
set path=%path%;C:\python37

Typing an end-of-file character (:kbd:`Control-D` on Unix, :kbd:`Control-Z` on
Windows) at the primary prompt causes the interpreter to exit with a zero exit
Expand Down
4 changes: 2 additions & 2 deletions Doc/using/cmdline.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,13 +182,13 @@ Generic options

.. code-block:: none

Python 3.6.0b2+
Python 3.7.0b2+

When given twice, print more information about the build, like:

.. code-block:: none

Python 3.6.0b2+ (3.6:84a3c5003510+, Oct 26 2016, 02:33:55)
Python 3.7.0b2+ (3.7:0c076caaa8, Sep 22 2018, 12:04:24)
[GCC 6.2.0 20161005]

.. versionadded:: 3.6
Expand Down
12 changes: 6 additions & 6 deletions Doc/using/windows.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,13 +193,13 @@ of available options is shown below.
For example, to silently install a default, system-wide Python installation,
you could use the following command (from an elevated command prompt)::

python-3.6.0.exe /quiet InstallAllUsers=1 PrependPath=1 Include_test=0
python-3.7.0.exe /quiet InstallAllUsers=1 PrependPath=1 Include_test=0

To allow users to easily install a personal copy of Python without the test
suite, you could provide a shortcut with the following command. This will
display a simplified initial page and disallow customization::

python-3.6.0.exe InstallAllUsers=0 Include_launcher=0 Include_test=0
python-3.7.0.exe InstallAllUsers=0 Include_launcher=0 Include_test=0
SimpleInstall=1 SimpleInstallDescription="Just for me, no test suite."

(Note that omitting the launcher also omits file associations, and is only
Expand Down Expand Up @@ -236,13 +236,13 @@ where a large number of installations are going to be performed it is very
useful to have a locally cached copy.

Execute the following command from Command Prompt to download all possible
required files. Remember to substitute ``python-3.6.0.exe`` for the actual
required files. Remember to substitute ``python-3.7.0.exe`` for the actual
name of your installer, and to create layouts in their own directories to
avoid collisions between files with the same name.

::

python-3.6.0.exe /layout [optional target directory]
python-3.7.0.exe /layout [optional target directory]

You may also specify the ``/quiet`` option to hide the progress display.

Expand Down Expand Up @@ -349,7 +349,7 @@ To temporarily set environment variables, open Command Prompt and use the

.. code-block:: doscon

C:\>set PATH=C:\Program Files\Python 3.6;%PATH%
C:\>set PATH=C:\Program Files\Python 3.7;%PATH%
C:\>set PYTHONPATH=%PYTHONPATH%;C:\My_python_lib
C:\>python

Expand Down Expand Up @@ -422,7 +422,7 @@ of your Python installation, delimited by a semicolon from other entries. An
example variable could look like this (assuming the first two entries already
existed)::

C:\WINDOWS\system32;C:\WINDOWS;C:\Program Files\Python 3.6
C:\WINDOWS\system32;C:\WINDOWS;C:\Program Files\Python 3.7

.. _launcher:

Expand Down