Rebuild docs

diff --git a/INSTALL b/INSTALL
index 8e3c92f..1e6df14 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -39,8 +39,8 @@ compiler like gcc are required.
 
 When building from a source tarball, first unpack the source:
 
 
 When building from a source tarball, first unpack the source:
 

- tar xzvf privoxy-3.0.30-beta-src.tar.gz
- cd privoxy-3.0.30-beta
+ tar xzvf privoxy-3.0.30-stable-src.tar.gz
+ cd privoxy-3.0.30-stable

 
 To build the development version, you can get the source code by doing:
 
 
 To build the development version, you can get the source code by doing:
 

diff --git a/README b/README
index 14cb53c..acd40a9 100644 (file)
--- a/README
+++ b/README
@@ -32,9 +32,8 @@
  *
  *********************************************************************/
 
  *
  *********************************************************************/
 

-This README is included with the development version of Privoxy 3.0.30. See
-https://www.privoxy.org/ for more information. The current code maturity level
-is "UNRELEASED", but seems stable to us :).
+This README is included with Privoxy 3.0.30. See https://www.privoxy.org/ for
+more information. The current code maturity level is "stable".

 
 -------------------------------------------------------------------------------
 
 
 -------------------------------------------------------------------------------
 


@@ -105,22 +104,16 @@ try it with FTP or other protocols for the simple reason it does not work.
 The actions list can be configured via the web interface accessed via http://
 p.p/, as well other options.
 
 The actions list can be configured via the web interface accessed via http://
 p.p/, as well other options.
 

-All configuration files are subject to unannounced changes during the
-development process.
-

 -------------------------------------------------------------------------------
 
 5. DOCUMENTATION
 
 -------------------------------------------------------------------------------
 
 5. DOCUMENTATION
 

-There should be documentation in the 'doc' subdirectory, but it may not be
-completed at this point. In particular, see the User Manual there, the FAQ, and
-those interested in Privoxy development, should look at developer-manual.
+There should be documentation in the 'doc' subdirectory. In particular, see the
+User Manual there, the FAQ, and those interested in Privoxy development, should
+look at developer-manual.

 
 

-The most up to date source of information on the current development version,
-may still be either comments in the source code, or the included configuration
-files. The source and configuration files are all well commented. The main
-configuration files are: 'config', 'default.action', and 'default.filter' in
-the top-level source directory.
+The source and configuration files are all well commented. The main
+configuration files are: 'config', 'default.action', and 'default.filter'.

 
 Included documentation may vary according to platform and packager. All
 documentation is posted on https://www.privoxy.org, in case you don't have it,
 
 Included documentation may vary according to platform and packager. All
 documentation is posted on https://www.privoxy.org, in case you don't have it,

diff --git a/doc/webserver/developer-manual/newrelease.html b/doc/webserver/developer-manual/newrelease.html
index e49d9a5..117bf1a 100644 (file)
--- a/doc/webserver/developer-manual/newrelease.html
+++ b/doc/webserver/developer-manual/newrelease.html
@@ -401,34 +401,12 @@ for-privoxy-version=3.0.11</pre>
       </div>
       <div class="SECT3">
         <h3 class="SECT3"><a name="NEWRELEASE-DEBIAN" id="NEWRELEASE-DEBIAN">6.3.4. Debian</a></h3>
       </div>
       <div class="SECT3">
         <h3 class="SECT3"><a name="NEWRELEASE-DEBIAN" id="NEWRELEASE-DEBIAN">6.3.4. Debian</a></h3>

-        <p>First, <span class="emphasis"><i class="EMPHASIS">make sure that you have freshly exported the right version
-        into an empty directory</i></span>. (See "Building and releasing packages" above). Then add a log entry to
-        <tt class="FILENAME">debian/changelog</tt>, if it is not already there, for example by running (from the debian
-        directory):</p>
-        <table border="0" bgcolor="#E0E0E0" width="100%">
-          <tr>
-            <td>
-              <pre class="PROGRAMLISTING">  debchange -v 3.0.30-UNRELEASED-1 "New upstream version"</pre>
-            </td>
-          </tr>
-        </table>
-        <p>Then, run (from the root directory):</p>
-        <table border="0" bgcolor="#E0E0E0" width="100%">
-          <tr>
-            <td>
-              <pre class="PROGRAMLISTING">  dpkg-buildpackage -rfakeroot -us -uc -b</pre>
-            </td>
-          </tr>
-        </table>
-        <p>This will create <tt class="FILENAME">../privoxy_3.0.30-UNRELEASED-1_i386.deb</tt> which can be
-        uploaded.</p>

         <p>Using git-buildpackage we start with a clone of the last Debian version:</p>
         <table border="0" bgcolor="#E0E0E0" width="100%">
           <tr>
             <td>
         <p>Using git-buildpackage we start with a clone of the last Debian version:</p>
         <table border="0" bgcolor="#E0E0E0" width="100%">
           <tr>
             <td>

