Fix mismerges of version directives.

diff --git a/Doc/library/syslog.rst b/Doc/library/syslog.rst
index a3b374a233e40924a5e2476721a9c3dd7b0fc13e..7b1a340fe7dc7ce33f84657cdba7c8a3808cb72b 100644 (file)
--- a/Doc/library/syslog.rst
+++ b/Doc/library/syslog.rst
@@ -43,11 +43,6 @@ The module defines the following functions:
    keyword argument (default is :const:`LOG_USER`) sets the default facility for
    messages which do not have a facility explicitly encoded.
 
-   .. versionchanged:: 3.2
-      In previous versions, keyword arguments were not allowed, and *ident* was
-      required.  The default for *ident* was dependent on the system libraries,
-      and often was ``python`` instead of the name of the python program file.
-
 
 .. function:: closelog()
 

diff --git a/Doc/library/warnings.rst b/Doc/library/warnings.rst
index 5b6e6af73b270ca542e74ac69828a334233a1480..544d9f7996f6bfe4a2c8888d015f385108ccbe61 100644 (file)
--- a/Doc/library/warnings.rst
+++ b/Doc/library/warnings.rst
@@ -159,17 +159,12 @@ By default, Python installs several warning filters, which can be overridden by
 the command-line options passed to :option:`-W` and calls to
 :func:`filterwarnings`.
 
-* :exc:`DeprecationWarning` and :exc:`PendingDeprecationWarning`, and
-  :exc:`ImportWarning` are ignored.
+* :exc:`PendingDeprecationWarning`, and :exc:`ImportWarning` are ignored.
 
 * :exc:`BytesWarning` is ignored unless the :option:`-b` option is given once or
   twice; in this case this warning is either printed (``-b``) or turned into an
   exception (``-bb``).
 
-.. versionchanged:: 3.2
-   :exc:`DeprecationWarning` is now ignored by default in addition to
-   :exc:`PendingDeprecationWarning`.
-
 
 .. _warning-suppress: