Rebuild with recent changes

diff --git a/doc/webserver/faq/general.html b/doc/webserver/faq/general.html
index be0a9fb..d7c448d 100644 (file)
--- a/doc/webserver/faq/general.html
+++ b/doc/webserver/faq/general.html
@@ -505,7 +505,7 @@
         problems you noticed.</p>
 
         <p>If you intend to help out with the trackers, you also might want
-        to <a href="https://sourceforge.net/account/register.php" target=
+        to <a href="https://sourceforge.net/user/registration" target=
         "_top">get an account on SourceForge.net</a> so we don't confuse you
         with the other name-less users.</p>
 
@@ -550,11 +550,10 @@
         users.</p>
 
         <p><span class="APPLICATION">Privoxy</span> has therefore become an
-        associated project of <a href=
-        "http://www.spi-inc.org/about-spi/about-spi" target="_top">Software
-        in the Public Interest (SPI)</a>, which allows us to receive
-        donations. In the United States they are tax-deductible, in a few
-        other western countries they might be tax-deductible in the
+        associated project of <a href="http://www.spi-inc.org/" target=
+        "_top">Software in the Public Interest (SPI)</a>, which allows us to
+        receive donations. In the United States they are tax-deductible, in a
+        few other western countries they might be tax-deductible in the
         future.</p>
 
         <p>If you read this section before you may notice that paying for the

diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html
index 896fc34..3a318b3 100644 (file)
--- a/doc/webserver/user-manual/actions-file.html
+++ b/doc/webserver/user-manual/actions-file.html
@@ -3920,7 +3920,7 @@ nasty-banner-server.example.com/junk.cgi\?output=trash
  example.com/stylesheet\.css
 
 # Create a short, easy to remember nickname for a favorite site
-# (relies on the browser accept and forward invalid URLs to <span class=
+# (relies on the browser to accept and forward invalid URLs to <span class=
 "APPLICATION">Privoxy</span>)
 { +redirect{http://www.privoxy.org/user-manual/actions-file.html} }
  a

diff --git a/doc/webserver/user-manual/config.html b/doc/webserver/user-manual/config.html
index 38f75fd..85c80e2 100644 (file)
--- a/doc/webserver/user-manual/config.html
+++ b/doc/webserver/user-manual/config.html
@@ -901,15 +901,14 @@
             <dt>Type of value:</dt>
 
             <dd>
-              <p><span class="emphasis"><i class=
-              "EMPHASIS">None</i></span></p>
+              <p><span class="emphasis"><i class="EMPHASIS">1 or
+              0</i></span></p>
             </dd>
 
             <dt>Default value:</dt>
 
             <dd>
-              <p><span class="emphasis"><i class=
-              "EMPHASIS">Unset</i></span></p>
+              <p><span class="emphasis"><i class="EMPHASIS">0</i></span></p>
             </dd>
 
             <dt>Effect if unset:</dt>

diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html
index c070513..1c18ffb 100644 (file)
--- a/doc/webserver/user-manual/copyright.html
+++ b/doc/webserver/user-manual/copyright.html
@@ -503,6 +503,7 @@ Public License instead of this License.
       &nbsp;Reiner&nbsp;Buehl<br>
       &nbsp;Andrew&nbsp;J.&nbsp;Caines<br>
       &nbsp;Clifford&nbsp;Caoile<br>
+      &nbsp;Edward&nbsp;Carrel<br>
       &nbsp;Wan-Teh&nbsp;Chang<br>
       &nbsp;Ramkumar&nbsp;Chinchani<br>
       &nbsp;Billy&nbsp;Crook<br>

diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html
index 28bf43a..09386f8 100644 (file)
--- a/doc/webserver/user-manual/index.html
+++ b/doc/webserver/user-manual/index.html
@@ -23,7 +23,7 @@
       2001-2013 by <a href="http://www.privoxy.org/" target="_top">Privoxy
       Developers</a></sub><br></p>
 
-      <p class="PUBDATE">$Id: user-manual.sgml,v 2.174 2013/03/02 14:39:24
+      <p class="PUBDATE">$Id: user-manual.sgml,v 2.175 2013/03/20 11:30:28
       fabiankeil Exp $<br></p>
 
       <div>

diff --git a/doc/webserver/user-manual/whatsnew.html b/doc/webserver/user-manual/whatsnew.html
index ef80060..4d385c7 100644 (file)
--- a/doc/webserver/user-manual/whatsnew.html
+++ b/doc/webserver/user-manual/whatsnew.html
@@ -42,8 +42,8 @@
     Release</a></h1>
 
     <p><span class="APPLICATION">Privoxy 3.0.21</span> stable is a bug-fix
-    release for Privoxy 3.0.20 beta. It addresses two security issues
-    that affect all previous Privoxy versions. The changes since 3.0.20 beta
+    release for Privoxy 3.0.20 beta. It addresses two security issues that
+    affect all previous Privoxy versions. The changes since 3.0.20 beta
     are:</p>
 
     <ul>
@@ -62,8 +62,8 @@
             <p>Proxy authentication headers are removed unless the new
             directive enable-proxy-authentication-forwarding is used.
             Forwarding the headers potentially allows malicious sites to
-            trick the user into providing them with login information. Reported
-            by Chris John Riley.</p>
+            trick the user into providing them with login information.
+            Reported by Chris John Riley.</p>
           </li>
 
           <li>