-              <pre class="PROGRAMLISTING">        gbp clone https://salsa.debian.org/debian/privoxy.git
-        cd privoxy
-      </pre>
+              <pre class="PROGRAMLISTING">  gbp clone https://salsa.debian.org/debian/privoxy.git
+  cd privoxy</pre>

             </td>
           </tr>
         </table>
             </td>
           </tr>
         </table>


@@ -436,9 +414,8 @@ for-privoxy-version=3.0.11</pre>
         <table border="0" bgcolor="#E0E0E0" width="100%">
           <tr>
             <td>
         <table border="0" bgcolor="#E0E0E0" width="100%">
           <tr>
             <td>

-              <pre class="PROGRAMLISTING">        cd privoxy
-        gbp pull
-      </pre>
+              <pre class="PROGRAMLISTING">  cd privoxy
+  gbp pull</pre>

             </td>
           </tr>
         </table>
             </td>
           </tr>
         </table>


@@ -446,8 +423,7 @@ for-privoxy-version=3.0.11</pre>
         <table border="0" bgcolor="#E0E0E0" width="100%">
           <tr>
             <td>
         <table border="0" bgcolor="#E0E0E0" width="100%">
           <tr>
             <td>

-              <pre class="PROGRAMLISTING">        gbp import-orig --uscan
-      </pre>
+              <pre class="PROGRAMLISTING">  gbp import-orig --uscan</pre>

             </td>
           </tr>
         </table>
             </td>
           </tr>
         </table>


@@ -455,8 +431,7 @@ for-privoxy-version=3.0.11</pre>
         <table border="0" bgcolor="#E0E0E0" width="100%">
           <tr>
             <td>
         <table border="0" bgcolor="#E0E0E0" width="100%">
           <tr>
             <td>

-              <pre class="PROGRAMLISTING">        while quilt push; do quilt refresh; done
-      </pre>
+              <pre class="PROGRAMLISTING">  while quilt push; do quilt refresh; done</pre>

             </td>
           </tr>
         </table>
             </td>
           </tr>
         </table>


@@ -464,9 +439,8 @@ for-privoxy-version=3.0.11</pre>
         <table border="0" bgcolor="#E0E0E0" width="100%">
           <tr>
             <td>
         <table border="0" bgcolor="#E0E0E0" width="100%">
           <tr>
             <td>

-              <pre class="PROGRAMLISTING">        quilt delete XX_patchname.patch
-        git rm debian/patches/XX_patchname.patch
-      </pre>
+              <pre class="PROGRAMLISTING">  quilt delete XX_patchname.patch
+  git rm debian/patches/XX_patchname.patch</pre>

             </td>
           </tr>
         </table>
             </td>
           </tr>
         </table>


@@ -474,10 +448,9 @@ for-privoxy-version=3.0.11</pre>
         <table border="0" bgcolor="#E0E0E0" width="100%">
           <tr>
             <td>
         <table border="0" bgcolor="#E0E0E0" width="100%">
           <tr>
             <td>

-              <pre class="PROGRAMLISTING">        quilt push -f
-        quilt edit some_file
-        quilt refresh
-      </pre>
+              <pre class="PROGRAMLISTING">  quilt push -f
+  quilt edit some_file
+  quilt refresh</pre>

             </td>
           </tr>
         </table>
             </td>
           </tr>
         </table>


@@ -485,8 +458,7 @@ for-privoxy-version=3.0.11</pre>
         <table border="0" bgcolor="#E0E0E0" width="100%">
           <tr>
             <td>
         <table border="0" bgcolor="#E0E0E0" width="100%">
           <tr>
             <td>

