merge with 3.3

2 files changed, 6 insertions, 3 deletions

diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
index bb268e1..f9d6918 100644
--- a/Doc/library/datetime.rst
+++ b/Doc/library/datetime.rst
@@ -1784,7 +1784,8 @@ values.  If they're used anyway, ``0`` is substituted for them.
 
 The full set of format codes supported varies across platforms, because Python
 calls the platform C library's :func:`strftime` function, and platform
-variations are common.
+variations are common.  To see the full set of format codes supported on your
+platform, consult the :manpage:`strftime(3)` documentation.
 
 The following is a list of all the format codes that the C standard (1989
 version) requires, and these work on all platforms with a standard C
diff --git a/Doc/library/time.rst b/Doc/library/time.rst
index 1e21fb6..cc8f716 100644
--- a/Doc/library/time.rst
+++ b/Doc/library/time.rst
@@ -471,8 +471,10 @@ The module defines the following functions and data items:
       >>> strftime("%a, %d %b %Y %H:%M:%S +0000", gmtime())
       'Thu, 28 Jun 2001 14:17:15 +0000'
 
-   Additional directives may be supported on certain platforms, but only the ones
-   listed here have a meaning standardized by ANSI C.
+   Additional directives may be supported on certain platforms, but only the
+   ones listed here have a meaning standardized by ANSI C.  To see the full set
+   of format codes supported on your platform, consult the :manpage:`strftime(3)`
+   documentation.
 
    On some platforms, an optional field width and precision specification can
    immediately follow the initial ``'%'`` of a directive in the following order;