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

[benjamin.peterson]

https://hg.python.org/cpython/rev/93168607ad70
changeset:   95826:93168607ad70
parent:      95824:493b3310d5d0
parent:      95825:08c247ff8c1e
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Apr 29 18:00:57 2015 -0400
summary:
  merge 3.4

files:
  Misc/python.man |  3 +--
  1 files changed, 1 insertions(+), 2 deletions(-)


diff --git a/Misc/python.man b/Misc/python.man
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -87,8 +87,7 @@
 .SH DESCRIPTION
 Python is an interpreted, interactive, object-oriented programming
 language that combines remarkable power with very clear syntax.
-For an introduction to programming in Python you are referred to the
-Python Tutorial.
+For an introduction to programming in Python, see the Python Tutorial.
 The Python Library Reference documents built-in and standard types,
 constants, functions and modules.
 Finally, the Python Reference Manual describes the syntax and

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