From: Fabian Keil <fk@fabiankeil.de>
Date: Sat, 23 Jan 2016 12:00:40 +0000 (+0000)
Subject: Rebuild docs with recent changes
X-Git-Tag: v_3_0_25~162
X-Git-Url: http://www.privoxy.org/gitweb/%22https:/faq/@default-cgi@/coding.html?a=commitdiff_plain;h=7d26a97c2d941b4e7a07d749cc0fe5bbebbfd57a;p=privoxy.git
Rebuild docs with recent changes
---
diff --git a/doc/webserver/developer-manual/index.html b/doc/webserver/developer-manual/index.html
index c3e7b6c5..f6cca5b7 100644
--- a/doc/webserver/developer-manual/index.html
+++ b/doc/webserver/developer-manual/index.html
@@ -302,15 +302,6 @@
<dt>6.3.9. <a href=
"newrelease.html#NEWRELEASE-FREEBSD">FreeBSD</a></dt>
-
- <dt>6.3.10. <a href="newrelease.html#NEWRELEASE-HPUX">HP-UX
- 11</a></dt>
-
- <dt>6.3.11. <a href="newrelease.html#NEWRELEASE-AMIGA">Amiga
- OS</a></dt>
-
- <dt>6.3.12. <a href=
- "newrelease.html#NEWRELEASE-AIX">AIX</a></dt>
</dl>
</dd>
diff --git a/doc/webserver/developer-manual/newrelease.html b/doc/webserver/developer-manual/newrelease.html
index 90c66811..8948c82a 100644
--- a/doc/webserver/developer-manual/newrelease.html
+++ b/doc/webserver/developer-manual/newrelease.html
@@ -912,148 +912,10 @@
<h3 class="SECT3"><a name="NEWRELEASE-FREEBSD" id=
"NEWRELEASE-FREEBSD">6.3.9. FreeBSD</a></h3>
- <p>Login to Sourceforge's compile-farm via ssh:</p>
-
- <table border="0" bgcolor="#E0E0E0" width="100%">
- <tr>
- <td>
- <pre class="PROGRAMLISTING">
- ssh cf.sourceforge.net
-</pre>
- </td>
- </tr>
- </table>
-
- <p>Choose the right operating system. When logged in, <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 run:</p>
-
- <table border="0" bgcolor="#E0E0E0" width="100%">
- <tr>
- <td>
- <pre class="PROGRAMLISTING">
- cd current
- autoheader && autoconf && ./configure
-</pre>
- </td>
- </tr>
- </table>
-
- <p>Then run:</p>
-
- <table border="0" bgcolor="#E0E0E0" width="100%">
- <tr>
- <td>
- <pre class="PROGRAMLISTING">
- gmake freebsd-dist
-</pre>
- </td>
- </tr>
- </table>
-
- <p>which creates a gzip'ed tar archive. Sadly, you cannot use
- <b class="COMMAND">make freebsd-upload</b> on the Sourceforge machine
- (no ncftpput). You now have to manually upload the archive to
- Sourceforge's ftp server and release the file publicly. Use the
- release notes and Change Log from the source tarball package.</p>
- </div>
-
- <div class="SECT3">
- <h3 class="SECT3"><a name="NEWRELEASE-HPUX" id=
- "NEWRELEASE-HPUX">6.3.10. HP-UX 11</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 run:</p>
-
- <table border="0" bgcolor="#E0E0E0" width="100%">
- <tr>
- <td>
- <pre class="PROGRAMLISTING">
- cd current
- autoheader && autoconf && ./configure
-</pre>
- </td>
- </tr>
- </table>
-
- <p>Then do FIXME.</p>
- </div>
-
- <div class="SECT3">
- <h3 class="SECT3"><a name="NEWRELEASE-AMIGA" id=
- "NEWRELEASE-AMIGA">6.3.11. Amiga OS</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 run:</p>
-
- <table border="0" bgcolor="#E0E0E0" width="100%">
- <tr>
- <td>
- <pre class="PROGRAMLISTING">
- cd current
- autoheader && autoconf && ./configure
-</pre>
- </td>
- </tr>
- </table>
-
- <p>Then do FIXME.</p>
- </div>
-
- <div class="SECT3">
- <h3 class="SECT3"><a name="NEWRELEASE-AIX" id=
- "NEWRELEASE-AIX">6.3.12. AIX</a></h3>
-
- <p>Login to Sourceforge's compilefarm via ssh:</p>
-
- <table border="0" bgcolor="#E0E0E0" width="100%">
- <tr>
- <td>
- <pre class="PROGRAMLISTING">
- ssh cf.sourceforge.net
-</pre>
- </td>
- </tr>
- </table>
-
- <p>Choose the right operating system. When logged in, <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 run:</p>
-
- <table border="0" bgcolor="#E0E0E0" width="100%">
- <tr>
- <td>
- <pre class="PROGRAMLISTING">
- cd current
- autoheader && autoconf && ./configure
-</pre>
- </td>
- </tr>
- </table>
-
- <p>Then run:</p>
-
- <table border="0" bgcolor="#E0E0E0" width="100%">
- <tr>
- <td>
- <pre class="PROGRAMLISTING">
- make aix-dist
-</pre>
- </td>
- </tr>
- </table>
-
- <p>which creates a gzip'ed tar archive. Sadly, you cannot use
- <b class="COMMAND">make aix-upload</b> on the Sourceforge machine (no
- ncftpput). You now have to manually upload the archive to
- Sourceforge's ftp server and release the file publicly. Use the
- release notes and Change Log from the source tarball package.</p>
+ <p>Update the www/privoxy port and submit a diff upstream. For
+ details see the <a href=
+ "https://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/"
+ target="_top">FreeBSD Porter's Handbook</a>.</p>
</div>
</div>
diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html
index e3e6de43..af876b2b 100644
--- a/doc/webserver/user-manual/actions-file.html
+++ b/doc/webserver/user-manual/actions-file.html
@@ -117,7 +117,7 @@
in <tt class="FILENAME">default.action</tt> are:</p>
<div class="TABLE">
- <a name="AEN2599" id="AEN2599"></a>
+ <a name="AEN2615" id="AEN2615"></a>
<p><b>Table 1. Default Configurations</b></p>
@@ -314,7 +314,7 @@
actions</a>.</p>
<div class="SECT2">
- <h2 class="SECT2"><a name="AEN2698" id="AEN2698">8.1. Finding the Right
+ <h2 class="SECT2"><a name="AEN2714" id="AEN2714">8.1. Finding the Right
Mix</a></h2>
<p>Note that some <a href="actions-file.html#ACTIONS">actions</a>, like
@@ -339,7 +339,7 @@
</div>
<div class="SECT2">
- <h2 class="SECT2"><a name="AEN2705" id="AEN2705">8.2. How to
+ <h2 class="SECT2"><a name="AEN2721" id="AEN2721">8.2. How to
Edit</a></h2>
<p>The easiest way to edit the actions files is with a browser by using
@@ -644,7 +644,7 @@
</div>
<div class="SECT3">
- <h3 class="SECT3"><a name="AEN2899" id="AEN2899">8.4.2. The Path
+ <h3 class="SECT3"><a name="AEN2915" id="AEN2915">8.4.2. The Path
Pattern</a></h3>
<p><span class="APPLICATION">Privoxy</span> uses <span class=
@@ -4513,7 +4513,7 @@ TAG:^image/
</div>
<div class="SECT3">
- <h3 class="SECT3"><a name="AEN4638" id="AEN4638">8.5.36.
+ <h3 class="SECT3"><a name="AEN4654" id="AEN4654">8.5.36.
Summary</a></h3>
<p>Note that many of these actions have the potential to cause a page
@@ -4672,7 +4672,7 @@ TAG:^image/
together:</p>
<div class="SECT3">
- <h3 class="SECT3"><a name="AEN4702" id="AEN4702">8.7.1.
+ <h3 class="SECT3"><a name="AEN4718" id="AEN4718">8.7.1.
match-all.action</a></h3>
<p>Remember <span class="emphasis"><i class="EMPHASIS">all actions
@@ -4721,7 +4721,7 @@ TAG:^image/
</div>
<div class="SECT3">
- <h3 class="SECT3"><a name="AEN4724" id="AEN4724">8.7.2.
+ <h3 class="SECT3"><a name="AEN4740" id="AEN4740">8.7.2.
default.action</a></h3>
<p>If you aren't a developer, there's no need for you to edit the
@@ -5064,7 +5064,7 @@ wiki.
</div>
<div class="SECT3">
- <h3 class="SECT3"><a name="AEN4837" id="AEN4837">8.7.3.
+ <h3 class="SECT3"><a name="AEN4853" id="AEN4853">8.7.3.
user.action</a></h3>
<p>So far we are painting with a broad brush by setting general
diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html
index 362bdebc..5ac8c35c 100644
--- a/doc/webserver/user-manual/appendix.html
+++ b/doc/webserver/user-manual/appendix.html
@@ -293,7 +293,7 @@
</div>
<div class="SECT2">
- <h2 class="SECT2"><a name="AEN5744" id="AEN5744">14.2. Privoxy's
+ <h2 class="SECT2"><a name="AEN5760" id="AEN5760">14.2. Privoxy's
Internal Pages</a></h2>
<p>Since <span class="APPLICATION">Privoxy</span> proxies each
@@ -313,7 +313,7 @@
<ul>
<li>
- <p>Privoxy main page:</p><a name="AEN5758" id="AEN5758"></a>
+ <p>Privoxy main page:</p><a name="AEN5774" id="AEN5774"></a>
<blockquote class="BLOCKQUOTE">
<p><a href="http://config.privoxy.org/" target=
@@ -328,8 +328,8 @@
<li>
<p>Show information about the current configuration, including
- viewing and editing of actions files:</p><a name="AEN5766" id=
- "AEN5766"></a>
+ viewing and editing of actions files:</p><a name="AEN5782" id=
+ "AEN5782"></a>
<blockquote class="BLOCKQUOTE">
<p><a href="http://config.privoxy.org/show-status" target=
@@ -338,8 +338,8 @@
</li>
<li>
- <p>Show the source code version numbers:</p><a name="AEN5771" id=
- "AEN5771"></a>
+ <p>Show the source code version numbers:</p><a name="AEN5787" id=
+ "AEN5787"></a>
<blockquote class="BLOCKQUOTE">
<p><a href="http://config.privoxy.org/show-version" target=
@@ -348,8 +348,8 @@
</li>
<li>
- <p>Show the browser's request headers:</p><a name="AEN5776" id=
- "AEN5776"></a>
+ <p>Show the browser's request headers:</p><a name="AEN5792" id=
+ "AEN5792"></a>
<blockquote class="BLOCKQUOTE">
<p><a href="http://config.privoxy.org/show-request" target=
@@ -358,8 +358,8 @@
</li>
<li>
- <p>Show which actions apply to a URL and why:</p><a name="AEN5781"
- id="AEN5781"></a>
+ <p>Show which actions apply to a URL and why:</p><a name="AEN5797"
+ id="AEN5797"></a>
<blockquote class="BLOCKQUOTE">
<p><a href="http://config.privoxy.org/show-url-info" target=
@@ -373,20 +373,20 @@
<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=
- "AEN5789" id="AEN5789"></a>
+ "AEN5805" id="AEN5805"></a>
<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="AEN5793" id=
- "AEN5793"></a>
+ <p>Short cuts. Turn off, then on:</p><a name="AEN5809" id=
+ "AEN5809"></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><a name="AEN5796" id="AEN5796"></a>
+ </blockquote><a name="AEN5812" id="AEN5812"></a>
<blockquote class="BLOCKQUOTE">
<p><a href="http://config.privoxy.org/toggle?set=enable" target=
diff --git a/doc/webserver/user-manual/configuration.html b/doc/webserver/user-manual/configuration.html
index f932b902..182ef675 100644
--- a/doc/webserver/user-manual/configuration.html
+++ b/doc/webserver/user-manual/configuration.html
@@ -46,7 +46,7 @@
controlled easily with a web browser.</p>
<div class="SECT2">
- <h2 class="SECT2"><a name="AEN796" id="AEN796">6.1. Controlling Privoxy
+ <h2 class="SECT2"><a name="AEN812" id="AEN812">6.1. Controlling Privoxy
with Your Web Browser</a></h2>
<p><span class="APPLICATION">Privoxy</span>'s user interface can be
@@ -63,10 +63,8 @@
</pre>
- <h2 class="BRIDGEHEAD"><a name="AEN804" id=
- "AEN804"></a> Privoxy Menu</h2>
- <pre>
-</pre>
+ <h2 class="BRIDGEHEAD"><a name="AEN820" id=
+ "AEN820"></a> Privoxy Menu</h2>
<table border="0">
<tbody>
diff --git a/doc/webserver/user-manual/filter-file.html b/doc/webserver/user-manual/filter-file.html
index f6260da2..e34e1236 100644
--- a/doc/webserver/user-manual/filter-file.html
+++ b/doc/webserver/user-manual/filter-file.html
@@ -177,7 +177,7 @@ FILTER: foo Replace all "foo" with "bar"
started.</p>
<div class="SECT2">
- <h2 class="SECT2"><a name="AEN5005" id="AEN5005">9.1. Filter File
+ <h2 class="SECT2"><a name="AEN5021" id="AEN5021">9.1. Filter File
Tutorial</a></h2>
<p>Now, let's complete our <span class="QUOTE">"foo"</span> content
diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html
index 2c05ff01..399c7d8c 100644
--- a/doc/webserver/user-manual/index.html
+++ b/doc/webserver/user-manual/index.html
@@ -155,16 +155,19 @@
<dl>
<dt>5.1. <a href="startup.html#START-DEBIAN">Debian</a></dt>
- <dt>5.2. <a href="startup.html#START-WINDOWS">Windows</a></dt>
+ <dt>5.2. <a href="startup.html#START-FREEBSD">FreeBSD and
+ ElectroBSD</a></dt>
- <dt>5.3. <a href="startup.html#START-UNICES">Solaris, NetBSD,
- FreeBSD, HP-UX and others</a></dt>
+ <dt>5.3. <a href="startup.html#START-WINDOWS">Windows</a></dt>
- <dt>5.4. <a href="startup.html#START-OS2">OS/2</a></dt>
+ <dt>5.4. <a href="startup.html#START-UNICES">Generic instructions
+ for Unix derivates (Solaris, NetBSD, HP-UX etc.)</a></dt>
- <dt>5.5. <a href="startup.html#START-MACOSX">Mac OS X</a></dt>
+ <dt>5.5. <a href="startup.html#START-OS2">OS/2</a></dt>
- <dt>5.6. <a href="startup.html#CMDOPTIONS">Command Line
+ <dt>5.6. <a href="startup.html#START-MACOSX">Mac OS X</a></dt>
+
+ <dt>5.7. <a href="startup.html#CMDOPTIONS">Command Line
Options</a></dt>
</dl>
</dd>
@@ -173,7 +176,7 @@
<dd>
<dl>
- <dt>6.1. <a href="configuration.html#AEN796">Controlling Privoxy
+ <dt>6.1. <a href="configuration.html#AEN812">Controlling Privoxy
with Your Web Browser</a></dt>
<dt>6.2. <a href="configuration.html#CONFOVERVIEW">Configuration
@@ -348,10 +351,10 @@
<dd>
<dl>
- <dt>8.1. <a href="actions-file.html#AEN2698">Finding the Right
+ <dt>8.1. <a href="actions-file.html#AEN2714">Finding the Right
Mix</a></dt>
- <dt>8.2. <a href="actions-file.html#AEN2705">How to Edit</a></dt>
+ <dt>8.2. <a href="actions-file.html#AEN2721">How to Edit</a></dt>
<dt>8.3. <a href="actions-file.html#ACTIONS-APPLY">How Actions
are Applied to Requests</a></dt>
@@ -364,7 +367,7 @@
<dt>8.4.1. <a href="actions-file.html#HOST-PATTERN">The Host
Pattern</a></dt>
- <dt>8.4.2. <a href="actions-file.html#AEN2899">The Path
+ <dt>8.4.2. <a href="actions-file.html#AEN2915">The Path
Pattern</a></dt>
<dt>8.4.3. <a href="actions-file.html#TAG-PATTERN">The Tag
@@ -485,7 +488,7 @@
"actions-file.html#SET-IMAGE-BLOCKER">set-image-blocker</a></dt>
<dt>8.5.36. <a href=
- "actions-file.html#AEN4638">Summary</a></dt>
+ "actions-file.html#AEN4654">Summary</a></dt>
</dl>
</dd>
@@ -497,13 +500,13 @@
<dd>
<dl>
<dt>8.7.1. <a href=
- "actions-file.html#AEN4702">match-all.action</a></dt>
+ "actions-file.html#AEN4718">match-all.action</a></dt>
<dt>8.7.2. <a href=
- "actions-file.html#AEN4724">default.action</a></dt>
+ "actions-file.html#AEN4740">default.action</a></dt>
<dt>8.7.3. <a href=
- "actions-file.html#AEN4837">user.action</a></dt>
+ "actions-file.html#AEN4853">user.action</a></dt>
</dl>
</dd>
</dl>
@@ -513,7 +516,7 @@
<dd>
<dl>
- <dt>9.1. <a href="filter-file.html#AEN5005">Filter File
+ <dt>9.1. <a href="filter-file.html#AEN5021">Filter File
Tutorial</a></dt>
<dt>9.2. <a href="filter-file.html#PREDEFINED-FILTERS">The
@@ -584,7 +587,7 @@
<dt>14.1. <a href="appendix.html#REGEX">Regular
Expressions</a></dt>
- <dt>14.2. <a href="appendix.html#AEN5744">Privoxy's Internal
+ <dt>14.2. <a href="appendix.html#AEN5760">Privoxy's Internal
Pages</a></dt>
<dt>14.3. <a href="appendix.html#CHAIN">Chain of Events</a></dt>
diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html
index afc3a4b1..c705eb20 100644
--- a/doc/webserver/user-manual/startup.html
+++ b/doc/webserver/user-manual/startup.html
@@ -157,7 +157,33 @@
</div>
<div class="SECT2">
- <h2 class="SECT2"><a name="START-WINDOWS" id="START-WINDOWS">5.2.
+ <h2 class="SECT2"><a name="START-FREEBSD" id="START-FREEBSD">5.2.
+ FreeBSD and ElectroBSD</a></h2>
+
+ <p>To start <span class="APPLICATION">Privoxy</span> upon booting, add
+ "privoxy_enable='YES'" to <tt class="FILENAME">/etc/rc.conf</tt>.
+ <span class="APPLICATION">Privoxy</span> will use <tt class=
+ "FILENAME">/usr/local/etc/privoxy/config</tt> as its main configuration
+ file.</p>
+
+ <p>If you installed <span class="APPLICATION">Privoxy</span> into a
+ jail, the paths above are relative to the jail root.</p>
+
+ <p>To start <span class="APPLICATION">Privoxy</span> manually, run:</p>
+
+ <table border="0" bgcolor="#E0E0E0" width="100%">
+ <tr>
+ <td>
+ <pre class="SCREEN">
+ # service privoxy onestart
+</pre>
+ </td>
+ </tr>
+ </table>
+ </div>
+
+ <div class="SECT2">
+ <h2 class="SECT2"><a name="START-WINDOWS" id="START-WINDOWS">5.3.
Windows</a></h2>
<p>Click on the <span class="APPLICATION">Privoxy</span> Icon to start
@@ -178,8 +204,8 @@
</div>
<div class="SECT2">
- <h2 class="SECT2"><a name="START-UNICES" id="START-UNICES">5.3.
- Solaris, NetBSD, FreeBSD, HP-UX and others</a></h2>
+ <h2 class="SECT2"><a name="START-UNICES" id="START-UNICES">5.4. Generic
+ instructions for Unix derivates (Solaris, NetBSD, HP-UX etc.)</a></h2>
<p>Example Unix startup command:</p>
@@ -187,15 +213,20 @@
<tr>
<td>
<pre class="SCREEN">
- # /usr/sbin/privoxy /etc/privoxy/config
+ # /usr/sbin/privoxy --user privoxy /etc/privoxy/config
</pre>
</td>
</tr>
</table>
+
+ <p>Note that if you installed <span class="APPLICATION">Privoxy</span>
+ through a package manager, the package will probably contain a
+ platform-specific script or configuration file to start <span class=
+ "APPLICATION">Privoxy</span> upon boot.</p>
</div>
<div class="SECT2">
- <h2 class="SECT2"><a name="START-OS2" id="START-OS2">5.4. OS/2</a></h2>
+ <h2 class="SECT2"><a name="START-OS2" id="START-OS2">5.5. OS/2</a></h2>
<p>During installation, <span class="APPLICATION">Privoxy</span> is
configured to start automatically when the system restarts. You can
@@ -205,7 +236,7 @@
</div>
<div class="SECT2">
- <h2 class="SECT2"><a name="START-MACOSX" id="START-MACOSX">5.5. Mac OS
+ <h2 class="SECT2"><a name="START-MACOSX" id="START-MACOSX">5.6. Mac OS
X</a></h2>
<p>After downloading the privoxy software, unzip the downloaded file by
@@ -233,7 +264,7 @@
</div>
<div class="SECT2">
- <h2 class="SECT2"><a name="CMDOPTIONS" id="CMDOPTIONS">5.6. Command
+ <h2 class="SECT2"><a name="CMDOPTIONS" id="CMDOPTIONS">5.7. Command
Line Options</a></h2>
<p><span class="APPLICATION">Privoxy</span> may be invoked with the