Merge 3.2
diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst
index 6cb03b8..bb18203 100644
--- a/Doc/library/shutil.rst
+++ b/Doc/library/shutil.rst
@@ -295,7 +295,8 @@
*owner* and *group* are used when creating a tar archive. By default,
uses the current owner and group.
- *logger* is an instance of :class:`logging.Logger`.
+ *logger* must be an object compatible with :pep:`282`, usually an instance of
+ :class:`logging.Logger`.
.. versionadded:: 3.2
diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py
index 97383d6..a516d73 100644
--- a/Lib/http/cookiejar.py
+++ b/Lib/http/cookiejar.py
@@ -1,4 +1,4 @@
-"""HTTP cookie handling for web clients.
+r"""HTTP cookie handling for web clients.
This module has (now fairly distant) origins in Gisle Aas' Perl module
HTTP::Cookies, from the libwww-perl library.