From: Fabian Keil Date: Fri, 19 Dec 2014 12:32:15 +0000 (+0000) Subject: Regenerate documentation X-Git-Tag: v_3_0_23~21 X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=511f1c3a70e268cff434f762579f506100627c58 Regenerate documentation --- 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
-

3.1. What exactly is an +

3.1. What exactly is an "actions" file?

Privoxy utilizes the concept of @@ -88,7 +88,7 @@

-

3.3. How are actions +

3.3. How are actions files configured? What is the easiest way to do this?

Actions files are just text files in a special syntax and can be @@ -106,7 +106,7 @@

-

3.4. There are several +

3.4. There are several different "actions" files. What are the differences?

@@ -299,7 +299,7 @@

-

3.11. What is the +

3.11. What is the default.filter file? What is a "filter"?

@@ -410,7 +410,7 @@

-

3.13. Instead of ads, +

3.13. Instead of ads, now I get a checkerboard pattern. I don't want to see anything.

@@ -437,7 +437,7 @@

-

3.14. Why would anybody +

3.14. Why would anybody want to see a checkerboard pattern?

Remember that telling which image @@ -453,7 +453,7 @@

-

3.15. I see some images +

3.15. I see some images being replaced with text instead of the checkerboard image. Why and how do I get rid of this?

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 @@

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 +

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 @@ -277,30 +270,16 @@ target= "_top">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 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 @@ -324,17 +303,7 @@

-

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. +

6.5. Mailing Lists

If you prefer to communicate through email, instead of using a web @@ -347,6 +316,19 @@ 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.

+