diff options
| author | Benjamin Peterson <benjamin@python.org> | 2016-05-27 06:19:02 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2016-05-27 06:19:02 (GMT) |
| commit | f527aa50403d26bf29737e57d3c260f43d98b004 (patch) | |
| tree | 13c350738a260131980bb1c5f457532217e3b6d8 /Doc/faq | |
| parent | f50cc9ad663a523901087282aff512fcb928d768 (diff) | |
| parent | 06198789a22b7a9f8f66583c630d8d268508519c (diff) | |
| download | cpython-f527aa50403d26bf29737e57d3c260f43d98b004.zip cpython-f527aa50403d26bf29737e57d3c260f43d98b004.tar.gz cpython-f527aa50403d26bf29737e57d3c260f43d98b004.tar.bz2 | |
merge 3.5
Diffstat (limited to 'Doc/faq')
| -rw-r--r-- | Doc/faq/general.rst | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst index 3f71529..6b773dd 100644 --- a/Doc/faq/general.rst +++ b/Doc/faq/general.rst @@ -146,10 +146,9 @@ labeled 2.0aN precede the versions labeled 2.0bN, which precede versions labeled 2.0cN, and *those* precede 2.0. You may also find version numbers with a "+" suffix, e.g. "2.2+". These are -unreleased versions, built directly from the Subversion trunk. In practice, -after a final minor release is made, the Subversion trunk is incremented to the -next minor version, which becomes the "a0" version, -e.g. "2.4a0". +unreleased versions, built directly from the CPython development repository. In +practice, after a final minor release is made, the version is incremented to the +next minor version, which becomes the "a0" version, e.g. "2.4a0". See also the documentation for :data:`sys.version`, :data:`sys.hexversion`, and :data:`sys.version_info`. |