Merge doc fixes.

5 files changed, 19 insertions, 8 deletions

diff --git a/Doc/library/asyncore.rst b/Doc/library/asyncore.rst
index 54dd249..5f95d41 100644
--- a/Doc/library/asyncore.rst
+++ b/Doc/library/asyncore.rst
@@ -282,7 +282,8 @@ implement its socket handling::
            asyncore.dispatcher.__init__(self)
            self.create_socket(socket.AF_INET, socket.SOCK_STREAM)
            self.connect( (host, 80) )
-           self.buffer = bytes('GET %s HTTP/1.0\r\n\r\n' % path, 'ascii')
+           self.buffer = bytes('GET %s HTTP/1.0\r\nHost: %s\r\n\r\n' %
+                               (path, host), 'ascii')
 
        def handle_connect(self):
            pass
diff --git a/Doc/library/curses.rst b/Doc/library/curses.rst
index 369571a..1ca22c8 100644
--- a/Doc/library/curses.rst
+++ b/Doc/library/curses.rst
@@ -1173,6 +1173,9 @@ Several constants are available to specify character cell attributes:
 +------------------+-------------------------------+
 | ``A_NORMAL``     | Normal attribute.             |
 +------------------+-------------------------------+
+| ``A_REVERSE``    | Reverse background and        |
+|                  | foreground colors.            |
++------------------+-------------------------------+
 | ``A_STANDOUT``   | Standout mode.                |
 +------------------+-------------------------------+
 | ``A_UNDERLINE``  | Underline mode.               |
diff --git a/Doc/library/locale.rst b/Doc/library/locale.rst
index e5f5f84..dd6f954 100644
--- a/Doc/library/locale.rst
+++ b/Doc/library/locale.rst
@@ -161,7 +161,7 @@ The :mod:`locale` module defines the following exception and functions:
    .. data:: D_T_FMT
 
       Get a string that can be used as a format string for :func:`strftime` to
-      represent time and date in a locale-specific way.
+      represent date and time in a locale-specific way.
 
    .. data:: D_FMT
 
@@ -246,12 +246,17 @@ The :mod:`locale` module defines the following exception and functions:
 
    .. data:: ERA_D_T_FMT
 
-      Get a format string for :func:`strftime` to represent dates and times in a
+      Get a format string for :func:`strftime` to represent date and time in a
       locale-specific era-based way.
 
    .. data:: ERA_D_FMT
 
-      Get a format string for :func:`strftime` to represent time in a
+      Get a format string for :func:`strftime` to represent a date in a
+      locale-specific era-based way.
+
+   .. data:: ERA_T_FMT
+
+      Get a format string for :func:`strftime` to represent a time in a
       locale-specific era-based way.
 
    .. data:: ALT_DIGITS
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index b4304ad..26ebff2 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2311,7 +2311,7 @@ copying.  Memory is generally interpreted as simple bytes.
 .. class:: memoryview(obj)
 
    Create a :class:`memoryview` that references *obj*.  *obj* must support the
-   buffer protocol.  Builtin objects that support the buffer protocol include
+   buffer protocol.  Built-in objects that support the buffer protocol include
    :class:`bytes` and :class:`bytearray`.
 
    A :class:`memoryview` has the notion of an *element*, which is the
diff --git a/Doc/library/turtle.rst b/Doc/library/turtle.rst
index 692746f..e995a7c 100644
--- a/Doc/library/turtle.rst
+++ b/Doc/library/turtle.rst
@@ -2306,9 +2306,11 @@ The demo scripts are:
 | bytedesign     | complex classical            | :func:`tracer`, delay,|
 |                | turtle graphics pattern      | :func:`update`        |
 +----------------+------------------------------+-----------------------+
-| chaos          | graphs verhust dynamics,     | world coordinates     |
-|                | proves that you must not     |                       |
-|                | trust computers' computations|                       |
+| chaos          | graphs Verhulst dynamics,    | world coordinates     |
+|                | shows that computer's        |                       |
+|                | computations can generate    |                       |
+|                | results sometimes against the|                       |
+|                | common sense expectations    |                       |
 +----------------+------------------------------+-----------------------+
 | clock          | analog clock showing time    | turtles as clock's    |
 |                | of your computer             | hands, ontimer        |