diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst
@@ -664,11 +664,13 @@ depending on the system error code.
   :pep:`3151` - Reworking the OS and IO exception hierarchy


Warnings
--------

-The following exceptions are used as warning categories; see the :mod:`warnings`
-module for more information.

.. exception:: Warning

@@ -682,12 +684,14 @@ module for more information.

.. exception:: DeprecationWarning

-   Base class for warnings about deprecated features.


.. exception:: PendingDeprecationWarning

-   Base class for warnings about features which will be deprecated in the future.


.. exception:: SyntaxWarning
@@ -702,8 +706,8 @@ module for more information.

.. exception:: FutureWarning

-   Base class for warnings about constructs that will change semantically in the
-   future.


.. exception:: ImportWarning
@@ -723,7 +727,8 @@ module for more information.

.. exception:: ResourceWarning

-   Base class for warnings related to resource usage.

   .. versionadded:: 3.2


diff --git a/Doc/tools/susp-ignored.csv b/Doc/tools/susp-ignored.csv
@@ -259,12 +259,8 @@ tutorial/stdlib2,,:start,extra = data[start:start+extra_size]
tutorial/stdlib2,,:start,"fields = struct.unpack('<IIIHH', data[start:start+16])"
tutorial/stdlib2,,:start,filename = data[start:start+filenamesize]
tutorial/stdlib2,,:Warning,WARNING:root:Warning:config file server.conf not found
-using/cmdline,,:category,action:message:category:module:line
using/cmdline,,:errorhandler,:errorhandler
-using/cmdline,,:line,action:message:category:module:line
using/cmdline,,:line,file:line: category: message
-using/cmdline,,:message,action:message:category:module:line
-using/cmdline,,:module,action:message:category:module:line
using/unix,,:Packaging,https://en.opensuse.org/Portal:Packaging
whatsnew/2.0,,:len,
whatsnew/2.3,,::,
@@ -302,6 +298,20 @@ whatsnew/3.2,,:prefix,zope-conf = ${custom:prefix}/etc/zope.conf
library/re,,`,!#$%&'*+-.^_`|~:
library/re,,`,!\#\$%\&'\*\+\-\.\^_`\|\~:
library/tarfile,,:xz,'x:xz'
library/xml.etree.elementtree,,:sometag,prefix:sometag
library/xml.etree.elementtree,,:fictional,"<actors xmlns:fictional=""http://characters.example.com"""
library/xml.etree.elementtree,,:character,<fictional:character>Lancelot</fictional:character>
@@ -330,3 +340,4 @@ whatsnew/3.7,,`,'`'
whatsnew/3.7,,::,error::BytesWarning
whatsnew/changelog,,::,error::BytesWarning
whatsnew/changelog,,::,default::BytesWarning