-              <pre class="PROGRAMLISTING">        while quilt push; do quilt refresh; done
-      </pre>
+              <pre class="PROGRAMLISTING">  while quilt push; do quilt refresh; done</pre>

             </td>
           </tr>
         </table>
             </td>
           </tr>
         </table>


@@ -494,8 +466,7 @@ for-privoxy-version=3.0.11</pre>
         <table border="0" bgcolor="#E0E0E0" width="100%">
           <tr>
             <td>
         <table border="0" bgcolor="#E0E0E0" width="100%">
           <tr>
             <td>

-              <pre class="PROGRAMLISTING">        quilt pop -a
-      </pre>
+              <pre class="PROGRAMLISTING">  quilt pop -a</pre>

             </td>
           </tr>
         </table>
             </td>
           </tr>
         </table>


@@ -503,8 +474,7 @@ for-privoxy-version=3.0.11</pre>
         <table border="0" bgcolor="#E0E0E0" width="100%">
           <tr>
             <td>
         <table border="0" bgcolor="#E0E0E0" width="100%">
           <tr>
             <td>

-              <pre class="PROGRAMLISTING">        dch -v 3.0.30-1
-      </pre>
+              <pre class="PROGRAMLISTING">  dch -v 3.0.30-1</pre>

             </td>
           </tr>
         </table>
             </td>
           </tr>
         </table>


@@ -513,8 +483,7 @@ for-privoxy-version=3.0.11</pre>
         <table border="0" bgcolor="#E0E0E0" width="100%">
           <tr>
             <td>
         <table border="0" bgcolor="#E0E0E0" width="100%">
           <tr>
             <td>

-              <pre class="PROGRAMLISTING">        gbp buildpackage -us -uc
-      </pre>
+              <pre class="PROGRAMLISTING">  gbp buildpackage -us -uc</pre>

             </td>
           </tr>
         </table>
             </td>
           </tr>
         </table>


@@ -522,8 +491,7 @@ for-privoxy-version=3.0.11</pre>
         <table border="0" bgcolor="#E0E0E0" width="100%">
           <tr>
             <td>
         <table border="0" bgcolor="#E0E0E0" width="100%">
           <tr>
             <td>

-              <pre class="PROGRAMLISTING">        lintian -iI ../build-area/privoxy_3.0.30-1_amd64.changes
-      </pre>
+              <pre class="PROGRAMLISTING">  lintian -iI ../build-area/privoxy_3.0.30-1_amd64.changes</pre>

             </td>
           </tr>
         </table>
             </td>
           </tr>
         </table>


@@ -532,8 +500,7 @@ for-privoxy-version=3.0.11</pre>
           <tr>
             <td>
               <pre class=
           <tr>
             <td>
               <pre class=

-              "PROGRAMLISTING">        sudo cowbuilder --build --basepath /var/cache/pbuilder/base.cow ../build-area/privoxy_3.0.30-1.dsc
-      </pre>
+              "PROGRAMLISTING">  sudo cowbuilder --build --basepath /var/cache/pbuilder/base.cow ../build-area/privoxy_3.0.30-1.dsc</pre>

             </td>
           </tr>
         </table>
             </td>
           </tr>
         </table>


@@ -542,8 +509,7 @@ for-privoxy-version=3.0.11</pre>
           <tr>
             <td>
               <pre class=
           <tr>
             <td>
               <pre class=

-              "PROGRAMLISTING">        autopkgtest /var/cache/pbuilder/result/privoxy_3.0.30-1_amd64.changes -s -- schroot sid
-      </pre>
+              "PROGRAMLISTING">  autopkgtest /var/cache/pbuilder/result/privoxy_3.0.30-1_amd64.changes -s -- schroot sid</pre>

             </td>
           </tr>
         </table>
             </td>
           </tr>
         </table>


@@ -554,82 +520,77 @@ for-privoxy-version=3.0.11</pre>
         <table border="0" bgcolor="#E0E0E0" width="100%">
           <tr>
             <td>
         <table border="0" bgcolor="#E0E0E0" width="100%">
           <tr>
             <td>

