Merge with 3.3.

This commit is contained in:
Georg Brandl 2013-03-28 13:28:55 +01:00
commit 1bab7134a8
32 changed files with 129 additions and 30 deletions

View file

@ -63,6 +63,8 @@ The logging functions are named after the level or severity of the events
they are used to track. The standard levels and their applicability are
described below (in increasing order of severity):
.. tabularcolumns:: |l|L|
+--------------+---------------------------------------------+
| Level | When it's used |
+==============+=============================================+