summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2012-09-20 06:47:41 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2012-09-20 06:47:41 (GMT)
commitfe6e7e6b30464d7c742bddbe5e96d6ca886ae123 (patch)
tree769339223cd247f03f68a9c474b7300d9e66937b /Doc
parenta58d8b05dff849101cec118cc2a4517cf3ffe001 (diff)
parent694f2331c6959872e05f76c757799be0c4b00748 (diff)
downloadcpython-fe6e7e6b30464d7c742bddbe5e96d6ca886ae123.zip
cpython-fe6e7e6b30464d7c742bddbe5e96d6ca886ae123.tar.gz
cpython-fe6e7e6b30464d7c742bddbe5e96d6ca886ae123.tar.bz2
Merge the quotes/backslashes fixes with 3.2.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/faq/windows.rst10
-rw-r--r--Doc/library/doctest.rst2
-rw-r--r--Doc/library/pyexpat.rst2
3 files changed, 7 insertions, 7 deletions
diff --git a/Doc/faq/windows.rst b/Doc/faq/windows.rst
index 68a1b5c..84e3ff4 100644
--- a/Doc/faq/windows.rst
+++ b/Doc/faq/windows.rst
@@ -464,13 +464,13 @@ to console subprocesses which are designed to handle those signals. See
Why does os.path.isdir() fail on NT shared directories?
-------------------------------------------------------
-The solution appears to be always append the "\\" on the end of shared
-drives.
+In order to work correctly, :func:`os.path.isdir` requires a ``"\\"`` at the
+end of the shared drive::
>>> import os
- >>> os.path.isdir( '\\\\rorschach\\public')
+ >>> os.path.isdir('\\\\rorschach\\public')
0
- >>> os.path.isdir( '\\\\rorschach\\public\\')
+ >>> os.path.isdir('\\\\rorschach\\public\\')
1
It helps to think of share points as being like drive letters. Example::
@@ -480,7 +480,7 @@ It helps to think of share points as being like drive letters. Example::
k:\media is a directory
k:\media\ is not a directory
-The same rules apply if you substitute "k:" with "\\conky\foo"::
+The same rules apply if you substitute ``"k:"`` with ``"\\conky\foo"``::
\\conky\foo is not a directory
\\conky\foo\ is a directory
diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst
index cad03bd..ed53f06 100644
--- a/Doc/library/doctest.rst
+++ b/Doc/library/doctest.rst
@@ -338,7 +338,7 @@ The fine print:
Backslashes in a raw docstring: m\n
Otherwise, the backslash will be interpreted as part of the string. For example,
- the "\\" above would be interpreted as a newline character. Alternatively, you
+ the ``\n`` above would be interpreted as a newline character. Alternatively, you
can double each backslash in the doctest version (and not use a raw string)::
>>> def f(x):
diff --git a/Doc/library/pyexpat.rst b/Doc/library/pyexpat.rst
index a648cfa..861546c 100644
--- a/Doc/library/pyexpat.rst
+++ b/Doc/library/pyexpat.rst
@@ -402,7 +402,7 @@ otherwise stated.
.. method:: xmlparser.CommentHandler(data)
Called for comments. *data* is the text of the comment, excluding the leading
- '``<!-``\ ``-``' and trailing '``-``\ ``->``'.
+ ``'<!-``\ ``-'`` and trailing ``'-``\ ``->'``.
.. method:: xmlparser.StartCdataSectionHandler()