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

[benjamin.peterson]

https://hg.python.org/cpython/rev/e910ea39253f
changeset:   98710:e910ea39253f
parent:      98706:58e2736a57e6
parent:      98709:272bb3f06da8
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Oct 11 23:03:47 2015 -0700
summary:
  merge 3.5

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


diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst
--- a/Doc/faq/general.rst
+++ b/Doc/faq/general.rst
@@ -151,8 +151,8 @@
 next minor version, which becomes the "a0" version,
 e.g. "2.4a0".
 
-See also the documentation for ``sys.version``, ``sys.hexversion``, and
-``sys.version_info``.
+See also the documentation for :data:`sys.version`, :data:`sys.hexversion`, and
+:data:`sys.version_info`.
 
 
 How do I obtain a copy of the Python source?

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