Merge doc fixes.

diff --cc Doc/library/asyncore.rst
index aa16acaa18907e50a13aa2a03a064a35c2a6a937,5f95d41161edd9eca73f0b51496445931fc0bf7f..31c1aa154f3cc1b9ba37f010de7bc4f317062972
--- 1/Doc/library/asyncore.rst
--- 2/Doc/library/asyncore.rst
+++ b/Doc/library/asyncore.rst
@@@ -282,9 -280,10 +282,10 @@@ implement its socket handling:
  
         def __init__(self, host, path):
             asyncore.dispatcher.__init__(self)
 -           self.create_socket(socket.AF_INET, socket.SOCK_STREAM)
 +           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

diff --cc Doc/library/stdtypes.rst
Simple merge