summaryrefslogtreecommitdiffstats
path: root/README
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2010-03-23 13:20:39 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2010-03-23 13:20:39 (GMT)
commitc0fd6ffd4f66d97faa23e4f0d0e659a3e5833a46 (patch)
treeea8fecbc7985fbd2df85552fc1e8900ee8fc89fc /README
parente67bbfb6efb3e3626e57d74368786260059460b7 (diff)
downloadcpython-c0fd6ffd4f66d97faa23e4f0d0e659a3e5833a46.zip
cpython-c0fd6ffd4f66d97faa23e4f0d0e659a3e5833a46.tar.gz
cpython-c0fd6ffd4f66d97faa23e4f0d0e659a3e5833a46.tar.bz2
Merged revisions 73824,78887,78895,78900,79024 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r73824 | ezio.melotti | 2009-07-04 04:18:08 +0300 (Sat, 04 Jul 2009) | 1 line #6398 typo: versio. -> version. ........ r78887 | ezio.melotti | 2010-03-13 02:15:36 +0200 (Sat, 13 Mar 2010) | 1 line fix broken links ........ r78895 | ezio.melotti | 2010-03-13 03:21:34 +0200 (Sat, 13 Mar 2010) | 1 line #8011: use exc.tb_lineno instead of traceback.tb_lineno() and pep8ify variable names. ........ r78900 | ezio.melotti | 2010-03-13 06:39:51 +0200 (Sat, 13 Mar 2010) | 1 line Silence compiler warnings. ........ r79024 | ezio.melotti | 2010-03-17 16:22:34 +0200 (Wed, 17 Mar 2010) | 1 line Use "x in y" instead of y.find(x) != -1. ........
Diffstat (limited to 'README')
-rw-r--r--README2
1 files changed, 1 insertions, 1 deletions
diff --git a/README b/README
index 7dd1fe8..bc40ec8 100644
--- a/README
+++ b/README
@@ -939,7 +939,7 @@ Installing multiple versions
On Unix and Mac systems if you intend to install multiple versions of Python
using the same installation prefix (--prefix argument to the configure
script) you must take care that your primary python executable is not
-overwritten by the installation of a different versio. All files and
+overwritten by the installation of a different version. All files and
directories installed using "make altinstall" contain the major and minor
version and can thus live side-by-side. "make install" also creates
${prefix}/bin/python which refers to ${prefix}/bin/pythonX.Y. If you intend