-              <pre class="PROGRAMLISTING">        gpg --detach-sign --armor privoxy_3.0.30-1_i386.deb
-        gpg --detach-sign --armor privoxy_3.0.30-1_amd64.deb
-      </pre>
+              <pre class="PROGRAMLISTING">  gpg --detach-sign --armor privoxy_3.0.30-1_i386.deb
+  gpg --detach-sign --armor privoxy_3.0.30-1_amd64.deb</pre>

             </td>
           </tr>
         </table>
         <p>Create a README file containing the recent block from debian/changelog and upload the two packages, the two
         signatures and the README to a freshly created folder below
         https://sourceforge.net/projects/ijbswa/files/Debian/</p>
             </td>
           </tr>
         </table>
         <p>Create a README file containing the recent block from debian/changelog and upload the two packages, the two
         signatures and the README to a freshly created folder below
         https://sourceforge.net/projects/ijbswa/files/Debian/</p>

-        <p>For building just a git snapshot build the following workflow may be useful. First create a build
-        environment, for this you may have to run the following commands:</p>
-        <table border="0" bgcolor="#E0E0E0" width="100%">
-          <tr>
-            <td>
-              <pre class="PROGRAMLISTING">        sudo apt install build-essential devscripts
-        sudo apt-get build-dep privoxy
-      </pre>
-            </td>
-          </tr>
-        </table>
-        <p>After this enter the checked out privoxy git tree and check that all (new) build dependencies are met:</p>
-        <table border="0" bgcolor="#E0E0E0" width="100%">
-          <tr>
-            <td>
-              <pre class="PROGRAMLISTING">        dpkg-checkbuilddeps
-      </pre>
-            </td>
-          </tr>
-        </table>
-        <p>If something is missing, just add it using</p>
-        <table border="0" bgcolor="#E0E0E0" width="100%">
-          <tr>
-            <td>
-              <pre class="PROGRAMLISTING">        sudo apt install foobar
-      </pre>
-            </td>
-          </tr>
-        </table>
-        <p>Now you may update debian/changelog, especially the version number using</p>
-        <table border="0" bgcolor="#E0E0E0" width="100%">
-          <tr>
-            <td>
-              <pre class="PROGRAMLISTING">        dch
-      </pre>
-            </td>
-          </tr>
-        </table>
-        <p>and finally build the package:</p>
-        <table border="0" bgcolor="#E0E0E0" width="100%">
-          <tr>
-            <td>
-              <pre class="PROGRAMLISTING">        debuild -us -uc -b
-      </pre>
-            </td>
-          </tr>
-        </table>
-        <p>If everything went okay, you may find the resulting Debian package in the parent directory.</p>
-        <p>You may want to clean up the build tree using</p>
-        <table border="0" bgcolor="#E0E0E0" width="100%">
-          <tr>
-            <td>
-              <pre class="PROGRAMLISTING">        debian/rules clean
-      </pre>
-            </td>
-          </tr>
-        </table>
-        <p>And maybe repair some artefacts using one or both of the following commands:</p>
-        <table border="0" bgcolor="#E0E0E0" width="100%">
-          <tr>
-            <td>
-              <pre class="PROGRAMLISTING">        git reset --hard
-        git clean -fd
-      </pre>
-            </td>
-          </tr>
-        </table>
+        <div class="SECT4">
+          <h4 class="SECT4"><a name="SNAPSHOT-DEBIAN" id="SNAPSHOT-DEBIAN">6.3.4.1. Debian GIT Snapshot</a></h4>
+          <p>For building just a git snapshot build the following workflow may be useful. First create a build
+          environment, for this you may have to run the following commands:</p>
+          <table border="0" bgcolor="#E0E0E0" width="100%">
+            <tr>
+              <td>
+                <pre class="PROGRAMLISTING">  sudo apt install build-essential devscripts
+  sudo apt-get build-dep privoxy</pre>
+              </td>
+            </tr>
+          </table>
+          <p>After this enter the checked out privoxy git tree and check that all (new) build dependencies are met:</p>
+          <table border="0" bgcolor="#E0E0E0" width="100%">
+            <tr>
+              <td>
+                <pre class="PROGRAMLISTING">  dpkg-checkbuilddeps</pre>
+              </td>
+            </tr>
+          </table>
+          <p>If something is missing, just add it using</p>
+          <table border="0" bgcolor="#E0E0E0" width="100%">
+            <tr>
+              <td>
+                <pre class="PROGRAMLISTING">  sudo apt install foobar</pre>
+              </td>
+            </tr>
+          </table>
+          <p>Now you may update debian/changelog, especially the version number using</p>
+          <table border="0" bgcolor="#E0E0E0" width="100%">
+            <tr>
+              <td>
+                <pre class="PROGRAMLISTING">  dch</pre>
+              </td>
+            </tr>
+          </table>
+          <p>and finally build the package:</p>
+          <table border="0" bgcolor="#E0E0E0" width="100%">
+            <tr>
+              <td>
+                <pre class="PROGRAMLISTING">  debuild -us -uc -b</pre>
+              </td>
+            </tr>
+          </table>
+          <p>If everything went okay, you may find the resulting Debian package in the parent directory.</p>
+          <p>You may want to clean up the build tree using</p>
+          <table border="0" bgcolor="#E0E0E0" width="100%">
+            <tr>
+              <td>
+                <pre class="PROGRAMLISTING">  debian/rules clean</pre>
+              </td>
+            </tr>
+          </table>
+          <p>And maybe repair some artefacts using one or both of the following commands:</p>
+          <table border="0" bgcolor="#E0E0E0" width="100%">
+            <tr>
+              <td>
+                <pre class="PROGRAMLISTING">  git reset --hard
+  git clean -fd</pre>
+              </td>
+            </tr>
+          </table>
+        </div>

       </div>
       <div class="SECT3">
         <h3 class="SECT3"><a name="NEWRELEASE-MACOSX" id="NEWRELEASE-MACOSX">6.3.5. Mac OS X</a></h3>
       </div>
       <div class="SECT3">
         <h3 class="SECT3"><a name="NEWRELEASE-MACOSX" id="NEWRELEASE-MACOSX">6.3.5. Mac OS X</a></h3>

