Merge doc fixes.

This commit is contained in:
Georg Brandl 2011-03-06 11:12:54 +01:00
commit 1ebca48030
8 changed files with 23 additions and 24 deletions

View file

@ -284,7 +284,8 @@ implement its socket handling::
asyncore.dispatcher.__init__(self)
self.create_socket()
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

View file

@ -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. |

View file

@ -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

View file

@ -2322,7 +2322,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

View file

@ -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 |