From: Fabian Keil <fk@fabiankeil.de>
Date: Thu, 17 Dec 2020 13:56:19 +0000 (+0100)
Subject: Rebuild docs
X-Git-Tag: v_3_0_30~199
X-Git-Url: http://www.privoxy.org/gitweb/@default-cgi@edit-actions-url-form?a=commitdiff_plain;h=32b80c1607bb8338384942a1ae9d9c22d1eb4f67;p=privoxy.git
Rebuild docs
---
diff --git a/doc/webserver/developer-manual/newrelease.html b/doc/webserver/developer-manual/newrelease.html
index d8a91e46..dc47f64b 100644
--- a/doc/webserver/developer-manual/newrelease.html
+++ b/doc/webserver/developer-manual/newrelease.html
@@ -403,7 +403,8 @@ for-privoxy-version=3.0.11</pre>
<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:</p>
+ <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>
@@ -411,7 +412,7 @@ for-privoxy-version=3.0.11</pre>
</td>
</tr>
</table>
- <p>Then, run:</p>
+ <p>Then, run (from the root directory):</p>
<table border="0" bgcolor="#E0E0E0" width="100%">
<tr>
<td>
diff --git a/doc/webserver/faq/contact.html b/doc/webserver/faq/contact.html
index d6c5626f..13215a02 100644
--- a/doc/webserver/faq/contact.html
+++ b/doc/webserver/faq/contact.html
@@ -63,7 +63,7 @@
</li>
<li>
<p>Whether your version of <span class="APPLICATION">Privoxy</span> is one supplied by the <span class=
- "APPLICATION">Privoxy</span> developers via SourceForge, or if you got your copy somewhere else.</p>
+ "APPLICATION">Privoxy</span> developers, or if you got your copy somewhere else.</p>
</li>
<li>
<p>Whether you are using <span class="APPLICATION">Privoxy</span> together with another proxy such as
@@ -86,7 +86,7 @@
# See also debug 1024.<br>
debug 2 # show each connection status<br>
- debug 4 # show I/O status<br>
+ debug 4 # show tagging-related messages<br>
debug 8 # show header parsing<br>
debug 128 # debug redirects<br>
debug 256 # debug GIF de-animation<br>
@@ -120,8 +120,6 @@
information. If you use a SF id, you should automatically get a mail when someone responds to your request.
Please don't bother to add an email address when using the tracker. If you prefer to communicate through email,
just use one of the mailing lists directly.</p>
- <p>If you are new to reporting problems, you might be interested in <a href=
- "https://www.chiark.greenend.org.uk/~sgtatham/bugs.html" target="_top">How to Report Bugs Effectively</a>.</p>
<p>The <a href="https://www.privoxy.org/user-manual/appendix.html#ACTIONSANAT" target="_top">appendix of the
Privoxy User Manual</a> also has helpful information on understanding <tt class="LITERAL">actions</tt>, and
<tt class="LITERAL">action</tt> debugging.</p>
diff --git a/doc/webserver/faq/copyright.html b/doc/webserver/faq/copyright.html
index a762bfd1..9741d065 100644
--- a/doc/webserver/faq/copyright.html
+++ b/doc/webserver/faq/copyright.html
@@ -27,8 +27,7 @@
<h1 class="SECT1"><a name="COPYRIGHT" id="COPYRIGHT">7. Privoxy Copyright, License and History</a></h1>
<p>Copyright © 2001-2020 by Privoxy Developers <code class="EMAIL"><<a href=
"mailto:privoxy-devel@lists.privoxy.org">privoxy-devel@lists.privoxy.org</a>></code></p>
- <p>Some source code is based on code Copyright © 1997 by Anonymous Coders and Junkbusters, Inc. and licensed
- under the <i class="CITETITLE">GNU General Public License</i>.</p>
+ <p>Some source code is based on code Copyright © 1997 by Anonymous Coders and Junkbusters, Inc.</p>
<p>Portions of this document are <span class="QUOTE">"borrowed"</span> from the original <span class=
"APPLICATION">Junkbuster</span> (tm) FAQ, and modified as appropriate for <span class=
"APPLICATION">Privoxy</span>.</p>
diff --git a/doc/webserver/faq/general.html b/doc/webserver/faq/general.html
index f0295d86..42c364ec 100644
--- a/doc/webserver/faq/general.html
+++ b/doc/webserver/faq/general.html
@@ -361,7 +361,8 @@
<p>The details may change over time but changes will only affect new sponsors (or existing sponsors that
explicitly agreed to the changes).</p>
<p>If you want to become a sponsor, please contact <a href="mailto:fk@fabiankeil.de" target="_top">Fabian
- Keil</a> and include the link target in the mail. New sponsors are only accepted if no developer objects.</p>
+ Keil</a> and include the link target in the mail. New sponsors are only accepted if no <a href=
+ "../user-manual/copyright.html#AUTHORS" target="_top">Privoxy team</a> member objects.</p>
</div>
</div>
<div class="NAVFOOTER">
diff --git a/doc/webserver/index.html b/doc/webserver/index.html
index 81feb1d1..46f7fa5f 100644
--- a/doc/webserver/index.html
+++ b/doc/webserver/index.html
@@ -97,8 +97,7 @@
<p style="text-align: center"><sub>Hosting and development is funded in part by:</sub></p>
<p style="text-align: center"><sub><a href="https://www.top10vpn.com" target=
"_top">https://www.top10vpn.com</a></sub></p>
- <p style="text-align: center"><sub><a href="/faq/general.html#SPONSOR" target="_top">Become a
- sponsor</a></sub></p>
+ <p style="text-align: center"><sub><a href="/sponsor" target="_top">Become a sponsor</a></sub></p>
</div>
</div>
</body>
diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html
index 6fb335bc..716930f3 100644
--- 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>
- <p>Privoxy main page:</p><a name="AEN6409" id="AEN6409"></a>
+ <p>Privoxy main page:</p><a name="AEN6403" id="AEN6403"></a>
<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>
- <p>View and toggle client tags:</p><a name="AEN6417" id="AEN6417"></a>
+ <p>View and toggle client tags:</p><a name="AEN6411" id="AEN6411"></a>
<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
- files:</p><a name="AEN6422" id="AEN6422"></a>
+ files:</p><a name="AEN6416" id="AEN6416"></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>
- <p>Show the browser's request headers:</p><a name="AEN6427" id="AEN6427"></a>
+ <p>Show the browser's request headers:</p><a name="AEN6421" id="AEN6421"></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>
- <p>Show which actions apply to a URL and why:</p><a name="AEN6432" id="AEN6432"></a>
+ <p>Show which actions apply to a URL and why:</p><a name="AEN6426" id="AEN6426"></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>
@@ -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,
- but only as a pass-through proxy, with no actions taking place:</p><a name="AEN6440" id="AEN6440"></a>
+ but only as a pass-through proxy, with no actions taking place:</p><a name="AEN6434" id="AEN6434"></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="AEN6444" id="AEN6444"></a>
+ <p>Short cuts. Turn off, then on:</p><a name="AEN6438" id="AEN6438"></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="AEN6447" id="AEN6447"></a>
+ </blockquote><a name="AEN6441" id="AEN6441"></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>
diff --git a/doc/webserver/user-manual/config.html b/doc/webserver/user-manual/config.html
index 6bf71205..e647e135 100644
--- a/doc/webserver/user-manual/config.html
+++ b/doc/webserver/user-manual/config.html
@@ -550,7 +550,7 @@
<pre class=
"PROGRAMLISTING"> debug 1 # Log the destination for each request. See also debug 1024.
debug 2 # show each connection status
- debug 4 # show I/O status
+ debug 4 # show tagging-related messages
debug 8 # show header parsing
debug 16 # log all data written to the network
debug 32 # debug force feature
@@ -694,7 +694,8 @@
whenever the IP address is assigned to the system</p>
<p>IPv6 addresses containing colons have to be quoted by brackets. They can only be used if <span class=
"APPLICATION">Privoxy</span> has been compiled with IPv6 support. If you aren't sure if your version
- supports it, have a look at <tt class="LITERAL">http://config.privoxy.org/show-status</tt>.</p>
+ supports it, have a look at <a href="http://config.privoxy.org/show-status" target=
+ "_top">http://config.privoxy.org/show-status</a>.</p>
<p>Some operating systems will prefer IPv6 to IPv4 addresses even if the system has no IPv6 connectivity
which is usually not expected by the user. Some even rely on DNS to resolve localhost which mean the
"localhost" address used may not actually be local.</p>
@@ -2203,18 +2204,6 @@
</dd>
<dt>Notes:</dt>
<dd>
- <div class="WARNING">
- <table class="WARNING" border="1" width="90%">
- <tr>
- <td align="center"><b>Warning</b></td>
- </tr>
- <tr>
- <td align="left">
- <p>This is an experimental feature. The syntax is likely to change in future versions.</p>
- </td>
- </tr>
- </table>
- </div>
<p>Client-specific tags allow Privoxy admins to create different profiles and let the users chose which
one they want without impacting other users.</p>
<p>One use case is allowing users to circumvent certain blocks without having to allow them to circumvent
@@ -2232,7 +2221,7 @@
<p>Clients can request tags to be set by using the CGI interface <a href=
"http://config.privoxy.org/client-tags" target="_top">http://config.privoxy.org/client-tags</a>. The
specific tag description is only used on the web page and should be phrased in away that the user
- understand the effect of the tag.</p>
+ understands the effect of the tag.</p>
</dd>
<dt>Examples:</dt>
<dd>
@@ -2242,7 +2231,12 @@
<pre class="SCREEN"> # Define a couple of tags, the described effect requires action sections
# that are enabled based on CLIENT-TAG patterns.
client-specific-tag circumvent-blocks Overrule blocks but do not affect other actions
- client-specific-tag disable-content-filters Disable content-filters but do not affect other actions</pre>
+ client-specific-tag disable-content-filters Disable content-filters but do not affect other actions
+ client-specific-tag overrule-redirects Overrule redirect sections
+ client-specific-tag allow-cookies Do not crunch cookies in either direction
+ client-specific-tag change-tor-socks-port Change forward-socks5 settings to use a different Tor socks port (and circuits)
+ client-specific-tag no-https-inspection Disable HTTPS inspection
+ client-specific-tag no-tls-verification Don't verify certificates when http-inspection is enabled</pre>
</td>
</tr>
</table>
@@ -2268,18 +2262,6 @@
</dd>
<dt>Notes:</dt>
<dd>
- <div class="WARNING">
- <table class="WARNING" border="1" width="90%">
- <tr>
- <td align="center"><b>Warning</b></td>
- </tr>
- <tr>
- <td align="left">
- <p>This is an experimental feature. The syntax is likely to change in future versions.</p>
- </td>
- </tr>
- </table>
- </div>
<p>In case of some tags users may not want to enable them permanently, but only for a short amount of
time, for example to circumvent a block that is the result of an overly-broad URL pattern.</p>
<p>The CGI interface <a href="http://config.privoxy.org/client-tags" target=
@@ -2319,18 +2301,6 @@
</dd>
<dt>Notes:</dt>
<dd>
- <div class="WARNING">
- <table class="WARNING" border="1" width="90%">
- <tr>
- <td align="center"><b>Warning</b></td>
- </tr>
- <tr>
- <td align="left">
- <p>This is an experimental feature. The syntax is likely to change in future versions.</p>
- </td>
- </tr>
- </table>
- </div>
<p>If clients reach Privoxy through another proxy, for example a load balancer, Privoxy can't tell the
client's IP address from the connection. If multiple clients use the same proxy, they will share the same
client tag settings which is usually not desired.</p>
@@ -2408,8 +2378,10 @@
<div class="SECT2">
<h2 class="SECT2"><a name="HTTPS-INSPECTION-DIRECTIVES" id="HTTPS-INSPECTION-DIRECTIVES">7.7. HTTPS Inspection
(Experimental)</a></h2>
- <p>HTTPS inspection allows to filter encrypted requests. This is only supported when <span class=
- "APPLICATION">Privoxy</span> has been built with FEATURE_HTTPS_INSPECTION.</p>
+ <p>HTTPS inspection allows to filter encrypted requests and responses. This is only supported when <span class=
+ "APPLICATION">Privoxy</span> has been built with FEATURE_HTTPS_INSPECTION. If you aren't sure if your version
+ supports it, have a look at <a href="http://config.privoxy.org/show-status" target=
+ "_top">http://config.privoxy.org/show-status</a>.</p>
<div class="SECT3">
<h4 class="SECT3"><a name="CA-DIRECTORY" id="CA-DIRECTORY">7.7.1. ca-directory</a></h4>
<div class="VARIABLELIST">
@@ -2506,6 +2478,7 @@
<dd>
<p>This directive specifies the name of the CA key file in ".pem" format. The <a href="#CA-CERT-FILE"
target="_top">ca-cert-file section</a> contains a command to generate it.</p>
+ <p>Access to the key should be limited to Privoxy.</p>
</dd>
<dt>Example:</dt>
<dd>
@@ -2748,8 +2721,9 @@ AES128-SHA
<dd>
<p>This directive specifies the trusted CAs file that is used when validating certificates for
intercepted TLS/SSL requests.</p>
- <p>An example file can be downloaded from <a href="https://curl.haxx.se/ca/cacert.pem" target=
- "_top">https://curl.haxx.se/ca/cacert.pem</a>.</p>
+ <p>An example file can be downloaded from <a href="https://curl.se/ca/cacert.pem" target=
+ "_top">https://curl.se/ca/cacert.pem</a>. If you want to create the file yourself, please see: <a href=
+ "https://curl.se/docs/caextract.html" target="_top">https://curl.se/docs/caextract.html</a>.</p>
</dd>
<dt>Example:</dt>
<dd>
diff --git a/doc/webserver/user-manual/contact.html b/doc/webserver/user-manual/contact.html
index 6751dcd4..d600df69 100644
--- a/doc/webserver/user-manual/contact.html
+++ b/doc/webserver/user-manual/contact.html
@@ -64,7 +64,7 @@
</li>
<li>
<p>Whether your version of <span class="APPLICATION">Privoxy</span> is one supplied by the <span class=
- "APPLICATION">Privoxy</span> developers via SourceForge, or if you got your copy somewhere else.</p>
+ "APPLICATION">Privoxy</span> developers, or if you got your copy somewhere else.</p>
</li>
<li>
<p>Whether you are using <span class="APPLICATION">Privoxy</span> together with another proxy such as
@@ -87,7 +87,7 @@
# See also debug 1024.<br>
debug 2 # show each connection status<br>
- debug 4 # show I/O status<br>
+ debug 4 # show tagging-related messages<br>
debug 8 # show header parsing<br>
debug 128 # debug redirects<br>
debug 256 # debug GIF de-animation<br>
@@ -121,8 +121,6 @@
information. If you use a SF id, you should automatically get a mail when someone responds to your request.
Please don't bother to add an email address when using the tracker. If you prefer to communicate through email,
just use one of the mailing lists directly.</p>
- <p>If you are new to reporting problems, you might be interested in <a href=
- "https://www.chiark.greenend.org.uk/~sgtatham/bugs.html" target="_top">How to Report Bugs Effectively</a>.</p>
<p>The <a href="https://www.privoxy.org/user-manual/appendix.html#ACTIONSANAT" target="_top">appendix of the
Privoxy User Manual</a> also has helpful information on understanding <tt class="LITERAL">actions</tt>, and
<tt class="LITERAL">action</tt> debugging.</p>
diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html
index 572f61d2..29b114ab 100644
--- a/doc/webserver/user-manual/copyright.html
+++ b/doc/webserver/user-manual/copyright.html
@@ -29,8 +29,7 @@
<h1 class="SECT1"><a name="COPYRIGHT">12. Privoxy Copyright, License and History</a></h1>
<p>Copyright © 2001-2020 by Privoxy Developers <code class="EMAIL"><<a href=
"mailto:privoxy-devel@lists.privoxy.org">privoxy-devel@lists.privoxy.org</a>></code></p>
- <p>Some source code is based on code Copyright © 1997 by Anonymous Coders and Junkbusters, Inc. and licensed
- under the <i class="CITETITLE">GNU General Public License</i>.</p>
+ <p>Some source code is based on code Copyright © 1997 by Anonymous Coders and Junkbusters, Inc.</p>
<p><span class="APPLICATION">Privoxy</span> is free software; you can redistribute and/or modify its source code
under the terms of the <i class="CITETITLE">GNU General Public License</i> as published by the Free Software
Foundation, either version 2 of the license, or (at your option) any later version.</p>