diff --git a/doc/webserver/index.html b/doc/webserver/index.html
index b48ad6b..bacb0b5 100644 (file)
--- a/doc/webserver/index.html
+++ b/doc/webserver/index.html
@@ -32,7 +32,7 @@
               <p><a href="https://www.privoxy.org/donate" target="_top">https://www.privoxy.org/donate</a></p>
             </li>
           </ul>
               <p><a href="https://www.privoxy.org/donate" target="_top">https://www.privoxy.org/donate</a></p>
             </li>
           </ul>

-          <p>The most recent release is <a href="announce.txt" target="_top">3.0.30 (UNRELEASED)</a>.</p>
+          <p>The most recent release is <a href="announce.txt" target="_top">3.0.30 (stable)</a>.</p>

         </div>
       </div>
       <hr>
         </div>
       </div>
       <hr>

diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html
index aed42cd..c550820 100644 (file)
--- a/doc/webserver/user-manual/appendix.html
+++ b/doc/webserver/user-manual/appendix.html
@@ -202,7 +202,7 @@
       these. If not, you will get a friendly error message. Internet access is not necessary either.</p>
       <ul>
         <li>
       these. If not, you will get a friendly error message. Internet access is not necessary either.</p>
       <ul>
         <li>

-          <p>Privoxy main page:</p><a name="AEN6460" id="AEN6460"></a>
+          <p>Privoxy main page:</p><a name="AEN6455" id="AEN6455"></a>

           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/" target="_top">http://config.privoxy.org/</a></p>
           </blockquote>
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/" target="_top">http://config.privoxy.org/</a></p>
           </blockquote>


@@ -211,7 +211,7 @@
           "APPLICATION">Privoxy</span>)</p>
         </li>
         <li>
           "APPLICATION">Privoxy</span>)</p>
         </li>
         <li>

-          <p>View and toggle client tags:</p><a name="AEN6468" id="AEN6468"></a>
+          <p>View and toggle client tags:</p><a name="AEN6463" id="AEN6463"></a>

           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/client-tags" target=
             "_top">http://config.privoxy.org/client-tags</a></p>
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/client-tags" target=
             "_top">http://config.privoxy.org/client-tags</a></p>


@@ -219,21 +219,21 @@
         </li>
         <li>
           <p>Show information about the current configuration, including viewing and editing of actions
         </li>
         <li>
           <p>Show information about the current configuration, including viewing and editing of actions

