diff --git a/ChangeLog b/ChangeLog
index 85c4d38ff..dafcd2444 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,11 +3,11 @@
 	* giowin32.c: Socket support rewritten. It was utterly broken, and
 	untested in fact. We still do use a thread for each socket being
 	watched, but instead of blocking in recv() (which of course was
-	plain stupid for sockets being liste()ed on), we block in
-	select(). The read method for sockets calls recv(). It is now
-	possible for the application to call accept(), recv() or send() in
-	the callback, just like on Unix. Tested with code kindly provided
-	by Andrew Lanoix.
+	plain stupid for sockets being listen()ed on in a server-type
+	application), we block in select(). The read method for sockets
+	calls recv(). It is now possible for the application to call
+	accept(), recv() or send() in the callback, just like on
+	Unix. Tested with code kindly provided by Andrew Lanoix.
 
 	Rename g_io_channel_win32_new_stream_socket() to
 	g_io_channel_win32_new_socket() as it isn't restricted to stream
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 85c4d38ff..dafcd2444 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -3,11 +3,11 @@
 	* giowin32.c: Socket support rewritten. It was utterly broken, and
 	untested in fact. We still do use a thread for each socket being
 	watched, but instead of blocking in recv() (which of course was
-	plain stupid for sockets being liste()ed on), we block in
-	select(). The read method for sockets calls recv(). It is now
-	possible for the application to call accept(), recv() or send() in
-	the callback, just like on Unix. Tested with code kindly provided
-	by Andrew Lanoix.
+	plain stupid for sockets being listen()ed on in a server-type
+	application), we block in select(). The read method for sockets
+	calls recv(). It is now possible for the application to call
+	accept(), recv() or send() in the callback, just like on
+	Unix. Tested with code kindly provided by Andrew Lanoix.
 
 	Rename g_io_channel_win32_new_stream_socket() to
 	g_io_channel_win32_new_socket() as it isn't restricted to stream
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 85c4d38ff..dafcd2444 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -3,11 +3,11 @@
 	* giowin32.c: Socket support rewritten. It was utterly broken, and
 	untested in fact. We still do use a thread for each socket being
 	watched, but instead of blocking in recv() (which of course was
-	plain stupid for sockets being liste()ed on), we block in
-	select(). The read method for sockets calls recv(). It is now
-	possible for the application to call accept(), recv() or send() in
-	the callback, just like on Unix. Tested with code kindly provided
-	by Andrew Lanoix.
+	plain stupid for sockets being listen()ed on in a server-type
+	application), we block in select(). The read method for sockets
+	calls recv(). It is now possible for the application to call
+	accept(), recv() or send() in the callback, just like on
+	Unix. Tested with code kindly provided by Andrew Lanoix.
 
 	Rename g_io_channel_win32_new_stream_socket() to
 	g_io_channel_win32_new_socket() as it isn't restricted to stream
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 85c4d38ff..dafcd2444 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -3,11 +3,11 @@
 	* giowin32.c: Socket support rewritten. It was utterly broken, and
 	untested in fact. We still do use a thread for each socket being
 	watched, but instead of blocking in recv() (which of course was
-	plain stupid for sockets being liste()ed on), we block in
-	select(). The read method for sockets calls recv(). It is now
-	possible for the application to call accept(), recv() or send() in
-	the callback, just like on Unix. Tested with code kindly provided
-	by Andrew Lanoix.
+	plain stupid for sockets being listen()ed on in a server-type
+	application), we block in select(). The read method for sockets
+	calls recv(). It is now possible for the application to call
+	accept(), recv() or send() in the callback, just like on
+	Unix. Tested with code kindly provided by Andrew Lanoix.
 
 	Rename g_io_channel_win32_new_stream_socket() to
 	g_io_channel_win32_new_socket() as it isn't restricted to stream
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 85c4d38ff..dafcd2444 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -3,11 +3,11 @@
 	* giowin32.c: Socket support rewritten. It was utterly broken, and
 	untested in fact. We still do use a thread for each socket being
 	watched, but instead of blocking in recv() (which of course was
-	plain stupid for sockets being liste()ed on), we block in
-	select(). The read method for sockets calls recv(). It is now
-	possible for the application to call accept(), recv() or send() in
-	the callback, just like on Unix. Tested with code kindly provided
-	by Andrew Lanoix.
+	plain stupid for sockets being listen()ed on in a server-type
+	application), we block in select(). The read method for sockets
+	calls recv(). It is now possible for the application to call
+	accept(), recv() or send() in the callback, just like on
+	Unix. Tested with code kindly provided by Andrew Lanoix.
 
 	Rename g_io_channel_win32_new_stream_socket() to
 	g_io_channel_win32_new_socket() as it isn't restricted to stream
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 85c4d38ff..dafcd2444 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -3,11 +3,11 @@
 	* giowin32.c: Socket support rewritten. It was utterly broken, and
 	untested in fact. We still do use a thread for each socket being
 	watched, but instead of blocking in recv() (which of course was
-	plain stupid for sockets being liste()ed on), we block in
-	select(). The read method for sockets calls recv(). It is now
-	possible for the application to call accept(), recv() or send() in
-	the callback, just like on Unix. Tested with code kindly provided
-	by Andrew Lanoix.
+	plain stupid for sockets being listen()ed on in a server-type
+	application), we block in select(). The read method for sockets
+	calls recv(). It is now possible for the application to call
+	accept(), recv() or send() in the callback, just like on
+	Unix. Tested with code kindly provided by Andrew Lanoix.
 
 	Rename g_io_channel_win32_new_stream_socket() to
 	g_io_channel_win32_new_socket() as it isn't restricted to stream
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 85c4d38ff..dafcd2444 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -3,11 +3,11 @@
 	* giowin32.c: Socket support rewritten. It was utterly broken, and
 	untested in fact. We still do use a thread for each socket being
 	watched, but instead of blocking in recv() (which of course was
-	plain stupid for sockets being liste()ed on), we block in
-	select(). The read method for sockets calls recv(). It is now
-	possible for the application to call accept(), recv() or send() in
-	the callback, just like on Unix. Tested with code kindly provided
-	by Andrew Lanoix.
+	plain stupid for sockets being listen()ed on in a server-type
+	application), we block in select(). The read method for sockets
+	calls recv(). It is now possible for the application to call
+	accept(), recv() or send() in the callback, just like on
+	Unix. Tested with code kindly provided by Andrew Lanoix.
 
 	Rename g_io_channel_win32_new_stream_socket() to
 	g_io_channel_win32_new_socket() as it isn't restricted to stream
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 85c4d38ff..dafcd2444 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -3,11 +3,11 @@
 	* giowin32.c: Socket support rewritten. It was utterly broken, and
 	untested in fact. We still do use a thread for each socket being
 	watched, but instead of blocking in recv() (which of course was
-	plain stupid for sockets being liste()ed on), we block in
-	select(). The read method for sockets calls recv(). It is now
-	possible for the application to call accept(), recv() or send() in
-	the callback, just like on Unix. Tested with code kindly provided
-	by Andrew Lanoix.
+	plain stupid for sockets being listen()ed on in a server-type
+	application), we block in select(). The read method for sockets
+	calls recv(). It is now possible for the application to call
+	accept(), recv() or send() in the callback, just like on
+	Unix. Tested with code kindly provided by Andrew Lanoix.
 
 	Rename g_io_channel_win32_new_stream_socket() to
 	g_io_channel_win32_new_socket() as it isn't restricted to stream