From 511f1c3a70e268cff434f762579f506100627c58 Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Fri, 19 Dec 2014 12:32:15 +0000
Subject: [PATCH] Regenerate documentation
---
AUTHORS | 1 +
README | 41 ++++++--------
doc/webserver/faq/configuration.html | 14 ++---
doc/webserver/faq/contact.html | 60 ++++++++-------------
doc/webserver/faq/copyright.html | 4 +-
doc/webserver/faq/general.html | 12 +++--
doc/webserver/faq/index.html | 50 ++++++++---------
doc/webserver/faq/misc.html | 23 ++++----
doc/webserver/faq/trouble.html | 4 +-
doc/webserver/user-manual/actions-file.html | 16 +++---
doc/webserver/user-manual/appendix.html | 28 +++++-----
doc/webserver/user-manual/config.html | 6 +++
doc/webserver/user-manual/contact.html | 60 ++++++++-------------
doc/webserver/user-manual/copyright.html | 1 +
doc/webserver/user-manual/filter-file.html | 2 +-
doc/webserver/user-manual/index.html | 26 ++++-----
16 files changed, 160 insertions(+), 188 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 66e8d6f6..85708308 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -110,6 +110,7 @@ include (in alphabetical order):
Adam Piggott
Petr PÃsar
Dan Price
+ Kai Raven
Roberto Ragusa
Félix Rauch
Chris John Riley
diff --git a/README b/README
index c9835abb..559801f7 100644
--- a/README
+++ b/README
@@ -230,11 +230,8 @@ understanding actions, and action debugging.
6.2. Get Support
-For casual users, our support forum at SourceForge is probably best suited:
-http://sourceforge.net/tracker/?group_id=11118&atid=211118
-
-All users are of course welcome to discuss their issues on the users mailing
-list, where the developers also hang around.
+All users are welcome to discuss their issues on the users mailing list, where
+the developers also hang around.
Please don't send private support requests to individual Privoxy developers,
either use the mailing lists or the support trackers.
@@ -278,21 +275,14 @@ blocked, sites that don't work properly, and other configuration related
problem of default.action file, to http://sourceforge.net/tracker/?group_id=
11118&atid=460288, the Actions File Tracker.
-New, improved default.action files may occasionally be made available based on
-your feedback. These will be announced on the ijbswa-announce list and
-available from our the files section of our project page.
-
-------------------------------------------------------------------------------
6.3.2. Reporting Bugs
-Please report bugs that aren't security issues through our bug tracker: http://
-sourceforge.net/tracker/?group_id=11118&atid=111118.
-
-Before doing so, please make sure that the bug has not already been submitted
-and observe the additional hints at the top of the submit form. If already
-submitted, please feel free to add any info to the original report that might
-help to solve the issue.
+Before reporting bugs, please make sure that the bug has not already been
+submitted and observe the additional hints at the top of the submit form. If
+already submitted, please feel free to add any info to the original report that
+might help to solve the issue.
-------------------------------------------------------------------------------
@@ -308,15 +298,7 @@ to the developer list to request a status update.
-------------------------------------------------------------------------------
-6.5. Request New Features
-
-You are welcome to submit ideas on new features or other proposals for
-improvement through our feature request tracker at http://sourceforge.net/
-tracker/?atid=361118&group_id=11118.
-
--------------------------------------------------------------------------------
-
-6.6. Mailing Lists
+6.5. Mailing Lists
If you prefer to communicate through email, instead of using a web interface,
feel free to use one of the mailing lists. To discuss issues that haven't been
@@ -326,3 +308,12 @@ welcome on the developers list. You can find an overview of all Privoxy-related
mailing lists, including list archives, at: http://sourceforge.net/mail/?
group_id=11118.
+-------------------------------------------------------------------------------
+
+6.6. SourceForge support trackers
+
+The SourceForge support trackers may be used as well, but have various
+technical problems that are unlikely to be fixed anytime soon. If you don't get
+a timely response, please try the mailing list as well. While it's hosted at
+SourceForge as well, it usually works as expected.
+
diff --git a/doc/webserver/faq/configuration.html b/doc/webserver/faq/configuration.html
index 06c793d9..8bc56e66 100644
--- a/doc/webserver/faq/configuration.html
+++ b/doc/webserver/faq/configuration.html
@@ -42,7 +42,7 @@
Configuration</a></h1>
<div class="SECT2">
- <h3 class="SECT2"><a name="AEN359" id="AEN359">3.1. What exactly is an
+ <h3 class="SECT2"><a name="AEN360" id="AEN360">3.1. What exactly is an
<span class="QUOTE">"actions"</span> file?</a></h3>
<p><span class="APPLICATION">Privoxy</span> utilizes the concept of
@@ -88,7 +88,7 @@
</div>
<div class="SECT2">
- <h3 class="SECT2"><a name="AEN382" id="AEN382">3.3. How are actions
+ <h3 class="SECT2"><a name="AEN383" id="AEN383">3.3. How are actions
files configured? What is the easiest way to do this?</a></h3>
<p>Actions files are just text files in a special syntax and can be
@@ -106,7 +106,7 @@
</div>
<div class="SECT2">
- <h3 class="SECT2"><a name="AEN391" id="AEN391">3.4. There are several
+ <h3 class="SECT2"><a name="AEN392" id="AEN392">3.4. There are several
different <span class="QUOTE">"actions"</span> files. What are the
differences?</a></h3>
@@ -299,7 +299,7 @@
</div>
<div class="SECT2">
- <h3 class="SECT2"><a name="AEN481" id="AEN481">3.11. What is the
+ <h3 class="SECT2"><a name="AEN482" id="AEN482">3.11. What is the
<tt class="FILENAME">default.filter</tt> file? What is a <span class=
"QUOTE">"filter"</span>?</a></h3>
@@ -410,7 +410,7 @@
</div>
<div class="SECT2">
- <h3 class="SECT2"><a name="AEN532" id="AEN532">3.13. Instead of ads,
+ <h3 class="SECT2"><a name="AEN533" id="AEN533">3.13. Instead of ads,
now I get a checkerboard pattern. I don't want to see
anything.</a></h3>
@@ -437,7 +437,7 @@
</div>
<div class="SECT2">
- <h3 class="SECT2"><a name="AEN549" id="AEN549">3.14. Why would anybody
+ <h3 class="SECT2"><a name="AEN550" id="AEN550">3.14. Why would anybody
want to see a checkerboard pattern?</a></h3>
<p>Remember that <a href="general.html#WHATSANAD">telling which image
@@ -453,7 +453,7 @@
</div>
<div class="SECT2">
- <h3 class="SECT2"><a name="AEN555" id="AEN555">3.15. I see some images
+ <h3 class="SECT2"><a name="AEN556" id="AEN556">3.15. I see some images
being replaced with text instead of the checkerboard image. Why and how
do I get rid of this?</a></h3>
diff --git a/doc/webserver/faq/contact.html b/doc/webserver/faq/contact.html
index 730fdcab..f4d8e5c4 100644
--- a/doc/webserver/faq/contact.html
+++ b/doc/webserver/faq/contact.html
@@ -207,16 +207,9 @@
<h2 class="SECT2"><a name="CONTACT-SUPPORT" id="CONTACT-SUPPORT">6.2.
Get Support</a></h2>
- <p>For casual users, our <a href=
- "http://sourceforge.net/tracker/?group_id=11118&atid=211118"
- target="_top">support forum at SourceForge</a> is probably best suited:
- <a href=
- "http://sourceforge.net/tracker/?group_id=11118&atid=211118"
- target="_top">http://sourceforge.net/tracker/?group_id=11118&atid=211118</a></p>
-
- <p>All users are of course welcome to discuss their issues on the
- <a href="http://lists.sourceforge.net/lists/listinfo/ijbswa-users"
- target="_top">users mailing list</a>, where the developers also hang
+ <p>All users are welcome to discuss their issues on the <a href=
+ "http://lists.sourceforge.net/lists/listinfo/ijbswa-users" target=
+ "_top">users mailing list</a>, where the developers also hang
around.</p>
<p>Please don't send private support requests to individual Privoxy
@@ -277,30 +270,16 @@
target=
"_top">http://sourceforge.net/tracker/?group_id=11118&atid=460288</a>,
the Actions File Tracker.</p>
-
- <p>New, improved <tt class="FILENAME">default.action</tt> files may
- occasionally be made available based on your feedback. These will be
- announced on the <a href=
- "http://lists.sourceforge.net/lists/listinfo/ijbswa-announce" target=
- "_top">ijbswa-announce</a> list and available from our the <a href=
- "http://sourceforge.net/project/showfiles.php?group_id=11118" target=
- "_top">files section</a> of our <a href=
- "http://sf.net/projects/ijbswa/" target="_top">project page</a>.</p>
</div>
<div class="SECT3">
<h3 class="SECT3"><a name="CONTACT-BUGS" id="CONTACT-BUGS">6.3.2.
Reporting Bugs</a></h3>
- <p>Please report bugs that aren't security issues through our bug
- tracker: <a href=
- "http://sourceforge.net/tracker/?group_id=11118&atid=111118"
- target=
- "_top">http://sourceforge.net/tracker/?group_id=11118&atid=111118</a>.</p>
-
- <p>Before doing so, please make sure that the bug has <span class=
- "emphasis"><i class="EMPHASIS">not already been submitted</i></span>
- and observe the additional hints at the top of the <a href=
+ <p>Before reporting bugs, please make sure that the bug has
+ <span class="emphasis"><i class="EMPHASIS">not already been
+ submitted</i></span> and observe the additional hints at the top of
+ the <a href=
"http://sourceforge.net/tracker/?func=add&group_id=11118&atid=111118"
target="_top">submit form</a>. If already submitted, please feel free
to add any info to the original report that might help to solve the
@@ -324,17 +303,7 @@
</div>
<div class="SECT2">
- <h2 class="SECT2"><a name="CONTACT-FEATURE" id="CONTACT-FEATURE">6.5.
- Request New Features</a></h2>
-
- <p>You are welcome to submit ideas on new features or other proposals
- for improvement through our feature request tracker at <a href=
- "http://sourceforge.net/tracker/?atid=361118&group_id=11118"
- target="_top">http://sourceforge.net/tracker/?atid=361118&group_id=11118</a>.</p>
- </div>
-
- <div class="SECT2">
- <h2 class="SECT2"><a name="MAILING-LISTS" id="MAILING-LISTS">6.6.
+ <h2 class="SECT2"><a name="MAILING-LISTS" id="MAILING-LISTS">6.5.
Mailing Lists</a></h2>
<p>If you prefer to communicate through email, instead of using a web
@@ -347,6 +316,19 @@
archives, at: <a href="http://sourceforge.net/mail/?group_id=11118"
target="_top">http://sourceforge.net/mail/?group_id=11118</a>.</p>
</div>
+
+ <div class="SECT2">
+ <h2 class="SECT2"><a name="SF-TRACKERS" id="SF-TRACKERS">6.6.
+ SourceForge support trackers</a></h2>
+
+ <p>The <a href=
+ "http://sourceforge.net/tracker/?group_id=11118&atid=211118"
+ target="_top">SourceForge support trackers</a> may be used as well, but
+ have various technical problems that are unlikely to be fixed anytime
+ soon. If you don't get a timely response, please try the mailing list
+ as well. While it's hosted at SourceForge as well, it usually works as
+ expected.</p>
+ </div>
</div>
<div class="NAVFOOTER">
diff --git a/doc/webserver/faq/copyright.html b/doc/webserver/faq/copyright.html
index 19e484a4..95976530 100644
--- a/doc/webserver/faq/copyright.html
+++ b/doc/webserver/faq/copyright.html
@@ -55,7 +55,7 @@
"APPLICATION">Privoxy</span>.</p>
<div class="SECT2">
- <h2 class="SECT2"><a name="AEN1476" id="AEN1476">7.1. License</a></h2>
+ <h2 class="SECT2"><a name="AEN1469" id="AEN1469">7.1. License</a></h2>
<p><span class="APPLICATION">Privoxy</span> is free software; you can
redistribute it and/or modify it under the terms of the <i class=
@@ -71,7 +71,7 @@
</div>
<div class="SECT2">
- <h2 class="SECT2"><a name="AEN1485" id="AEN1485">7.2. History</a></h2>
+ <h2 class="SECT2"><a name="AEN1478" id="AEN1478">7.2. History</a></h2>
<p>A long time ago, there was the <span class="APPLICATION">Internet
Junkbuster</span>, by Anonymous Coders and Junkbusters Corporation.
diff --git a/doc/webserver/faq/general.html b/doc/webserver/faq/general.html
index ad2f7ad7..a72f5019 100644
--- a/doc/webserver/faq/general.html
+++ b/doc/webserver/faq/general.html
@@ -539,16 +539,20 @@
please use <a href="http://www.spi-inc.org/donations" target=
"_top">SPI's donation page</a> to see what the options are.</p>
- <p>You can also donate to Privoxy using a bank account managed by
- <a href="https://www.zwiebelfreunde.de/" target="_top">Zwiebelfreunde
- e.V.</a>:</p>
+ <p>You can also donate to Privoxy using a bank account or a "Paypal"
+ address:</p>
<p class="LITERALLAYOUT">
- Name on Account: Zwiebelfreunde e.V.<br>
+ Name on account: <a href=
+ "https://www.zwiebelfreunde.de/" target="_top">Zwiebelfreunde
+ e.V.</a><br>
IBAN: DE95430609671126825604<br>
BIC: GENODEM1GLS<br>
Bank: GLS Bank</p>
+ <p class="LITERALLAYOUT">
+ "Paypal" address: privoxy@zwiebelfreunde.de</p>
+
<p>Donations made through Zwiebelfreunde e.V. are tax-deductible in
Germany and other countries that recognize German charitable clubs.
Feel free to use the Subject field to provide a name to be credited
diff --git a/doc/webserver/faq/index.html b/doc/webserver/faq/index.html
index 8e40b151..fbb53350 100644
--- a/doc/webserver/faq/index.html
+++ b/doc/webserver/faq/index.html
@@ -22,7 +22,7 @@
2001-2014 by <a href="http://www.privoxy.org/" target="_top">Privoxy
Developers</a></sub><br></p>
- <p class="PUBDATE">$Id: faq.sgml,v 2.104 2014/10/21 12:05:12 fabiankeil
+ <p class="PUBDATE">$Id: faq.sgml,v 2.105 2014/11/28 14:26:35 fabiankeil
Exp $<br></p>
<div>
@@ -182,17 +182,17 @@
<dd>
<dl>
- <dt>3.1. <a href="configuration.html#AEN359">What exactly is an
+ <dt>3.1. <a href="configuration.html#AEN360">What exactly is an
<span class="QUOTE">"actions"</span> file?</a></dt>
<dt>3.2. <a href="configuration.html#ACTIONSS">The <span class=
"QUOTE">"actions"</span> concept confuses me. Please list some of
these <span class="QUOTE">"actions"</span>.</a></dt>
- <dt>3.3. <a href="configuration.html#AEN382">How are actions
+ <dt>3.3. <a href="configuration.html#AEN383">How are actions
files configured? What is the easiest way to do this?</a></dt>
- <dt>3.4. <a href="configuration.html#AEN391">There are several
+ <dt>3.4. <a href="configuration.html#AEN392">There are several
different <span class="QUOTE">"actions"</span> files. What are
the differences?</a></dt>
@@ -217,21 +217,21 @@
change the configuration with a browser? Does that not raise
security issues?</a></dt>
- <dt>3.11. <a href="configuration.html#AEN481">What is the
+ <dt>3.11. <a href="configuration.html#AEN482">What is the
<tt class="FILENAME">default.filter</tt> file? What is a
<span class="QUOTE">"filter"</span>?</a></dt>
<dt>3.12. <a href="configuration.html#LANCONFIG">How can I set up
Privoxy to act as a proxy for my LAN?</a></dt>
- <dt>3.13. <a href="configuration.html#AEN532">Instead of ads, now
+ <dt>3.13. <a href="configuration.html#AEN533">Instead of ads, now
I get a checkerboard pattern. I don't want to see
anything.</a></dt>
- <dt>3.14. <a href="configuration.html#AEN549">Why would anybody
+ <dt>3.14. <a href="configuration.html#AEN550">Why would anybody
want to see a checkerboard pattern?</a></dt>
- <dt>3.15. <a href="configuration.html#AEN555">I see some images
+ <dt>3.15. <a href="configuration.html#AEN556">I see some images
being replaced with text instead of the checkerboard image. Why
and how do I get rid of this?</a></dt>
@@ -292,7 +292,7 @@
<dd>
<dl>
- <dt>4.1. <a href="misc.html#AEN730">How much does Privoxy slow my
+ <dt>4.1. <a href="misc.html#AEN731">How much does Privoxy slow my
browsing down? This has to add extra time to browsing.</a></dt>
<dt>4.2. <a href="misc.html#LOADINGTIMES">I notice considerable
@@ -313,32 +313,32 @@
<dt>4.7. <a href="misc.html#IP">How can I hide my IP
address?</a></dt>
- <dt>4.8. <a href="misc.html#AEN795">Can Privoxy guarantee I am
+ <dt>4.8. <a href="misc.html#AEN796">Can Privoxy guarantee I am
anonymous?</a></dt>
- <dt>4.9. <a href="misc.html#AEN813">A test site says I am not
+ <dt>4.9. <a href="misc.html#AEN814">A test site says I am not
using a Proxy.</a></dt>
<dt>4.10. <a href="misc.html#TOR">How do I use Privoxy together
with Tor?</a></dt>
- <dt>4.11. <a href="misc.html#AEN869">Might some things break
+ <dt>4.11. <a href="misc.html#AEN872">Might some things break
because header information or content is being altered?</a></dt>
- <dt>4.12. <a href="misc.html#AEN883">Can Privoxy act as a
+ <dt>4.12. <a href="misc.html#AEN886">Can Privoxy act as a
<span class="QUOTE">"caching"</span> proxy to speed up web
browsing?</a></dt>
- <dt>4.13. <a href="misc.html#AEN893">What about as a firewall?
+ <dt>4.13. <a href="misc.html#AEN896">What about as a firewall?
Can Privoxy protect me?</a></dt>
- <dt>4.14. <a href="misc.html#AEN898">I have large empty spaces /
+ <dt>4.14. <a href="misc.html#AEN901">I have large empty spaces /
a checkerboard pattern now where ads used to be. Why?</a></dt>
- <dt>4.15. <a href="misc.html#AEN906">How can Privoxy filter
+ <dt>4.15. <a href="misc.html#AEN909">How can Privoxy filter
Secure (HTTPS) URLs?</a></dt>
- <dt>4.16. <a href="misc.html#AEN920">Privoxy runs as a
+ <dt>4.16. <a href="misc.html#AEN923">Privoxy runs as a
<span class="QUOTE">"server"</span>. How secure is it? Do I need
to take any special precautions?</a></dt>
@@ -387,14 +387,14 @@
<dd>
<dl>
- <dt>5.1. <a href="trouble.html#AEN1086">I cannot connect to any
+ <dt>5.1. <a href="trouble.html#AEN1089">I cannot connect to any
websites. Or, I am getting <span class="QUOTE">"connection
refused"</span> message with every web page. Why?</a></dt>
<dt>5.2. <a href="trouble.html#ERROR503">Why am I getting a 503
Error (WSAECONNREFUSED) on every page?</a></dt>
- <dt>5.3. <a href="trouble.html#AEN1109">I just added a new rule,
+ <dt>5.3. <a href="trouble.html#AEN1112">I just added a new rule,
but the steenkin ad is still getting through. How?</a></dt>
<dt>5.4. <a href="trouble.html#BADSITE">One of my favorite sites
@@ -507,11 +507,11 @@
<dt>6.4. <a href="contact.html#SECURITY-CONTACT">Reporting
security problems</a></dt>
- <dt>6.5. <a href="contact.html#CONTACT-FEATURE">Request New
- Features</a></dt>
-
- <dt>6.6. <a href="contact.html#MAILING-LISTS">Mailing
+ <dt>6.5. <a href="contact.html#MAILING-LISTS">Mailing
Lists</a></dt>
+
+ <dt>6.6. <a href="contact.html#SF-TRACKERS">SourceForge support
+ trackers</a></dt>
</dl>
</dd>
@@ -520,9 +520,9 @@
<dd>
<dl>
- <dt>7.1. <a href="copyright.html#AEN1476">License</a></dt>
+ <dt>7.1. <a href="copyright.html#AEN1469">License</a></dt>
- <dt>7.2. <a href="copyright.html#AEN1485">History</a></dt>
+ <dt>7.2. <a href="copyright.html#AEN1478">History</a></dt>
</dl>
</dd>
</dl>
diff --git a/doc/webserver/faq/misc.html b/doc/webserver/faq/misc.html
index c8722870..a3084807 100644
--- a/doc/webserver/faq/misc.html
+++ b/doc/webserver/faq/misc.html
@@ -41,7 +41,7 @@
<h1 class="SECT1"><a name="MISC" id="MISC">4. Miscellaneous</a></h1>
<div class="SECT2">
- <h3 class="SECT2"><a name="AEN730" id="AEN730">4.1. How much does
+ <h3 class="SECT2"><a name="AEN731" id="AEN731">4.1. How much does
Privoxy slow my browsing down? This has to add extra time to
browsing.</a></h3>
@@ -201,7 +201,7 @@
</div>
<div class="SECT2">
- <h3 class="SECT2"><a name="AEN795" id="AEN795">4.8. Can Privoxy
+ <h3 class="SECT2"><a name="AEN796" id="AEN796">4.8. Can Privoxy
guarantee I am anonymous?</a></h3>
<p>No. Your chances of remaining anonymous are improved, but unless you
@@ -246,7 +246,7 @@
</div>
<div class="SECT2">
- <h3 class="SECT2"><a name="AEN813" id="AEN813">4.9. A test site says I
+ <h3 class="SECT2"><a name="AEN814" id="AEN814">4.9. A test site says I
am not using a Proxy.</a></h3>
<p>Good! Actually, they are probably testing for some other kinds of
@@ -313,6 +313,11 @@
</tr>
</table>
+ <p>Note that if you got Tor through one of the bundles, you may have to
+ change the port from 9050 to 9150 (or even another one). For details,
+ please check the documentation on the <a href="https://torproject.org/"
+ target="_top">Tor website</a>.</p>
+
<p>This is enough to reach the Internet, but additionally you might
want to uncomment the following forward rules, to make sure your local
network is still reachable through Privoxy:</p>
@@ -369,7 +374,7 @@
</div>
<div class="SECT2">
- <h3 class="SECT2"><a name="AEN869" id="AEN869">4.11. Might some things
+ <h3 class="SECT2"><a name="AEN872" id="AEN872">4.11. Might some things
break because header information or content is being altered?</a></h3>
<p>Definitely. It is common for sites to use browser type, browser
@@ -409,7 +414,7 @@
</div>
<div class="SECT2">
- <h3 class="SECT2"><a name="AEN883" id="AEN883">4.12. Can Privoxy act as
+ <h3 class="SECT2"><a name="AEN886" id="AEN886">4.12. Can Privoxy act as
a <span class="QUOTE">"caching"</span> proxy to speed up web
browsing?</a></h3>
@@ -425,7 +430,7 @@
</div>
<div class="SECT2">
- <h3 class="SECT2"><a name="AEN893" id="AEN893">4.13. What about as a
+ <h3 class="SECT2"><a name="AEN896" id="AEN896">4.13. What about as a
firewall? Can Privoxy protect me?</a></h3>
<p>Not in the way you mean, or in the way some firewall vendors claim
@@ -436,7 +441,7 @@
</div>
<div class="SECT2">
- <h3 class="SECT2"><a name="AEN898" id="AEN898">4.14. I have large empty
+ <h3 class="SECT2"><a name="AEN901" id="AEN901">4.14. I have large empty
spaces / a checkerboard pattern now where ads used to be. Why?</a></h3>
<p>It is technically possible to eliminate banners and ads in a way
@@ -464,7 +469,7 @@
</div>
<div class="SECT2">
- <h3 class="SECT2"><a name="AEN906" id="AEN906">4.15. How can Privoxy
+ <h3 class="SECT2"><a name="AEN909" id="AEN909">4.15. How can Privoxy
filter Secure (HTTPS) URLs?</a></h3>
<p>Since secure HTTP connections are encrypted SSL sessions between
@@ -498,7 +503,7 @@
</div>
<div class="SECT2">
- <h3 class="SECT2"><a name="AEN920" id="AEN920">4.16. Privoxy runs as a
+ <h3 class="SECT2"><a name="AEN923" id="AEN923">4.16. Privoxy runs as a
<span class="QUOTE">"server"</span>. How secure is it? Do I need to
take any special precautions?</a></h3>
diff --git a/doc/webserver/faq/trouble.html b/doc/webserver/faq/trouble.html
index 94bf0363..2ad328da 100644
--- a/doc/webserver/faq/trouble.html
+++ b/doc/webserver/faq/trouble.html
@@ -44,7 +44,7 @@
Troubleshooting</a></h1>
<div class="SECT2">
- <h3 class="SECT2"><a name="AEN1086" id="AEN1086">5.1. I cannot connect
+ <h3 class="SECT2"><a name="AEN1089" id="AEN1089">5.1. I cannot connect
to any websites. Or, I am getting <span class="QUOTE">"connection
refused"</span> message with every web page. Why?</a></h3>
@@ -94,7 +94,7 @@
</div>
<div class="SECT2">
- <h3 class="SECT2"><a name="AEN1109" id="AEN1109">5.3. I just added a
+ <h3 class="SECT2"><a name="AEN1112" id="AEN1112">5.3. I just added a
new rule, but the steenkin ad is still getting through. How?</a></h3>
<p>If the ad had been displayed before you added its URL, it will
diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html
index bd5e3aa5..456db0d3 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="AEN2661" id="AEN2661"></a>
+ <a name="AEN2663" id="AEN2663"></a>
<p><b>Table 1. Default Configurations</b></p>
@@ -314,7 +314,7 @@
actions</a>.</p>
<div class="SECT2">
- <h2 class="SECT2"><a name="AEN2760" id="AEN2760">8.1. Finding the Right
+ <h2 class="SECT2"><a name="AEN2762" id="AEN2762">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="AEN2767" id="AEN2767">8.2. How to
+ <h2 class="SECT2"><a name="AEN2769" id="AEN2769">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="AEN2961" id="AEN2961">8.4.2. The Path
+ <h3 class="SECT3"><a name="AEN2963" id="AEN2963">8.4.2. The Path
Pattern</a></h3>
<p><span class="APPLICATION">Privoxy</span> uses <span class=
@@ -4489,7 +4489,7 @@ TAG:^image/
</div>
<div class="SECT3">
- <h3 class="SECT3"><a name="AEN4693" id="AEN4693">8.5.36.
+ <h3 class="SECT3"><a name="AEN4695" id="AEN4695">8.5.36.
Summary</a></h3>
<p>Note that many of these actions have the potential to cause a page
@@ -4648,7 +4648,7 @@ TAG:^image/
together:</p>
<div class="SECT3">
- <h3 class="SECT3"><a name="AEN4757" id="AEN4757">8.7.1.
+ <h3 class="SECT3"><a name="AEN4759" id="AEN4759">8.7.1.
match-all.action</a></h3>
<p>Remember <span class="emphasis"><i class="EMPHASIS">all actions
@@ -4697,7 +4697,7 @@ TAG:^image/
</div>
<div class="SECT3">
- <h3 class="SECT3"><a name="AEN4779" id="AEN4779">8.7.2.
+ <h3 class="SECT3"><a name="AEN4781" id="AEN4781">8.7.2.
default.action</a></h3>
<p>If you aren't a developer, there's no need for you to edit the
@@ -5040,7 +5040,7 @@ wiki.
</div>
<div class="SECT3">
- <h3 class="SECT3"><a name="AEN4892" id="AEN4892">8.7.3.
+ <h3 class="SECT3"><a name="AEN4894" id="AEN4894">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 35855a11..0254731e 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="AEN5809" id="AEN5809">14.2. Privoxy's
+ <h2 class="SECT2"><a name="AEN5801" id="AEN5801">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="AEN5823" id="AEN5823"></a>
+ <p>Privoxy main page:</p><a name="AEN5815" id="AEN5815"></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="AEN5831" id=
- "AEN5831"></a>
+ viewing and editing of actions files:</p><a name="AEN5823" id=
+ "AEN5823"></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="AEN5836" id=
- "AEN5836"></a>
+ <p>Show the source code version numbers:</p><a name="AEN5828" id=
+ "AEN5828"></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="AEN5841" id=
- "AEN5841"></a>
+ <p>Show the browser's request headers:</p><a name="AEN5833" id=
+ "AEN5833"></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="AEN5846"
- id="AEN5846"></a>
+ <p>Show which actions apply to a URL and why:</p><a name="AEN5838"
+ id="AEN5838"></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=
- "AEN5854" id="AEN5854"></a>
+ "AEN5846" id="AEN5846"></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="AEN5858" id=
- "AEN5858"></a>
+ <p>Short cuts. Turn off, then on:</p><a name="AEN5850" id=
+ "AEN5850"></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="AEN5861" id="AEN5861"></a>
+ </blockquote><a name="AEN5853" id="AEN5853"></a>
<blockquote class="BLOCKQUOTE">
<p><a href="http://config.privoxy.org/toggle?set=enable" target=
diff --git a/doc/webserver/user-manual/config.html b/doc/webserver/user-manual/config.html
index c72dcf88..fe691611 100644
--- a/doc/webserver/user-manual/config.html
+++ b/doc/webserver/user-manual/config.html
@@ -2072,6 +2072,12 @@
</tr>
</table>
+ <p>Note that if you got Tor through one of the bundles, you may
+ have to change the port from 9050 to 9150 (or even another
+ one). For details, please check the documentation on the
+ <a href="https://torproject.org/" target="_top">Tor
+ website</a>.</p>
+
<p>The public <span class="APPLICATION">Tor</span> network
can't be used to reach your local network, if you need to
access local servers you therefore might want to make some
diff --git a/doc/webserver/user-manual/contact.html b/doc/webserver/user-manual/contact.html
index 87dbab66..4855a603 100644
--- a/doc/webserver/user-manual/contact.html
+++ b/doc/webserver/user-manual/contact.html
@@ -207,16 +207,9 @@
<h2 class="SECT2"><a name="CONTACT-SUPPORT" id="CONTACT-SUPPORT">11.2.
Get Support</a></h2>
- <p>For casual users, our <a href=
- "http://sourceforge.net/tracker/?group_id=11118&atid=211118"
- target="_top">support forum at SourceForge</a> is probably best suited:
- <a href=
- "http://sourceforge.net/tracker/?group_id=11118&atid=211118"
- target="_top">http://sourceforge.net/tracker/?group_id=11118&atid=211118</a></p>
-
- <p>All users are of course welcome to discuss their issues on the
- <a href="http://lists.sourceforge.net/lists/listinfo/ijbswa-users"
- target="_top">users mailing list</a>, where the developers also hang
+ <p>All users are welcome to discuss their issues on the <a href=
+ "http://lists.sourceforge.net/lists/listinfo/ijbswa-users" target=
+ "_top">users mailing list</a>, where the developers also hang
around.</p>
<p>Please don't send private support requests to individual Privoxy
@@ -277,30 +270,16 @@
target=
"_top">http://sourceforge.net/tracker/?group_id=11118&atid=460288</a>,
the Actions File Tracker.</p>
-
- <p>New, improved <tt class="FILENAME">default.action</tt> files may
- occasionally be made available based on your feedback. These will be
- announced on the <a href=
- "http://lists.sourceforge.net/lists/listinfo/ijbswa-announce" target=
- "_top">ijbswa-announce</a> list and available from our the <a href=
- "http://sourceforge.net/project/showfiles.php?group_id=11118" target=
- "_top">files section</a> of our <a href=
- "http://sf.net/projects/ijbswa/" target="_top">project page</a>.</p>
</div>
<div class="SECT3">
<h3 class="SECT3"><a name="CONTACT-BUGS" id="CONTACT-BUGS">11.3.2.
Reporting Bugs</a></h3>
- <p>Please report bugs that aren't security issues through our bug
- tracker: <a href=
- "http://sourceforge.net/tracker/?group_id=11118&atid=111118"
- target=
- "_top">http://sourceforge.net/tracker/?group_id=11118&atid=111118</a>.</p>
-
- <p>Before doing so, please make sure that the bug has <span class=
- "emphasis"><i class="EMPHASIS">not already been submitted</i></span>
- and observe the additional hints at the top of the <a href=
+ <p>Before reporting bugs, please make sure that the bug has
+ <span class="emphasis"><i class="EMPHASIS">not already been
+ submitted</i></span> and observe the additional hints at the top of
+ the <a href=
"http://sourceforge.net/tracker/?func=add&group_id=11118&atid=111118"
target="_top">submit form</a>. If already submitted, please feel free
to add any info to the original report that might help to solve the
@@ -324,17 +303,7 @@
</div>
<div class="SECT2">
- <h2 class="SECT2"><a name="CONTACT-FEATURE" id="CONTACT-FEATURE">11.5.
- Request New Features</a></h2>
-
- <p>You are welcome to submit ideas on new features or other proposals
- for improvement through our feature request tracker at <a href=
- "http://sourceforge.net/tracker/?atid=361118&group_id=11118"
- target="_top">http://sourceforge.net/tracker/?atid=361118&group_id=11118</a>.</p>
- </div>
-
- <div class="SECT2">
- <h2 class="SECT2"><a name="MAILING-LISTS" id="MAILING-LISTS">11.6.
+ <h2 class="SECT2"><a name="MAILING-LISTS" id="MAILING-LISTS">11.5.
Mailing Lists</a></h2>
<p>If you prefer to communicate through email, instead of using a web
@@ -347,6 +316,19 @@
archives, at: <a href="http://sourceforge.net/mail/?group_id=11118"
target="_top">http://sourceforge.net/mail/?group_id=11118</a>.</p>
</div>
+
+ <div class="SECT2">
+ <h2 class="SECT2"><a name="SF-TRACKERS" id="SF-TRACKERS">11.6.
+ SourceForge support trackers</a></h2>
+
+ <p>The <a href=
+ "http://sourceforge.net/tracker/?group_id=11118&atid=211118"
+ target="_top">SourceForge support trackers</a> may be used as well, but
+ have various technical problems that are unlikely to be fixed anytime
+ soon. If you don't get a timely response, please try the mailing list
+ as well. While it's hosted at SourceForge as well, it usually works as
+ expected.</p>
+ </div>
</div>
<div class="NAVFOOTER">
diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html
index 221b8196..3d5d761b 100644
--- a/doc/webserver/user-manual/copyright.html
+++ b/doc/webserver/user-manual/copyright.html
@@ -562,6 +562,7 @@ Public License instead of this License.
Adam Piggott<br>
Petr Písar<br>
Dan Price<br>
+ Kai Raven<br>
Roberto Ragusa<br>
Félix Rauch<br>
Chris John Riley<br>
diff --git a/doc/webserver/user-manual/filter-file.html b/doc/webserver/user-manual/filter-file.html
index 263b9050..0f13527e 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="AEN5060" id="AEN5060">9.1. Filter File
+ <h2 class="SECT2"><a name="AEN5062" id="AEN5062">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 c7078d12..267e089f 100644
--- a/doc/webserver/user-manual/index.html
+++ b/doc/webserver/user-manual/index.html
@@ -348,10 +348,10 @@
<dd>
<dl>
- <dt>8.1. <a href="actions-file.html#AEN2760">Finding the Right
+ <dt>8.1. <a href="actions-file.html#AEN2762">Finding the Right
Mix</a></dt>
- <dt>8.2. <a href="actions-file.html#AEN2767">How to Edit</a></dt>
+ <dt>8.2. <a href="actions-file.html#AEN2769">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 +364,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#AEN2961">The Path
+ <dt>8.4.2. <a href="actions-file.html#AEN2963">The Path
Pattern</a></dt>
<dt>8.4.3. <a href="actions-file.html#TAG-PATTERN">The Tag
@@ -485,7 +485,7 @@
"actions-file.html#SET-IMAGE-BLOCKER">set-image-blocker</a></dt>
<dt>8.5.36. <a href=
- "actions-file.html#AEN4693">Summary</a></dt>
+ "actions-file.html#AEN4695">Summary</a></dt>
</dl>
</dd>
@@ -497,13 +497,13 @@
<dd>
<dl>
<dt>8.7.1. <a href=
- "actions-file.html#AEN4757">match-all.action</a></dt>
+ "actions-file.html#AEN4759">match-all.action</a></dt>
<dt>8.7.2. <a href=
- "actions-file.html#AEN4779">default.action</a></dt>
+ "actions-file.html#AEN4781">default.action</a></dt>
<dt>8.7.3. <a href=
- "actions-file.html#AEN4892">user.action</a></dt>
+ "actions-file.html#AEN4894">user.action</a></dt>
</dl>
</dd>
</dl>
@@ -513,7 +513,7 @@
<dd>
<dl>
- <dt>9.1. <a href="filter-file.html#AEN5060">Filter File
+ <dt>9.1. <a href="filter-file.html#AEN5062">Filter File
Tutorial</a></dt>
<dt>9.2. <a href="filter-file.html#PREDEFINED-FILTERS">The
@@ -554,11 +554,11 @@
<dt>11.4. <a href="contact.html#SECURITY-CONTACT">Reporting
security problems</a></dt>
- <dt>11.5. <a href="contact.html#CONTACT-FEATURE">Request New
- Features</a></dt>
-
- <dt>11.6. <a href="contact.html#MAILING-LISTS">Mailing
+ <dt>11.5. <a href="contact.html#MAILING-LISTS">Mailing
Lists</a></dt>
+
+ <dt>11.6. <a href="contact.html#SF-TRACKERS">SourceForge support
+ trackers</a></dt>
</dl>
</dd>
@@ -584,7 +584,7 @@
<dt>14.1. <a href="appendix.html#REGEX">Regular
Expressions</a></dt>
- <dt>14.2. <a href="appendix.html#AEN5809">Privoxy's Internal
+ <dt>14.2. <a href="appendix.html#AEN5801">Privoxy's Internal
Pages</a></dt>
<dt>14.3. <a href="appendix.html#CHAIN">Chain of Events</a></dt>
--
2.49.0