-          files:</p><a name="AEN6473" id="AEN6473"></a>
+          files:</p><a name="AEN6468" id="AEN6468"></a>

           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/show-status" target=
             "_top">http://config.privoxy.org/show-status</a></p>
           </blockquote>
         </li>
         <li>
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/show-status" target=
             "_top">http://config.privoxy.org/show-status</a></p>
           </blockquote>
         </li>
         <li>

-          <p>Show the browser's request headers:</p><a name="AEN6478" id="AEN6478"></a>
+          <p>Show the browser's request headers:</p><a name="AEN6473" id="AEN6473"></a>

           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/show-request" target=
             "_top">http://config.privoxy.org/show-request</a></p>
           </blockquote>
         </li>
         <li>
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/show-request" target=
             "_top">http://config.privoxy.org/show-request</a></p>
           </blockquote>
         </li>
         <li>

-          <p>Show which actions apply to a URL and why:</p><a name="AEN6483" id="AEN6483"></a>
+          <p>Show which actions apply to a URL and why:</p><a name="AEN6478" id="AEN6478"></a>

           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/show-url-info" target=
             "_top">http://config.privoxy.org/show-url-info</a></p>
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/show-url-info" target=
             "_top">http://config.privoxy.org/show-url-info</a></p>


@@ -242,15 +242,15 @@
         <li>
           <p>Toggle Privoxy on or off. This feature can be turned off/on in the main <tt class="FILENAME">config</tt>
           file. When toggled <span class="QUOTE">"off"</span>, <span class="QUOTE">"Privoxy"</span> continues to run,
         <li>
           <p>Toggle Privoxy on or off. This feature can be turned off/on in the main <tt class="FILENAME">config</tt>
           file. When toggled <span class="QUOTE">"off"</span>, <span class="QUOTE">"Privoxy"</span> continues to run,

-          but only as a pass-through proxy, with no actions taking place:</p><a name="AEN6491" id="AEN6491"></a>
+          but only as a pass-through proxy, with no actions taking place:</p><a name="AEN6486" id="AEN6486"></a>

           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/toggle" target="_top">http://config.privoxy.org/toggle</a></p>
           </blockquote>
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/toggle" target="_top">http://config.privoxy.org/toggle</a></p>
           </blockquote>

-          <p>Short cuts. Turn off, then on:</p><a name="AEN6495" id="AEN6495"></a>
+          <p>Short cuts. Turn off, then on:</p><a name="AEN6490" id="AEN6490"></a>

           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/toggle?set=disable" target=
             "_top">http://config.privoxy.org/toggle?set=disable</a></p>
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/toggle?set=disable" target=
             "_top">http://config.privoxy.org/toggle?set=disable</a></p>

-          </blockquote><a name="AEN6498" id="AEN6498"></a>
+          </blockquote><a name="AEN6493" id="AEN6493"></a>

           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/toggle?set=enable" target=
             "_top">http://config.privoxy.org/toggle?set=enable</a></p>
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/toggle?set=enable" target=
             "_top">http://config.privoxy.org/toggle?set=enable</a></p>

diff --git a/doc/webserver/user-manual/configuration.html b/doc/webserver/user-manual/configuration.html
index bb6cf30..977651b 100644 (file)
--- a/doc/webserver/user-manual/configuration.html
+++ b/doc/webserver/user-manual/configuration.html
@@ -40,7 +40,7 @@
         <tr>
           <td>
             <pre class="SCREEN"> </pre>
         <tr>
           <td>
             <pre class="SCREEN"> </pre>

-            <h2 class="BRIDGEHEAD"><a name="AEN955"></a>&nbsp;&nbsp;&nbsp;&nbsp;Privoxy Menu</h2>
+            <h2 class="BRIDGEHEAD"><a name="AEN952"></a>&nbsp;&nbsp;&nbsp;&nbsp;Privoxy Menu</h2>

             <pre><br></pre>
             <table border="0">
               <tbody>
             <pre><br></pre>
             <table border="0">
               <tbody>


@@ -94,8 +94,7 @@
       <h2 class="SECT2"><a name="CONFOVERVIEW">6.2. Configuration Files Overview</a></h2>
       <p>For Unix, *BSD and GNU/Linux, all configuration files are located in <tt class="FILENAME">/etc/privoxy/</tt>
       by default. For MS Windows these are all in the same directory as the <span class="APPLICATION">Privoxy</span>
       <h2 class="SECT2"><a name="CONFOVERVIEW">6.2. Configuration Files Overview</a></h2>
       <p>For Unix, *BSD and GNU/Linux, all configuration files are located in <tt class="FILENAME">/etc/privoxy/</tt>
       by default. For MS Windows these are all in the same directory as the <span class="APPLICATION">Privoxy</span>

