summaryrefslogtreecommitdiffstats
path: root/Doc/documenting
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-09-01 22:03:20 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-09-01 22:03:20 (GMT)
commit793c47a88a8ad3b1e113308fa9cd359fb3819879 (patch)
tree7dfa0fc9d0fa294b1399cba8c6bea56f142aeb36 /Doc/documenting
parentae5af15e418f49bd9ea76b781090c669981bc57d (diff)
parent024de54fc234e4ad67d6f9abaef4d70d3cce0785 (diff)
downloadcpython-793c47a88a8ad3b1e113308fa9cd359fb3819879.zip
cpython-793c47a88a8ad3b1e113308fa9cd359fb3819879.tar.gz
cpython-793c47a88a8ad3b1e113308fa9cd359fb3819879.tar.bz2
Merge doc changes from 3.2 (#10454, #12298)
Diffstat (limited to 'Doc/documenting')
-rw-r--r--Doc/documenting/markup.rst5
1 files changed, 4 insertions, 1 deletions
diff --git a/Doc/documenting/markup.rst b/Doc/documenting/markup.rst
index c005d0c..ce39d3b 100644
--- a/Doc/documenting/markup.rst
+++ b/Doc/documenting/markup.rst
@@ -513,7 +513,10 @@ in a different style:
.. describe:: keyword
- The name of a keyword in Python.
+ The name of a Python keyword. Using this role will generate a link to the
+ documentation of the keyword. ``True``, ``False`` and ``None`` do not use
+ this role, but simple code markup (````True````), given that they're
+ fundamental to the language and should be known to any programmer.
.. describe:: mailheader