diff -r 25722e983ada Doc/faq/design.rst
--- a/Doc/faq/design.rst	Fri Oct 19 20:40:18 2012 +0300
+++ b/Doc/faq/design.rst	Sun Oct 21 14:43:06 2012 -0500
@@ -49,7 +49,7 @@
 Users are often surprised by results like this::
 
     >>> 1.2 - 1.0
-    0.199999999999999996
+    0.19999999999999996
 
 and think it is a bug in Python.  It's not.  This has little to do with Python,
 and much more to do with how the underlying platform handles floating-point
diff -r 25722e983ada Doc/faq/general.rst
--- a/Doc/faq/general.rst	Fri Oct 19 20:40:18 2012 +0300
+++ b/Doc/faq/general.rst	Sun Oct 21 14:43:06 2012 -0500
@@ -444,14 +444,22 @@
 remember the methods for a list, they can do something like this::
 
    >>> L = []
-   >>> dir(L)
-   ['append', 'count', 'extend', 'index', 'insert', 'pop', 'remove',
+   >>> dir(L) # doctest: +NORMALIZE_WHITESPACE
+   ['__add__', '__class__', '__contains__', '__delattr__', '__delitem__',
+   '__dir__', '__doc__', '__eq__', '__format__', '__ge__',
+   '__getattribute__', '__getitem__', '__gt__', '__hash__', '__iadd__',
+   '__imul__', '__init__', '__iter__', '__le__', '__len__', '__lt__',
+   '__mul__', '__ne__', '__new__', '__reduce__', '__reduce_ex__',
+   '__repr__', '__reversed__', '__rmul__', '__setattr__', '__setitem__',
+   '__sizeof__', '__str__', '__subclasshook__', 'append', 'clear',
+   'copy', 'count', 'extend', 'index', 'insert', 'pop', 'remove',
    'reverse', 'sort']
    >>> help(L.append)
    Help on built-in function append:
-
+   <BLANKLINE>
    append(...)
-       L.append(object) -- append object to end
+       L.append(object) -> None -- append object to end
+   <BLANKLINE>
    >>> L.append(1)
    >>> L
    [1]
diff -r 25722e983ada Doc/faq/windows.rst
--- a/Doc/faq/windows.rst	Fri Oct 19 20:40:18 2012 +0300
+++ b/Doc/faq/windows.rst	Sun Oct 21 14:43:06 2012 -0500
@@ -74,7 +74,7 @@
     >>> print("Hello")
     Hello
     >>> "Hello" * 3
-    HelloHelloHello
+    'HelloHelloHello'
 
 Many people use the interactive mode as a convenient yet highly programmable
 calculator.  When you want to end your interactive Python session, hold the Ctrl
@@ -469,9 +469,9 @@
 
    >>> import os
    >>> os.path.isdir('\\\\rorschach\\public')
-   0
-   >>> os.path.isdir('\\\\rorschach\\public\\')
-   1
+   False
+   >>> os.path.isdir('\\\\rorschach\\public\\') # doctest: +SKIP
+   True
 
 It helps to think of share points as being like drive letters.  Example::