-      executable. The name and number of configuration files has changed from previous versions, and is subject to
-      change as development progresses.</p>
+      executable.</p>

       <p>The installed defaults provide a reasonable starting point, though some settings may be aggressive by some
       standards. For the time being, the principle configuration files are:</p>
       <ul>
       <p>The installed defaults provide a reasonable starting point, though some settings may be aggressive by some
       standards. For the time being, the principle configuration files are:</p>
       <ul>


@@ -146,9 +145,6 @@
       listening address of <span class="APPLICATION">Privoxy</span>, these <span class="QUOTE">"wake up"</span>
       requests must obviously be sent to the <span class="emphasis"><i class="EMPHASIS">old</i></span> listening
       address.</p>
       listening address of <span class="APPLICATION">Privoxy</span>, these <span class="QUOTE">"wake up"</span>
       requests must obviously be sent to the <span class="emphasis"><i class="EMPHASIS">old</i></span> listening
       address.</p>

-      <p>While under development, the configuration content is subject to change. The below documentation may not be
-      accurate by the time you read this. Also, what constitutes a <span class="QUOTE">"default"</span> setting, may
-      change, so please check all your configuration files on important issues.</p>

     </div>
   </div>
   <div class="NAVFOOTER">
     </div>
   </div>
   <div class="NAVFOOTER">

diff --git a/doc/webserver/user-manual/installation.html b/doc/webserver/user-manual/installation.html
index 374a64d..087e013 100644 (file)
--- a/doc/webserver/user-manual/installation.html
+++ b/doc/webserver/user-manual/installation.html
@@ -128,8 +128,8 @@
       <table border="0" bgcolor="#E0E0E0" width="100%">
         <tr>
           <td>
       <table border="0" bgcolor="#E0E0E0" width="100%">
         <tr>
           <td>

-            <pre class="SCREEN"> tar xzvf privoxy-3.0.30-beta-src.tar.gz
- cd privoxy-3.0.30-beta</pre>
+            <pre class="SCREEN"> tar xzvf privoxy-3.0.30-stable-src.tar.gz
+ cd privoxy-3.0.30-stable</pre>

           </td>
         </tr>
       </table>
           </td>
         </tr>
       </table>

diff --git a/doc/webserver/user-manual/introduction.html b/doc/webserver/user-manual/introduction.html
index 0b6ad1d..5f64314 100644 (file)
--- a/doc/webserver/user-manual/introduction.html
+++ b/doc/webserver/user-manual/introduction.html
@@ -27,20 +27,13 @@
   </div>
   <div class="SECT1">
     <h1 class="SECT1"><a name="INTRODUCTION" id="INTRODUCTION">1. Introduction</a></h1>
   </div>
   <div class="SECT1">
     <h1 class="SECT1"><a name="INTRODUCTION" id="INTRODUCTION">1. Introduction</a></h1>

-    <p>This documentation is included with the current UNRELEASED version of <span class="APPLICATION">Privoxy</span>,
-    3.0.30, and is mostly complete at this point. The most up to date reference for the time being is still the
-    comments in the source files and in the individual configuration files. Development of a new version is currently
-    nearing completion, and includes significant changes and enhancements over earlier versions.</p>
-    <p>Since this is a UNRELEASED version, not all new features are well tested. This documentation may be slightly out
-    of sync as a result (especially with <a href="https://www.privoxy.org/gitweb/?p=privoxy.git;a=summary" target=
-    "_top">git sources</a>). And there <span class="emphasis"><i class="EMPHASIS">may be</i></span> bugs, though
-    hopefully not many!</p>
+    <p>This documentation is included with the current stable version of <span class="APPLICATION">Privoxy</span>,
+    3.0.30.</p>

     <div class="SECT2">
       <h2 class="SECT2"><a name="FEATURES" id="FEATURES">1.1. Features</a></h2>
       <p>In addition to the core features of ad blocking and <a href="https://en.wikipedia.org/wiki/Browser_cookie"
       target="_top">cookie</a> management, <span class="APPLICATION">Privoxy</span> provides many supplemental
     <div class="SECT2">
       <h2 class="SECT2"><a name="FEATURES" id="FEATURES">1.1. Features</a></h2>
       <p>In addition to the core features of ad blocking and <a href="https://en.wikipedia.org/wiki/Browser_cookie"
       target="_top">cookie</a> management, <span class="APPLICATION">Privoxy</span> provides many supplemental

