summaryrefslogtreecommitdiffstats
path: root/Doc/using
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-04-28 18:23:28 (GMT)
committerGeorg Brandl <georg@python.org>2009-04-28 18:23:28 (GMT)
commit3885314b116d20c86d52701c2c4e7f9492f90c3c (patch)
treebb984633a0a3170afc41a2dbe4bfa75cadde6ef0 /Doc/using
parent9ba8e571c18d371ce4c12cffeac5523de9d97012 (diff)
downloadcpython-3885314b116d20c86d52701c2c4e7f9492f90c3c.zip
cpython-3885314b116d20c86d52701c2c4e7f9492f90c3c.tar.gz
cpython-3885314b116d20c86d52701c2c4e7f9492f90c3c.tar.bz2
Merged revisions 72007-72010,72036-72037 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r72007 | georg.brandl | 2009-04-27 17:09:25 +0200 (Mo, 27 Apr 2009) | 1 line #5856: fix typo s in traceback example. ........ r72008 | georg.brandl | 2009-04-27 17:10:44 +0200 (Mo, 27 Apr 2009) | 1 line Remove ".. warning::" markup that doesnt contain warnings for users, rather todo items. ........ r72009 | georg.brandl | 2009-04-27 17:29:09 +0200 (Mo, 27 Apr 2009) | 3 lines Demote warnings to notices where appropriate, following the goal that as few "red box" warnings should clutter the docs as possible. Part 1: stuff that gets merged to Py3k. ........ r72010 | georg.brandl | 2009-04-27 17:29:26 +0200 (Mo, 27 Apr 2009) | 2 lines Demote warnings to notices, part 2: stuff that is 2.x-only. ........ r72036 | georg.brandl | 2009-04-27 19:04:23 +0200 (Mo, 27 Apr 2009) | 1 line #5848: small unittest doc patch. ........ r72037 | georg.brandl | 2009-04-27 19:09:53 +0200 (Mo, 27 Apr 2009) | 1 line #5840: dont claim we dont support TLS. ........
Diffstat (limited to 'Doc/using')
-rw-r--r--Doc/using/cmdline.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 2dd85f4..fa73ea2 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -351,7 +351,7 @@ Miscellaneous options
Skip the first line of the source, allowing use of non-Unix forms of
``#!cmd``. This is intended for a DOS specific hack only.
- .. warning:: The line numbers in error messages will be off by one!
+ .. note:: The line numbers in error messages will be off by one.
.. cmdoption:: -3