summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDong-hee Na <donghee.na92@gmail.com>2018-07-07 16:11:22 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2018-07-07 16:11:22 (GMT)
commitcad4a27585e4255295dcc06e80f1140cd11bdfd4 (patch)
tree8e4af6a717d4a0acf026f4d3374048bf5c191ade
parent3ca69f81472a96a2ee132b4069a465c149022f11 (diff)
downloadcpython-cad4a27585e4255295dcc06e80f1140cd11bdfd4.zip
cpython-cad4a27585e4255295dcc06e80f1140cd11bdfd4.tar.gz
cpython-cad4a27585e4255295dcc06e80f1140cd11bdfd4.tar.bz2
[3.6] bpo-34065: Improve the markup of logging.basicConfig() arguments (GH-8153). (GH-8155)
(cherry picked from commit 2800dcf656229c2ca4c90b4ddbace0717c41bb9e) Co-authored-by: Dong-hee Na <donghee.na92@gmail.com>
-rw-r--r--Doc/library/logging.rst9
-rw-r--r--Misc/NEWS.d/next/Documentation/2018-07-07-20-38-41.bpo-34065.1snofM.rst1
2 files changed, 5 insertions, 5 deletions
diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
index 21b9c7d..590d556 100644
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -1170,14 +1170,13 @@ functions.
+--------------+---------------------------------------------+
.. versionchanged:: 3.2
- The ``style`` argument was added.
+ The *style* argument was added.
.. versionchanged:: 3.3
- The ``handlers`` argument was added. Additional checks were added to
+ The *handlers* argument was added. Additional checks were added to
catch situations where incompatible arguments are specified (e.g.
- ``handlers`` together with ``stream`` or ``filename``, or ``stream``
- together with ``filename``).
-
+ *handlers* together with *stream* or *filename*, or *stream*
+ together with *filename*).
.. function:: shutdown()
diff --git a/Misc/NEWS.d/next/Documentation/2018-07-07-20-38-41.bpo-34065.1snofM.rst b/Misc/NEWS.d/next/Documentation/2018-07-07-20-38-41.bpo-34065.1snofM.rst
new file mode 100644
index 0000000..a3f9fb8
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2018-07-07-20-38-41.bpo-34065.1snofM.rst
@@ -0,0 +1 @@
+Fix wrongly written basicConfig documentation markup syntax