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

[benjamin.peterson]

https://hg.python.org/cpython/rev/5789cee8811c
changeset:   101520:5789cee8811c
parent:      101517:d63632b00b6e
parent:      101518:26362d042087
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu May 26 23:19:02 2016 -0700
summary:
  merge 3.5

files:
  Doc/faq/general.rst |  7 +++----
  1 files changed, 3 insertions(+), 4 deletions(-)


diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst
--- a/Doc/faq/general.rst
+++ b/Doc/faq/general.rst
@@ -146,10 +146,9 @@
 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`.

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