summaryrefslogtreecommitdiffstats
path: root/Doc/documenting/markup.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-01-03 21:17:04 (GMT)
committerGeorg Brandl <georg@python.org>2009-01-03 21:17:04 (GMT)
commit36ab1ef8ee1006596937198e8f149e09ae8a6139 (patch)
tree604584365c107dcb5880f06d43b58f7580c55010 /Doc/documenting/markup.rst
parent45f53370e7724282f136db6e547cf48b79f9186b (diff)
downloadcpython-36ab1ef8ee1006596937198e8f149e09ae8a6139.zip
cpython-36ab1ef8ee1006596937198e8f149e09ae8a6139.tar.gz
cpython-36ab1ef8ee1006596937198e8f149e09ae8a6139.tar.bz2
Merged revisions 68219 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r68219 | georg.brandl | 2009-01-03 21:47:01 +0100 (Sat, 03 Jan 2009) | 2 lines Fix uses of the default role. ........
Diffstat (limited to 'Doc/documenting/markup.rst')
-rw-r--r--Doc/documenting/markup.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/documenting/markup.rst b/Doc/documenting/markup.rst
index e6f6a52..b3f5a4a 100644
--- a/Doc/documenting/markup.rst
+++ b/Doc/documenting/markup.rst
@@ -599,7 +599,7 @@ units as well as normal text:
Example::
.. versionadded:: 2.5
- The `spam` parameter.
+ The *spam* parameter.
Note that there must be no blank line between the directive head and the
explanation; this is to make these blocks visually continuous in the markup.
@@ -760,7 +760,7 @@ the definition of the symbol. There is this directive:
Blank lines are not allowed within ``productionlist`` directive arguments.
The definition can contain token names which are marked as interpreted text
- (e.g. ``sum ::= `integer` "+" `integer```) -- this generates cross-references
+ (e.g. ``unaryneg ::= "-" `integer```) -- this generates cross-references
to the productions of these tokens.
Note that no further reST parsing is done in the production, so that you