summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2008-02-24 13:08:18 (GMT)
committerChristian Heimes <christian@cheimes.de>2008-02-24 13:08:18 (GMT)
commita612dc02ced728f553dcc91ca557a2a8b7fa0ca6 (patch)
tree62b717da0813ba63b61537d380ea923a1e657b3d /Doc
parent8e21a3cf059aa8195716f6e7d3bfd0602daca6f1 (diff)
downloadcpython-a612dc02ced728f553dcc91ca557a2a8b7fa0ca6.zip
cpython-a612dc02ced728f553dcc91ca557a2a8b7fa0ca6.tar.gz
cpython-a612dc02ced728f553dcc91ca557a2a8b7fa0ca6.tar.bz2
Merged revisions 61034-61036,61038-61048 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r61034 | georg.brandl | 2008-02-24 01:03:22 +0100 (Sun, 24 Feb 2008) | 4 lines #900744: If an invalid chunked-encoding header is sent by a server, httplib will now raise IncompleteRead and close the connection instead of raising ValueError. ........ r61035 | georg.brandl | 2008-02-24 01:14:24 +0100 (Sun, 24 Feb 2008) | 2 lines #1627: httplib now ignores negative Content-Length headers. ........ r61039 | andrew.kuchling | 2008-02-24 03:39:15 +0100 (Sun, 24 Feb 2008) | 1 line Remove stray word ........ r61040 | neal.norwitz | 2008-02-24 03:40:58 +0100 (Sun, 24 Feb 2008) | 3 lines Add a little info to the 3k deprecation warnings about what to use instead. Suggested by Raymond Hettinger. ........ r61041 | facundo.batista | 2008-02-24 04:17:21 +0100 (Sun, 24 Feb 2008) | 4 lines Issue 1742669. Now %d accepts very big float numbers. Thanks Gabriel Genellina. ........ r61046 | neal.norwitz | 2008-02-24 08:21:56 +0100 (Sun, 24 Feb 2008) | 5 lines Get ctypes working on the Alpha (Tru64). The problem was that there were two module_methods and the one used depended on the order the modules were loaded. By making the test module_methods static, it is not exported and the correct version is picked up. ........ r61048 | neal.norwitz | 2008-02-24 09:27:49 +0100 (Sun, 24 Feb 2008) | 1 line Fix typo of hexidecimal ........
Diffstat (limited to 'Doc')
-rw-r--r--Doc/howto/regex.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/howto/regex.rst b/Doc/howto/regex.rst
index 406ce1c..40f5fdb 100644
--- a/Doc/howto/regex.rst
+++ b/Doc/howto/regex.rst
@@ -203,7 +203,7 @@ this RE against the string ``abcbd``.
| | | ``bc``. |
+------+-----------+---------------------------------+
| 6 | ``abcb`` | Try ``b`` again. This time |
-| | | but the character at the |
+| | | the character at the |
| | | current position is ``'b'``, so |
| | | it succeeds. |
+------+-----------+---------------------------------+