From: Georg Brandl <georg@python.org>
Date: Fri, 26 Nov 2010 08:58:14 +0000 (+0000)
Subject: Fix mismerges of version directives.
X-Git-Tag: v2.7.1~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=241efded1d1d66e326b134a871a10e076914b3a2;p=python

Fix mismerges of version directives.
---

diff --git a/Doc/library/syslog.rst b/Doc/library/syslog.rst
index a3b374a233..7b1a340fe7 100644
--- 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 5b6e6af73b..544d9f7996 100644
--- 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: