diff --git a/Doc/conf.py b/Doc/conf.py
index 18aebb6..c1c2472 100644
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -8,6 +8,7 @@
 
 import sys, os, time
 sys.path.append(os.path.abspath('tools/extensions'))
+sys.path.append(os.path.abspath('includes'))
 
 # General configuration
 # ---------------------
diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst
index 9c5e20d..d9bdb21 100644
--- a/Doc/faq/programming.rst
+++ b/Doc/faq/programming.rst
@@ -1849,7 +1849,7 @@
 will continue to work with the old version of the imported objects.  If the
 module contains class definitions, existing class instances will *not* be
 updated to use the new class definition.  This can result in the following
-paradoxical behaviour:
+paradoxical behaviour::
 
    >>> import importlib
    >>> import cls
@@ -1860,7 +1860,7 @@
    False
 
 The nature of the problem is made clear if you print out the "identity" of the
-class objects:
+class objects::
 
    >>> hex(id(c.__class__))
    '0x7352a0'
diff --git a/Doc/includes/tzinfo-examples.py b/Doc/includes/tzinfo_examples.py
similarity index 100%
rename from Doc/includes/tzinfo-examples.py
rename to Doc/includes/tzinfo_examples.py
diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
index c931855..700a19d 100644
--- a/Doc/library/datetime.rst
+++ b/Doc/library/datetime.rst
@@ -1221,7 +1221,7 @@
 
 
       >>> from datetime import datetime
-      >>> datetime.now().isoformat(timespec='minutes')
+      >>> datetime.now().isoformat(timespec='minutes')   # doctest: +SKIP
       '2002-12-25T00:00'
       >>> dt = datetime(2015, 1, 1, 12, 30, 59, 0)
       >>> dt.isoformat(timespec='microseconds')
@@ -1781,9 +1781,11 @@
           else:
               return dt
 
-Example :class:`tzinfo` classes:
+In the following :download:`tzinfo_examples.py
+<../includes/tzinfo_examples.py>` file there are some examples of
+:class:`tzinfo` classes:
 
-.. literalinclude:: ../includes/tzinfo-examples.py
+.. literalinclude:: ../includes/tzinfo_examples.py
 
 Note that there are unavoidable subtleties twice per year in a :class:`tzinfo`
 subclass accounting for both standard and daylight time, at the DST transition
@@ -1804,6 +1806,8 @@
 ``astimezone(Eastern)`` won't deliver a result with ``hour == 2`` on the day DST
 begins.  For example, at the Spring forward transition of 2016, we get
 
+    >>> from datetime import datetime, timezone
+    >>> from tzinfo_examples import HOUR, Eastern
     >>> u0 = datetime(2016, 3, 13, 5, tzinfo=timezone.utc)
     >>> for i in range(4):
     ...     u = u0 + i*HOUR