summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew M. Kuchling <amk@amk.ca>2008-11-04 21:33:06 (GMT)
committerAndrew M. Kuchling <amk@amk.ca>2008-11-04 21:33:06 (GMT)
commit39811fdabd42556a7555bb944a566e43e82116d5 (patch)
tree124997dcd167a1dab8435e72b13afcfc9756d915
parent7f08c1f1091372d6a543c57279bdee907257a864 (diff)
downloadcpython-39811fdabd42556a7555bb944a566e43e82116d5.zip
cpython-39811fdabd42556a7555bb944a566e43e82116d5.tar.gz
cpython-39811fdabd42556a7555bb944a566e43e82116d5.tar.bz2
Backport text fix
-rw-r--r--Doc/whatsnew/2.6.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst
index 44f019c..4c8c5b2 100644
--- a/Doc/whatsnew/2.6.rst
+++ b/Doc/whatsnew/2.6.rst
@@ -179,7 +179,7 @@ of Stellenbosch, South Africa. Martin von Loewis put a
lot of effort into importing existing bugs and patches from
SourceForge; his scripts for this import operation are at
http://svn.python.org/view/tracker/importer/ and may be useful to
-other projects wished to move from SourceForge to Roundup.
+other projects wishing to move from SourceForge to Roundup.
.. seealso::
@@ -3282,5 +3282,6 @@ Acknowledgements
The author would like to thank the following people for offering
suggestions, corrections and assistance with various drafts of this
article: Georg Brandl, Steve Brown, Nick Coghlan, Ralph Corderoy,
-Jim Jewett, Kent Johnson, Chris Lambacher, Antoine Pitrou, Brian Warner.
+Jim Jewett, Kent Johnson, Chris Lambacher, Martin Michlmayr,
+Antoine Pitrou, Brian Warner.