Backport Skip's patch for SF bug #534495:

    exceptions.tex 1.5

fix a typo in PyErr_Format table and add row for 'p' format char
closes bug 534495

diff --git a/Doc/api/exceptions.tex b/Doc/api/exceptions.tex
index eaaafdd0821515e8c5764185316114b8abdb246e..046130d04528cde0fe521ac9f29eb6e70440b679 100644 (file)
--- a/Doc/api/exceptions.tex
+++ b/Doc/api/exceptions.tex
@@ -139,7 +139,8 @@ for each thread.
     \lineii{c}{Character, as an \ctype{int} parameter}
     \lineii{d}{Number in decimal, as an \ctype{int} parameter}
     \lineii{x}{Number in hexadecimal, as an \ctype{int} parameter}
-    \lineii{x}{A string, as a \ctype{char *} parameter}
+    \lineii{s}{A string, as a \ctype{char *} parameter}
+    \lineii{p}{A hex pointer, as a \ctype{void *} parameter}
   \end{tableii}
 
   An unrecognized format character causes all the rest of the format