From 0cef51f8d1bf9003698dc2728687543622f74630 Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Sat, 13 Nov 2010 20:17:11 +0000
Subject: [PATCH] Merge ChangeLog updates

---
 doc/source/user-manual.sgml | 75 ++++++++++++++++++++++++++-----------
 doc/webserver/announce.txt  | 38 +++++++++++--------
 2 files changed, 76 insertions(+), 37 deletions(-)

diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml
index ea67d35f..798ef747 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.127 2010/11/10 21:48:54 fabiankeil Exp $
+ $Id: user-manual.sgml,v 2.128 2010/11/10 22:00:13 fabiankeil Exp $
 
  Copyright (C) 2001-2010 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
@@ -60,7 +60,7 @@
  </subscript>
 </pubdate>
 
-<pubdate>$Id: user-manual.sgml,v 2.127 2010/11/10 21:48:54 fabiankeil Exp $</pubdate>
+<pubdate>$Id: user-manual.sgml,v 2.128 2010/11/10 22:00:13 fabiankeil Exp $</pubdate>
 
 <!--
 
@@ -447,19 +447,19 @@ How to install the binary packages depends on your operating system:
    <para>
     Fixed last-chunk-detection for responses where the content was small
     enough to be read with the body, causing Privoxy to wait for the
-    end of the content until the server closed the connection.
-    Reported by "Karsten" in #3028326.
+    end of the content until the server closed the connection or the
+    request timed out. Reported by "Karsten" in #3028326.
    </para>
   </listitem>
   <listitem>
    <para>
     Responses with status code 204 weren't properly detected as body-less
-    like RFC2616 mandates. Like the previous bug, this caused Privoxy
-    to wait for the end of the content until the server closed the connection.
-    Fixes #3022042 and #3025553, reported by a user with no visible name.
-    Most likely also fixes a bunch of other AJAX-related problem reports
-    that got closed in the past due to insufficient information and lack
-    of feedback.
+    like RFC2616 mandates. Like the previous bug, this caused Privoxy to
+    wait for the end of the content until the server closed the connection
+    or the request timed out. Fixes #3022042 and #3025553, reported by a
+    user with no visible name. Most likely also fixes a bunch of other
+    AJAX-related problem reports that got closed in the past due to
+    insufficient information and lack of feedback.
    </para>
   </listitem>
   <listitem>
@@ -549,8 +549,8 @@ How to install the binary packages depends on your operating system:
     </listitem>
     <listitem>
      <para>
-      In cgi_show_url_info(), don't forget to prefix URLs that only contain http:// or https:// in the path.
-      Fixes #2975765 reported by Adam Piggott.
+      In cgi_show_url_info(), don't forget to prefix URLs that only contain
+      http:// or https:// in the path. Fixes #2975765 reported by Adam Piggott.
      </para>
     </listitem>
     <listitem>
@@ -640,9 +640,8 @@ How to install the binary packages depends on your operating system:
      <para>
       javascript needs to be blocked with +handle-as-empty-document to
       work around Firefox bug 492459.  So move .js blockers from
-      +block{Might be a web-bug.} -handle-as-empty-document
-      to
-      +block{Might be a web-bug.} +handle-as-empty-document
+      +block{Might be a web-bug.} -handle-as-empty-document to
+      +block{Might be a web-bug.} +handle-as-empty-document.
      </para>
     </listitem>
     <listitem>
@@ -652,7 +651,7 @@ How to install the binary packages depends on your operating system:
     </listitem>
     <listitem>
      <para>
-      Block another omniture tracking domain
+      Block another omniture tracking domain.
      </para>
     </listitem>
     <listitem>
@@ -665,7 +664,7 @@ How to install the binary packages depends on your operating system:
       Added two sections to get Flickr's Ajax interface working with
       default pre-settings. If you change the configuration to block
       cookies by default, you'll need additional exceptions.
-      Reported by Mathias Homann in #3101419 and by Patrick on ijbswa-users@
+      Reported by Mathias Homann in #3101419 and by Patrick on ijbswa-users@.
      </para>
     </itemizedlist>
    </para>
@@ -695,6 +694,28 @@ How to install the binary packages depends on your operating system:
      <para>
       Grammar fixes for the ACL section.
      </para>
+    </listitem>
+    <listitem>
+     <para>
+      Fixed a link to the 'intercepting' entry and add another one.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Rename the 'Other' section to 'Mailing Lists' and reword it
+      to make it clear that nobody is forced to use the trackers
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Note that 'anonymously' posting on the trackers may not always
+      be possible.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Suggest to enable debug 32768 when suspecting parsing problems.
+     </para>
     </itemizedlist>
    </para>
   </listitem>
@@ -704,23 +725,23 @@ How to install the binary packages depends on your operating system:
     <itemizedlist>
     <listitem>
      <para>
-      Also gather statistics for blocked and redirected requests.
+      Gather statistics for ressources, methods, and HTTP versions
+      used by the client.
      </para>
     </listitem>
     <listitem>
      <para>
-      Provide the percentage of keep-alive offers the client accepted.
+      Also gather statistics for blocked and redirected requests.
      </para>
     </listitem>
     <listitem>
      <para>
-      Add a --url-statistics-threshold option.
+      Provide the percentage of keep-alive offers the client accepted.
      </para>
     </listitem>
     <listitem>
      <para>