-      features, some of them currently under development, that give the end-user more control, more privacy and more
-      freedom:</p>
+      features, that give the end-user more control, more privacy and more freedom:</p>

       <ul>
         <li>
           <p>Supports "Connection: keep-alive". Outgoing connections can be kept alive independently from the
       <ul>
         <li>
           <p>Supports "Connection: keep-alive". Outgoing connections can be kept alive independently from the

diff --git a/doc/webserver/user-manual/quickstart.html b/doc/webserver/user-manual/quickstart.html
index 108f66a..3a2c7a0 100644 (file)
--- a/doc/webserver/user-manual/quickstart.html
+++ b/doc/webserver/user-manual/quickstart.html
@@ -219,7 +219,7 @@
           <p>Find <tt class="FILENAME">user.action</tt> in the top section, and click on <span class=
           "QUOTE">"<span class="GUIBUTTON">Edit</span>"</span>:</p>
           <div class="FIGURE">
           <p>Find <tt class="FILENAME">user.action</tt> in the top section, and click on <span class=
           "QUOTE">"<span class="GUIBUTTON">Edit</span>"</span>:</p>
           <div class="FIGURE">

-            <a name="AEN722" id="AEN722"></a>
+            <a name="AEN719" id="AEN719"></a>

             <p><b>Figure 1. Actions Files in Use</b></p>
             <div class="MEDIAOBJECT">
               <p><img src="files-in-use.jpg"></p>
             <p><b>Figure 1. Actions Files in Use</b></p>
             <div class="MEDIAOBJECT">
               <p><img src="files-in-use.jpg"></p>

diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html
index d1db7dd..d247293 100644 (file)
--- a/doc/webserver/user-manual/startup.html
+++ b/doc/webserver/user-manual/startup.html
@@ -35,7 +35,7 @@
     <p>Please note that <span class="APPLICATION">Privoxy</span> can only proxy HTTP and HTTPS traffic. It will not
     work with FTP or other protocols.</p>
     <div class="FIGURE">
     <p>Please note that <span class="APPLICATION">Privoxy</span> can only proxy HTTP and HTTPS traffic. It will not
     work with FTP or other protocols.</p>
     <div class="FIGURE">

-      <a name="AEN776" id="AEN776"></a>
+      <a name="AEN773" id="AEN773"></a>

       <p><b>Figure 2. Proxy Configuration Showing Mozilla Firefox HTTP and HTTPS (SSL) Settings</b></p>
       <div class="MEDIAOBJECT">
         <p><img src="proxy_setup.jpg"></p>
       <p><b>Figure 2. Proxy Configuration Showing Mozilla Firefox HTTP and HTTPS (SSL) Settings</b></p>
       <div class="MEDIAOBJECT">
         <p><img src="proxy_setup.jpg"></p>


@@ -66,7 +66,7 @@
     protocols"</span> is <span class="emphasis"><i class="EMPHASIS">UNCHECKED</i></span>. You want only HTTP and HTTPS
     (SSL)!</p>
     <div class="FIGURE">
     protocols"</span> is <span class="emphasis"><i class="EMPHASIS">UNCHECKED</i></span>. You want only HTTP and HTTPS
     (SSL)!</p>
     <div class="FIGURE">

-      <a name="AEN818" id="AEN818"></a>
+      <a name="AEN815" id="AEN815"></a>

       <p><b>Figure 3. Proxy Configuration Showing Internet Explorer HTTP and HTTPS (Secure) Settings</b></p>
       <div class="MEDIAOBJECT">
         <p><img src="proxy2.jpg"></p>
       <p><b>Figure 3. Proxy Configuration Showing Internet Explorer HTTP and HTTPS (Secure) Settings</b></p>
       <div class="MEDIAOBJECT">
         <p><img src="proxy2.jpg"></p>