From 34d589c8ead9b9759a0aa82e92b596962e680873 Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Fri, 18 Jan 2013 18:45:21 +0000
Subject: [PATCH] Merge the last-minute ChangeLog fixes

---
 doc/source/user-manual.sgml | 15 +++++++--------
 doc/webserver/announce.txt  | 10 +++++-----
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml
index 36ea4188..c2f1bf57 100644
--- a/doc/source/user-manual.sgml
+++ b/doc/source/user-manual.sgml
@@ -34,7 +34,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
 
- $Id: user-manual.sgml,v 2.161 2013/01/12 12:21:38 fabiankeil Exp $
+ $Id: user-manual.sgml,v 2.163 2013/01/18 12:31:41 fabiankeil Exp $
 
  Copyright (C) 2001-2013 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
@@ -60,7 +60,7 @@
  </subscript>
 </pubdate>
 
-<pubdate>$Id: user-manual.sgml,v 2.161 2013/01/12 12:21:38 fabiankeil Exp $</pubdate>
+<pubdate>$Id: user-manual.sgml,v 2.163 2013/01/18 12:31:41 fabiankeil Exp $</pubdate>
 
 <!--
 
@@ -556,7 +556,7 @@ How to install the binary packages depends on your operating system:
     </listitem>
     <listitem>
      <para>
-      Stop considering client sockets tainted after receving a request with body.
+      Stop considering client sockets tainted after receiving a request with body.
       It hasn't been necessary for a while now and unnecessarily causes test
       failures when using curl's test suite.
      </para>
@@ -599,7 +599,7 @@ How to install the binary packages depends on your operating system:
     <listitem>
      <para>
       When filtering is enabled, let Range headers pass if the range starts at
-      the beginning. This should work around (or at least reduce ) the video
+      the beginning. This should work around (or at least reduce) the video
       playback issues with various Apple clients as reported by Duc in #3426305.
      </para>
     </listitem>
@@ -724,7 +724,7 @@ How to install the binary packages depends on your operating system:
     </listitem>
     <listitem>
      <para>
-      Block 'gm-link.com/' whis is used for email tracking.
+      Block 'gm-link.com/' which is used for email tracking.
       Reported by David Bo in #1812733.
      </para>
     </listitem>
@@ -1091,7 +1091,7 @@ How to install the binary packages depends on your operating system:
     </listitem>
     <listitem>
      <para>
-      In pcrs_get_delimiter(), do not use delimiters ouside the ASCII range.
+      In pcrs_get_delimiter(), do not use delimiters outside the ASCII range.
       Fixes a clang complaint.
      </para>
     </listitem>
@@ -1139,7 +1139,7 @@ How to install the binary packages depends on your operating system:
     <listitem>
      <para>
       Change the hashes used in load_config() to unsigned int. That's what
-      hash_string() actually returns and using a potentiallly larger type
+      hash_string() actually returns and using a potentially larger type
       is at best useless.
      </para>
     </listitem>
@@ -1336,7 +1336,6 @@ How to install the binary packages depends on your operating system:
       AmigaOS. Add additional library-related settings to remove the need for
       providing configure with custom LDFLAGS.
       Submitted by Simon South in #3574538.
-      *** Version 3.0.19 Stable ***
      </para>
      </listitem>
     </itemizedlist>
diff --git a/doc/webserver/announce.txt b/doc/webserver/announce.txt
index fc28e8ef..77935ca7 100644
--- a/doc/webserver/announce.txt
+++ b/doc/webserver/announce.txt
@@ -68,7 +68,7 @@ ChangeLog for Privoxy
     intentions. When looking at the response headers alone, it previously
     wasn't obvious from the client's perspective that no additional responses
     should be expected.
-  - Stop considering client sockets tainted after receving a request with body.
+  - Stop considering client sockets tainted after receiving a request with body.
     It hasn't been necessary for a while now and unnecessarily causes test
     failures when using curl's test suite.
   - Allow HTTP/1.0 clients to signal interest in keep-alive through the
@@ -87,7 +87,7 @@ ChangeLog for Privoxy
     Broken strptime() implementations have caused problems in the past and
     the most recent offender seems to be FreeBSD's libc (standards/173421).
   - When filtering is enabled, let Range headers pass if the range starts at
-    the beginning. This should work around (or at least reduce ) the video
+    the beginning. This should work around (or at least reduce) the video
     playback issues with various Apple clients as reported by Duc in #3426305.
   - Do not confuse a client hanging up with a connection time out. If a client
     closes its side of the connection without sending a request line, do not
@@ -123,7 +123,7 @@ ChangeLog for Privoxy
   - Block '/openx/www/delivery/'.
   - Disable fast-redirects for '.googleapis.com/'.
   - Block 'imp.double.net/'. Reported by David Bo in #3070411.
-  - Block 'gm-link.com/' whis is used for email tracking.
+  - Block 'gm-link.com/' which is used for email tracking.
     Reported by David Bo in #1812733.
   - Verify that requests to "bwp." are blocked. URL taken from #1736879
     submitted by Francois Marier.
@@ -230,7 +230,7 @@ ChangeLog for Privoxy
   - Various data type corrections.
   - Change visibility of several code segments when compiling without
     FEATURE_CONNECTION_KEEP_ALIVE enabled for clarity.
-  - In pcrs_get_delimiter(), do not use delimiters ouside the ASCII range.
+  - In pcrs_get_delimiter(), do not use delimiters outside the ASCII range.
     Fixes a clang complaint.
   - Fix an error message in get_last_url() nobody is supposed to see.
     Reported by Matthew Fischer in #3507301.
@@ -246,7 +246,7 @@ ChangeLog for Privoxy
   - Let enlist_unique_header() verify that the caller didn't pass a header
     containing either \r or \n.
   - Change the hashes used in load_config() to unsigned int. That's what
-    hash_string() actually returns and using a potentiallly larger type
+    hash_string() actually returns and using a potentially larger type
     is at best useless.
   - Use privoxy_tolower() instead of vanilla tolower() with manual casting of
     the argument.
-- 
2.39.2