summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2012-03-04 15:17:05 (GMT)
committerGeorg Brandl <georg@python.org>2012-03-04 15:17:05 (GMT)
commita673eb895e3f6b14d7e99b95ce7dcafa3ad22ded (patch)
tree4d52d9794d87e01b40a47661c43e72753669a5db
parent0f25cea2c51cdd4a705be9ad510f055b3c6248ac (diff)
downloadcpython-a673eb895e3f6b14d7e99b95ce7dcafa3ad22ded.zip
cpython-a673eb895e3f6b14d7e99b95ce7dcafa3ad22ded.tar.gz
cpython-a673eb895e3f6b14d7e99b95ce7dcafa3ad22ded.tar.bz2
Fix invalid markup and update suspicious ignores.
-rw-r--r--Doc/library/socket.rst4
-rw-r--r--Doc/library/sys.rst2
-rw-r--r--Doc/tools/sphinxext/susp-ignored.csv24
3 files changed, 20 insertions, 10 deletions
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 8cc5a7e..69fa378 100644
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -1311,7 +1311,7 @@ network. This example might require special priviledge::
import struct
- # CAN frame packing/unpacking (see `struct can_frame` in <linux/can.h>)
+ # CAN frame packing/unpacking (see 'struct can_frame' in <linux/can.h>)
can_frame_fmt = "=IB3x8s"
can_frame_size = struct.calcsize(can_frame_fmt)
@@ -1326,7 +1326,7 @@ network. This example might require special priviledge::
return (can_id, can_dlc, data[:can_dlc])
- # create a raw socket and bind it to the `vcan0` interface
+ # create a raw socket and bind it to the 'vcan0' interface
s = socket.socket(socket.AF_CAN, socket.SOCK_RAW, socket.CAN_RAW)
s.bind(('vcan0',))
diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
index da87be7..96450c5 100644
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -770,7 +770,7 @@ always available.
independent Python files are installed; by default, this is the string
``'/usr/local'``. This can be set at build time with the ``--prefix``
argument to the :program:`configure` script. The main collection of Python
- library modules is installed in the directory :file:`{prefix}/lib/python{X.Y}``
+ library modules is installed in the directory :file:`{prefix}/lib/python{X.Y}`
while the platform independent header files (all except :file:`pyconfig.h`) are
stored in :file:`{prefix}/include/python{X.Y}`, where *X.Y* is the version
number of Python, for example ``3.2``.
diff --git a/Doc/tools/sphinxext/susp-ignored.csv b/Doc/tools/sphinxext/susp-ignored.csv
index 18a16d7..d978740 100644
--- a/Doc/tools/sphinxext/susp-ignored.csv
+++ b/Doc/tools/sphinxext/susp-ignored.csv
@@ -112,9 +112,6 @@ library/turtle,,::,Example::
library/urllib,,:port,:port
library/urllib2,,:password,"""joe:password@python.org"""
library/uuid,,:uuid,urn:uuid:12345678-1234-5678-1234-567812345678
-library/xmlrpclib,,:pass,http://user:pass@host:port/path
-library/xmlrpclib,,:pass,user:pass
-library/xmlrpclib,,:port,http://user:pass@host:port/path
license,,`,THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
license,,:zooko,mailto:zooko@zooko.com
license,,`,THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
@@ -185,14 +182,13 @@ library/stdtypes,,:end,s[start:end]
library/urllib.request,,:close,Connection:close
library/urllib.request,,:password,"""joe:password@python.org"""
library/urllib.request,,:lang,"xmlns=""http://www.w3.org/1999/xhtml"" xml:lang=""en"" lang=""en"">\n\n<head>\n"
-library/xmlrpc.client,103,:pass,http://user:pass@host:port/path
-library/xmlrpc.client,103,:port,http://user:pass@host:port/path
-library/xmlrpc.client,103,:pass,user:pass
+library/xmlrpc.client,,:pass,http://user:pass@host:port/path
+library/xmlrpc.client,,:port,http://user:pass@host:port/path
+library/xmlrpc.client,,:pass,user:pass
license,,`,* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
license,,`,* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
license,,`,"``Software''), to deal in the Software without restriction, including"
license,,`,"THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,"
-reference/lexical_analysis,704,`,$ ? `
whatsnew/2.7,735,:Sunday,'2009:4:Sunday'
whatsnew/2.7,862,::,"export PYTHONWARNINGS=all,error:::Cookie:0"
whatsnew/2.7,862,:Cookie,"export PYTHONWARNINGS=all,error:::Cookie:0"
@@ -295,3 +291,17 @@ packaging/tutorial,,::,2) License :: OSI Approved :: GNU Library or Lesser Gener
packaging/tutorial,,::,Type the number of the license you wish to use or ? to try again:: 1
packaging/tutorial,,::,classifier = Development Status :: 3 - Alpha
packaging/tutorial,,::,License :: OSI Approved :: GNU General Public License (GPL)
+c-api/unicode,,:start,unicode[start:start+length]
+library/smtplib,,:port,method must support that as well as a regular host:port
+library/socket,,:len,fds.fromstring(cmsg_data[:len(cmsg_data) - (len(cmsg_data) % fds.itemsize)])
+library/socket,,:can,"return (can_id, can_dlc, data[:can_dlc])"
+library/sqlite3,,:who,"cur.execute(""select * from people where name_last=:who and age=:age"", {""who"": who, ""age"": age})"
+library/sqlite3,,:age,"cur.execute(""select * from people where name_last=:who and age=:age"", {""who"": who, ""age"": age})"
+library/stdtypes,,::,>>> a[::2].tolist()
+library/stdtypes,,::,>>> a[::-1].tolist()
+library/stdtypes,,::,>>> hash(v[::-2]) == hash(b'abcefg'[::-2])
+library/stdtypes,,::,>>> y = m[::2]
+reference/lexical_analysis,,`,$ ? `
+library/tarfile,,:xz,'r:xz'
+library/tarfile,,:xz,'w:xz'
+library/tarfile,,:xz,'a:xz'