Issue #25508: Merged documentation fix from 3.4.

This commit is contained in:
Vinay Sajip 2015-11-24 23:22:48 +00:00
commit 46cc4a8f32

View file

@ -743,7 +743,9 @@ the options available to you.
| Attribute name | Format | Description | | Attribute name | Format | Description |
+================+=========================+===============================================+ +================+=========================+===============================================+
| args | You shouldn't need to | The tuple of arguments merged into ``msg`` to | | args | You shouldn't need to | The tuple of arguments merged into ``msg`` to |
| | format this yourself. | produce ``message``. | | | format this yourself. | produce ``message``, or a dict whose values |
| | | are used for the merge (when there is only one|
| | | argument, and it is a dictionary). |
+----------------+-------------------------+-----------------------------------------------+ +----------------+-------------------------+-----------------------------------------------+
| asctime | ``%(asctime)s`` | Human-readable time when the | | asctime | ``%(asctime)s`` | Human-readable time when the |
| | | :class:`LogRecord` was created. By default | | | | :class:`LogRecord` was created. By default |