-      Also gather statistics for ressources, methods, and HTTP versions
-      used by the client.
+      Add a --url-statistics-threshold option.
      </para>
     </listitem>
     <listitem>
@@ -883,6 +904,13 @@ How to install the binary packages depends on your operating system:
      <para>
       Silence a 'gcc (Debian 4.3.2-1.1) 4.3.2' warning on i686 GNU/Linux.
      </para>
+    </listitem>
+    <listitem>
+     <para>
+      Fix white-space in a log message in remove_chunked_transfer_coding().
+      While at it, add a note that the message doesn't seem to
+      be entirely correct and should be improved later on.
+     </para>
     </itemizedlist>
    </para>
   </listitem>
@@ -8883,6 +8911,9 @@ In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibut
  USA
 
  $Log: user-manual.sgml,v $
+ Revision 2.128  2010/11/10 22:00:13  fabiankeil
+ Update the first paragraph of the 'What's New' section.
+
  Revision 2.127  2010/11/10 21:48:54  fabiankeil
  Update the "What's New" section.
 
diff --git a/doc/webserver/announce.txt b/doc/webserver/announce.txt
index 14cedb2c..bf6e9200 100644
--- a/doc/webserver/announce.txt
+++ b/doc/webserver/announce.txt
@@ -16,15 +16,15 @@ ChangeLog for Privoxy
 
 - Fixed last-chunk-detection for responses where the content was small
   enough to be read with the body, causing Privoxy to wait for the
-  end of the content until the server closed the connection.
-  Reported by "Karsten" in #3028326.
+  end of the content until the server closed the connection or the
+  request timed out. Reported by "Karsten" in #3028326.
 - Responses with status code 204 weren't properly detected as body-less
-  like RFC2616 mandates. Like the previous bug, this caused Privoxy
-  to wait for the end of the content until the server closed the connection.
-  Fixes #3022042 and #3025553, reported by a user with no visible name.
-  Most likely also fixes a bunch of other AJAX-related problem reports
-  that got closed in the past due to insufficient information and lack
-  of feedback.
+  like RFC2616 mandates. Like the previous bug, this caused Privoxy to
+  wait for the end of the content until the server closed the connection
+  or the request timed out. Fixes #3022042 and #3025553, reported by a
+  user with no visible name. Most likely also fixes a bunch of other
+  AJAX-related problem reports that got closed in the past due to
+  insufficient information and lack of feedback.
 - Fixed an ACL bug that made it impossible to build a blacklist.
   Usually the ACL directives are used in a whitelist, which worked
   as expected, but blacklisting is still useful for public proxies
@@ -87,16 +87,15 @@ ChangeLog for Privoxy
     refresh tags with refresh times above 9 seconds are covered.
   - javascript needs to be blocked with +handle-as-empty-document to
     work around Firefox bug 492459.  So move .js blockers from
-    +block{Might be a web-bug.} -handle-as-empty-document
-    to
-    +block{Might be a web-bug.} +handle-as-empty-document
+    +block{Might be a web-bug.} -handle-as-empty-document to
+    +block{Might be a web-bug.} +handle-as-empty-document.
   - ijbswa-Feature Requests-3006719 - Block 160x578 Banners.
-  - Block another omniture tracking domain
+  - Block another omniture tracking domain.
   - Added a range-requests tagger.
   - Added two sections to get Flickr's Ajax interface working with
     default pre-settings. If you change the configuration to block
     cookies by default, you'll need additional exceptions.
-    Reported by Mathias Homann in #3101419 and by Patrick on ijbswa-users@
+    Reported by Mathias Homann in #3101419 and by Patrick on ijbswa-users@.
 
 - Documentation improvements:
   - Explicitly mention how to match all URLs.
@@ -105,13 +104,19 @@ ChangeLog for Privoxy
   - Slightly improve the explanation of why filtering may appear
     slower than it is.
   - Grammar fixes for the ACL section.
+  - Fixed a link to the 'intercepting' entry and add another one.
+  - Rename the 'Other' section to 'Mailing Lists' and reword it
+    to make it clear that nobody is forced to use the trackers
+  - Note that 'anonymously' posting on the trackers may not always
+    be possible.
+  - Suggest to enable debug 32768 when suspecting parsing problems.
 
 - Privoxy-Log-Parser improvements:
+  - Gather statistics for ressources, methods, and HTTP versions
+    used by the client.
   - Also gather statistics for blocked and redirected requests.
   - Provide the percentage of keep-alive offers the client accepted.
   - Add a --url-statistics-threshold option.
-  - Also gather statistics for ressources, methods, and HTTP versions
-    used by the client.
   - Add a --host-statistics-threshold option to also gather
     statistics about how many request where made per host.
   - Fix a bug in handle_loglevel_header() where a 'scan: ' got lost.
@@ -157,6 +162,9 @@ ChangeLog for Privoxy
   - Turn http_response.reason into an enum and rename it
     to http_response.crunch_reason.
   - Silence a 'gcc (Debian 4.3.2-1.1) 4.3.2' warning on i686 GNU/Linux.
+  - Fix white-space in a log message in remove_chunked_transfer_coding().
+    While at it, add a note that the message doesn't seem to
+    be entirely correct and should be improved later on.
 
 - GNUmakefile improvements:
   - Use $(SSH) instead of ssh, so one only needs to specify a username once.
-- 
2.39.2