diff options
| author | Georg Brandl <georg@python.org> | 2009-04-28 18:23:28 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-04-28 18:23:28 (GMT) |
| commit | 3885314b116d20c86d52701c2c4e7f9492f90c3c (patch) | |
| tree | bb984633a0a3170afc41a2dbe4bfa75cadde6ef0 /Doc/reference | |
| parent | 9ba8e571c18d371ce4c12cffeac5523de9d97012 (diff) | |
| download | cpython-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/reference')
| -rw-r--r-- | Doc/reference/compound_stmts.rst | 2 | ||||
| -rw-r--r-- | Doc/reference/executionmodel.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst index 4d7addb..3c716b2 100644 --- a/Doc/reference/compound_stmts.rst +++ b/Doc/reference/compound_stmts.rst @@ -178,7 +178,7 @@ function :func:`range` returns a sequence of integers suitable to emulate the effect of Pascal's ``for i := a to b do``; e.g., ``range(3)`` returns the list ``[0, 1, 2]``. -.. warning:: +.. note:: .. index:: single: loop; over mutable sequence diff --git a/Doc/reference/executionmodel.rst b/Doc/reference/executionmodel.rst index 05f8b92..9690a93 100644 --- a/Doc/reference/executionmodel.rst +++ b/Doc/reference/executionmodel.rst @@ -231,7 +231,7 @@ Exceptions can also be identified by strings, in which case the :keyword:`except` clause is selected by object identity. An arbitrary value can be raised along with the identifying string which can be passed to the handler. -.. warning:: +.. note:: Messages to exceptions are not part of the Python API. Their contents may change from one version of Python to the next without warning and should not be |