merge 3.4

This commit is contained in:
Benjamin Peterson 2015-04-29 18:00:57 -04:00
commit 31cd7562b0

View file

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