summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorLarry Hastings <larry@hastings.org>2015-09-13 16:57:16 +0100
committerLarry Hastings <larry@hastings.org>2015-09-13 16:57:16 +0100
commit32cf4b3303ced3435e1b98f78f37f13f7f3ad7a3 (patch)
tree3883770bdc152a665941efc29bb6a589b78103fd /README
parent9f69493dd36811323398e4ceef554848155137bc (diff)
parentaccb42630ba72871b0d19feaed40155487976f7e (diff)
downloadcpython-32cf4b3303ced3435e1b98f78f37f13f7f3ad7a3.tar.gz
Merge from 3.5.
Diffstat (limited to 'README')
-rw-r--r--README46
1 files changed, 24 insertions, 22 deletions
diff --git a/README b/README
index f232755601..db0b093d12 100644
--- a/README
+++ b/README
@@ -4,10 +4,11 @@ This is Python version 3.6.0 alpha 1
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
2012, 2013, 2014, 2015 Python Software Foundation. All rights reserved.
-Python 3.x is a new version of the language, which is incompatible with the 2.x
-line of releases. The language is mostly the same, but many details, especially
-how built-in objects like dictionaries and strings work, have changed
-considerably, and a lot of deprecated features have finally been removed.
+Python 3.x is a new version of the language, which is incompatible with the
+2.x line of releases. The language is mostly the same, but many details,
+especially how built-in objects like dictionaries and strings work,
+have changed considerably, and a lot of deprecated features have finally
+been removed.
Build Instructions
@@ -33,8 +34,8 @@ set up a symlink in /usr/local/bin.
On Windows, see PCbuild/readme.txt.
-If you wish, you can create a subdirectory and invoke configure from there. For
-example:
+If you wish, you can create a subdirectory and invoke configure from there.
+For example:
mkdir debug
cd debug
@@ -42,21 +43,21 @@ example:
make
make test
-(This will fail if you *also* built at the top-level directory. You should do a
-"make clean" at the toplevel first.)
+(This will fail if you *also* built at the top-level directory.
+You should do a "make clean" at the toplevel first.)
What's New
----------
-We try to have a comprehensive overview of the changes in the "What's New in
+We have a comprehensive overview of the changes in the "What's New in
Python 3.6" document, found at
http://docs.python.org/3.6/whatsnew/3.6.html
-For a more detailed change log, read Misc/NEWS (though this file, too, is
-incomplete, and also doesn't list anything merged in from the 2.7 release under
-development).
+For a more detailed change log, read Misc/NEWS (though this file, too,
+is incomplete, and also doesn't list anything merged in from the 2.7
+release under development).
If you want to install multiple versions of Python see the section below
entitled "Installing multiple versions".
@@ -98,10 +99,11 @@ http://docs.python.org/3.6/library/2to3.html for more information.
Testing
-------
-To test the interpreter, type "make test" in the top-level directory. The test
-set produces some output. You can generally ignore the messages about skipped
-tests due to optional features which can't be imported. If a message is printed
-about a failed test or a traceback or core dump is produced, something is wrong.
+To test the interpreter, type "make test" in the top-level directory.
+The test set produces some output. You can generally ignore the messages
+about skipped tests due to optional features which can't be imported.
+If a message is printed about a failed test or a traceback or core dump
+is produced, something is wrong.
By default, tests are prevented from overusing resources like disk space and
memory. To enable these tests, run "make testall".
@@ -139,7 +141,7 @@ Issue Tracker and Mailing List
------------------------------
We're soliciting bug reports about all aspects of the language. Fixes are also
-welcome, preferable in unified diff format. Please use the issue tracker:
+welcome, preferably in unified diff format. Please use the issue tracker:
http://bugs.python.org/
@@ -182,11 +184,11 @@ rights reserved.
Copyright (c) 1991-1995 Stichting Mathematisch Centrum. All rights reserved.
-See the file "LICENSE" for information on the history of this software, terms &
-conditions for usage, and a DISCLAIMER OF ALL WARRANTIES.
+See the file "LICENSE" for information on the history of this software,
+terms & conditions for usage, and a DISCLAIMER OF ALL WARRANTIES.
-This Python distribution contains *no* GNU General Public License (GPL) code, so
-it may be used in proprietary projects. There are interfaces to some GNU code
-but these are entirely optional.
+This Python distribution contains *no* GNU General Public License (GPL) code,
+so it may be used in proprietary projects. There are interfaces to some GNU
+code but these are entirely optional.
All trademarks referenced herein are property of their respective holders.