From: Fabian Keil Date: Mon, 26 May 2014 10:49:19 +0000 (+0000) Subject: Rebuild HTML docs for 3.0.22 UNSTABLE X-Git-Tag: v_3_0_22~140 X-Git-Url: http://www.privoxy.org/gitweb/team/%22/11member_t.jpg?a=commitdiff_plain;h=aaff4cd0e076bb9d094f69ac83a4ff5429235991;p=privoxy.git Rebuild HTML docs for 3.0.22 UNSTABLE --- diff --git a/doc/webserver/developer-manual/documentation.html b/doc/webserver/developer-manual/documentation.html index 79076c0d..fec3fbec 100644 --- a/doc/webserver/developer-manual/documentation.html +++ b/doc/webserver/developer-manual/documentation.html @@ -384,7 +384,7 @@ p-version: the Privoxy version string, e.g. - "3.0.21". + "3.0.22". diff --git a/doc/webserver/developer-manual/index.html b/doc/webserver/developer-manual/index.html index 604226cb..10ead450 100644 --- a/doc/webserver/developer-manual/index.html +++ b/doc/webserver/developer-manual/index.html @@ -39,7 +39,7 @@ entirely correct. As always, patches are welcome.

Please note that this document is constantly evolving. This copy - represents the state at the release of version 3.0.21. You can find + represents the state at the release of version 3.0.22. You can find the latest version of the this manual at http://www.privoxy.org/developer-manual/. Please have a diff --git a/doc/webserver/developer-manual/newrelease.html b/doc/webserver/developer-manual/newrelease.html index fb103267..cf3feb7c 100644 --- a/doc/webserver/developer-manual/newrelease.html +++ b/doc/webserver/developer-manual/newrelease.html @@ -738,7 +738,7 @@ 

-  debchange -v 3.0.21-stable-1 "New upstream version"
+  debchange -v 3.0.22-UNRELEASED-1 "New upstream version"
@@ -757,7 +757,7 @@

This will create ../privoxy_3.0.21-stable-1_i386.deb which can be + "FILENAME">../privoxy_3.0.22-UNRELEASED-1_i386.deb which can be uploaded. To upload the package to Sourceforge, simply issue

@@ -1090,7 +1090,7 @@ column, and click Add Release. You will then need to create a new release for your package, using the format of $VERSION ($CODE_STATUS), e.g. 3.0.21 (beta).

+ "emphasis">3.0.22 (beta).

Now just follow the prompts. Be sure to add any appropriate Release notes. You should see your freshly uploaded packages in

"Complicated" is in the eye of the - beholder. Those that are familiar with some of the underlying concepts, - such as regular expression syntax, take to it like a fish takes to - water. Also, software that tries hard to be "user - friendly", often lacks sophistication and flexibility. There is - always that trade-off there between power vs. easy-of-use. Furthermore, - anyone is welcome to contribute ideas and implementations to enhance - Privoxy.

+ beholder.

+ +

Privoxy is currently mainly written by and for people who are + already familiar with the underlying concepts like regular expressions, + HTTP and HTML, or are willing to become familiar with them to be able + to get the most out of a powerful and flexible tool such as + Privoxy.

+ +

While everybody is expected to be able to get a Privoxy default + installation up and running, fine-tuning requires a certain amount of + background information and Privoxy's documentation mainly concentrates + on the Privoxy-specific parts while only providing references to the + rest.

+ +

If you or anyone you know has the skills, time and energy to reduce + the barrier of entry, please get + involved.

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

3.11. What is the +

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

@@ -400,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.

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

-

3.14. Why would anybody +

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

Remember that telling which image @@ -443,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 a5615e5e..57dca029 100644 --- a/doc/webserver/faq/contact.html +++ b/doc/webserver/faq/contact.html @@ -260,7 +260,8 @@

  • "Bugs" in the programming code that makes up Privoxy, such as that - might cause a crash.

    + might cause a crash. Documentation issues, for example spelling + errors and unclear descriptions, are bugs, too.

    • diff --git a/doc/webserver/faq/copyright.html b/doc/webserver/faq/copyright.html index a26dad7d..3e445e96 100644 --- a/doc/webserver/faq/copyright.html +++ b/doc/webserver/faq/copyright.html @@ -55,7 +55,7 @@ "APPLICATION">Privoxy.

    -

    7.1. License

    +

    7.1. License

    Privoxy is free software; you can redistribute it and/or modify it under the terms of the

    -

    7.2. History

    +

    7.2. History

    A long time ago, there was the Internet Junkbuster, by Anonymous Coders and Junkbusters Corporation. diff --git a/doc/webserver/faq/general.html b/doc/webserver/faq/general.html index d7c448d0..b9119fba 100644 --- a/doc/webserver/faq/general.html +++ b/doc/webserver/faq/general.html @@ -401,7 +401,7 @@ and Privoxy's privacy enhancing features at the same time. While your browser probably lacks some features Privoxy offers, it should - also be able to do some things more reliable, for example restricting + also be able to do some things more reliably, for example restricting and suppressing JavaScript.

    diff --git a/doc/webserver/faq/index.html b/doc/webserver/faq/index.html index dbb28c13..296bcf55 100644 --- a/doc/webserver/faq/index.html +++ b/doc/webserver/faq/index.html @@ -22,7 +22,7 @@ 2001-2011 by Privoxy Developers

    -

    $Id: faq.sgml,v 2.92 2013/03/01 17:44:24 fabiankeil +

    $Id: faq.sgml,v 2.100 2014/05/05 09:59:30 fabiankeil Exp $

    @@ -66,7 +66,7 @@

    Please note that this document is a work in progress. This copy - represents the state at the release of version 3.0.21. You can find + represents the state at the release of version 3.0.22. You can find the latest version of the document at http://www.privoxy.org/faq/. Please see the -

    3.11. What is the +
    3.11. What is the default.filter file? What is a "filter"?
    3.12. How can I set up Privoxy to act as a proxy for my LAN?
    -
    3.13. Instead of ads, now +
    3.13. Instead of ads, now I get a checkerboard pattern. I don't want to see anything.
    -
    3.14. Why would anybody +
    3.14. Why would anybody want to see a checkerboard pattern?
    -
    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?
    @@ -292,7 +292,7 @@
    -
    4.1. How much does Privoxy slow my +
    4.1. How much does Privoxy slow my browsing down? This has to add extra time to browsing.
    4.2. I notice considerable @@ -313,32 +313,32 @@
    4.7. How can I hide my IP address?
    -
    4.8. Can Privoxy guarantee I am +
    4.8. Can Privoxy guarantee I am anonymous?
    -
    4.9. A test site says I am not +
    4.9. A test site says I am not using a Proxy.
    4.10. How do I use Privoxy together with Tor?
    -
    4.11. Might some things break +
    4.11. Might some things break because header information or content is being altered?
    -
    4.12. Can Privoxy act as a +
    4.12. Can Privoxy act as a "caching" proxy to speed up web browsing?
    -
    4.13. What about as a firewall? +
    4.13. What about as a firewall? Can Privoxy protect me?
    -
    4.14. I have large empty spaces / +
    4.14. I have large empty spaces / a checkerboard pattern now where ads used to be. Why?
    -
    4.15. How can Privoxy filter +
    4.15. How can Privoxy filter Secure (HTTPS) URLs?
    -
    4.16. Privoxy runs as a +
    4.16. Privoxy runs as a "server". How secure is it? Do I need to take any special precautions?
    @@ -387,14 +387,14 @@
    -
    5.1. I cannot connect to any +
    5.1. I cannot connect to any websites. Or, I am getting "connection refused" message with every web page. Why?
    5.2. Why am I getting a 503 Error (WSAECONNREFUSED) on every page?
    -
    5.3. I just added a new rule, +
    5.3. I just added a new rule, but the steenkin ad is still getting through. How?
    5.4. One of my favorite sites @@ -420,57 +420,61 @@ delays in page loading. I'm using localhost as my browser's proxy setting.
    -
    5.10. I get a completely +
    5.10. I just + upgraded to Mac OS X 10.9 (Mavericks) and now Privoxy has stopped working.
    + +
    5.11. I get a completely blank page at one site. "View Source" shows only: <html><body></body></html>. Without Privoxy the page loads fine.
    -
    5.11. My logs show many +
    5.12. My logs show many "Unable to get my own hostname" lines. Why?
    -
    5.12. When I try to launch +
    5.13. When I try to launch Privoxy, I get an error message "port 8118 is already in use" (or similar wording). Why?
    -
    5.13. Pages with UTF-8 +
    5.14. Pages with UTF-8 fonts are garbled.
    -
    5.14. Why are binary +
    5.15. Why are binary files (such as images) corrupted when Privoxy is used?
    -
    5.15. What is the +
    5.16. What is the "demoronizer" and why is it there?
    -
    5.16. Why do I keep seeing +
    5.17. Why do I keep seeing "PrivoxyWindowOpen()" in raw source code?
    -
    5.17. I am getting too many +
    5.18. I am getting too many DNS errors like "404 No Such Domain". Why can't Privoxy do this better?
    -
    5.18. At one site Privoxy just +
    5.19. At one site Privoxy just hangs, and starts taking all CPU. Why is this?
    -
    5.19. I just installed +
    5.20. I just installed Privoxy, and all my browsing has slowed to a crawl. What gives?
    -
    5.20. Why do my filters +
    5.21. Why do my filters work on some sites but not on others?
    -
    5.21. On some HTTPS sites +
    5.22. On some HTTPS sites my browser warns me about unauthenticated content, the URL bar doesn't get highlighted and the lock symbol appears to be broken. What's going on?
    -
    5.22. I get selinux error +
    5.23. I get selinux error messages. How can I fix this?
    -
    5.23. I compiled +
    5.24. I compiled Privoxy with Gentoo's portage and it appears to be very slow. Why?
    @@ -513,9 +517,9 @@
    -
    7.1. License
    +
    7.1. License
    -
    7.2. History
    +
    7.2. History
    diff --git a/doc/webserver/faq/misc.html b/doc/webserver/faq/misc.html index ebf30b27..7ff717fe 100644 --- a/doc/webserver/faq/misc.html +++ b/doc/webserver/faq/misc.html @@ -41,7 +41,7 @@

    4. Miscellaneous

    -

    4.1. How much does +

    4.1. How much does Privoxy slow my browsing down? This has to add extra time to browsing.

    @@ -201,7 +201,7 @@

    -

    4.8. Can Privoxy +

    4.8. Can Privoxy guarantee I am anonymous?

    No. Your chances of remaining anonymous are improved, but unless you @@ -246,7 +246,7 @@

    -

    4.9. A test site says I +

    4.9. A test site says I am not using a Proxy.

    Good! Actually, they are probably testing for some other kinds of @@ -293,7 +293,7 @@ your local network. Using socks4a would work too, but with socks5 you get more precise error messages.

    -

    Since Privoxy 3.0.5, its Privoxy's main configuration file is already prepared for Tor, if you are using a default Tor configuration @@ -306,7 +306,7 @@

    @@ -369,7 +369,7 @@
    -

    4.11. Might some things +

    4.11. Might some things break because header information or content is being altered?

    Definitely. It is common for sites to use browser type, browser @@ -409,7 +409,7 @@

    -

    4.12. Can Privoxy act as +

    4.12. Can Privoxy act as a "caching" proxy to speed up web browsing?

    @@ -425,7 +425,7 @@

    -

    4.13. What about as a +

    4.13. What about as a firewall? Can Privoxy protect me?

    Not in the way you mean, or in the way some firewall vendors claim @@ -436,7 +436,7 @@

    -

    4.14. I have large empty +

    4.14. I have large empty spaces / a checkerboard pattern now where ads used to be. Why?

    It is technically possible to eliminate banners and ads in a way @@ -464,7 +464,7 @@

    -

    4.15. How can Privoxy +

    4.15. How can Privoxy filter Secure (HTTPS) URLs?

    Since secure HTTP connections are encrypted SSL sessions between @@ -498,7 +498,7 @@

    -

    4.16. Privoxy runs as a +

    4.16. Privoxy runs as a "server". How secure is it? Do I need to take any special precautions?

    diff --git a/doc/webserver/faq/trouble.html b/doc/webserver/faq/trouble.html index 2d8ae473..213d4a96 100644 --- a/doc/webserver/faq/trouble.html +++ b/doc/webserver/faq/trouble.html @@ -44,7 +44,7 @@ Troubleshooting

    -

    5.1. I cannot connect +

    5.1. I cannot connect to any websites. Or, I am getting "connection refused" message with every web page. Why?

    @@ -94,7 +94,7 @@

    -

    5.3. I just added a +

    5.3. I just added a new rule, but the steenkin ad is still getting through. How?

    If the ad had been displayed before you added its URL, it will @@ -361,7 +361,28 @@ Request: 66.70.21.80/scripts/click.php?hid=a71b9f6504b0c5681fa5&si=Ua

    -

    5.10. I get a +

    5.10. I just upgraded to Mac OS X 10.9 + (Mavericks) and now Privoxy has + stopped working.

    + +

    The upgrade process to Mac OS X Mavericks (10.9) from an earlier + version of OS X deletes all user accounts that are either not part of + OS X itself or are not interactive user accounts (ones you log in + with). Since, for the sake of security, Privoxy runs as a non-privileged user that is + created by its installer (_privoxy), it can no longer start up once + that account gets deleted. The solution is to perform a complete + uninstall using the supplied uninstall.command script (either back up your + configuration files or select to not have the uninstaller remove them + when it prompts you) and then reinstall Privoxy using the installer package and merge in + your configuration.

    +

    + +
    +

    5.11. I get a completely blank page at one site. "View Source" shows only: <html><body></body></html>. @@ -398,7 +419,7 @@ Request: 66.70.21.80/scripts/click.php?hid=a71b9f6504b0c5681fa5&si=Ua

    -

    5.11. My logs +

    5.12. My logs show many "Unable to get my own hostname" lines. Why?

    @@ -427,7 +448,7 @@ Request: 66.70.21.80/scripts/click.php?hid=a71b9f6504b0c5681fa5&si=Ua

    -

    5.12. When I try to launch +

    5.13. When I try to launch Privoxy, I get an error message "port 8118 is already in use" (or similar wording). Why?

    @@ -443,36 +464,45 @@ Request: 66.70.21.80/scripts/click.php?hid=a71b9f6504b0c5681fa5&si=Ua

    -

    5.13. Pages +

    5.14. Pages with UTF-8 fonts are garbled.

    -

    This is caused by the "demoronizer" - filter. You should either upgrade Privoxy, or at least upgrade to the most recent - default.action file available from This may be the result of an overly aggressive filter. The filters + that are enabled in the default configuration aren't expected to cause + problems like this. If you enabled the "demoronizer" filter, please try temporarily disabling + it.

    + +

    If that doesn't help, temporarily disable all filters to see if + another filter could be the culprit. If the problem disappears, enable + the filters one by one, until the problem reappears and the offending + filter is found.

    + +

    Once the problem-causing filter is known, it can be fixed or + disabled.

    + +

    Upgrading Privoxy, or going to the + most recent default.action file available + from SourceForge. Or you can simply disable the demoronizer - filter.

    + "_top">SourceForge might be worth a try, too.

    -

    5.14. Why +

    5.15. Why are binary files (such as images) corrupted when Privoxy is used?

    -

    This may also be caused by the "demoronizer" filter, in conjunction with a web server - that is misreporting the content type. Binary files are exempted from - Privoxy's filtering (unless the web - server by mistake says the file is something else). Either upgrade - Privoxy, or go to the most recent - default.action file available from SourceForge.

    +

    This may also be caused by an (overly aggressive filter in conjunction + with a web server that is misreporting the content type. By default + binary files are exempted from Privoxy's filtering (unless the web server by + mistake says the file is something else).

    -

    5.15. What +

    5.16. What is the "demoronizer" and why is it there?

    @@ -500,7 +530,7 @@ Request: 66.70.21.80/scripts/click.php?hid=a71b9f6504b0c5681fa5&si=Ua

    -

    5.16. Why do I +

    5.17. Why do I keep seeing "PrivoxyWindowOpen()" in raw source code?

    @@ -521,7 +551,7 @@ Request: 66.70.21.80/scripts/click.php?hid=a71b9f6504b0c5681fa5&si=Ua

    -

    5.17. I am getting +

    5.18. I am getting too many DNS errors like "404 No Such Domain". Why can't Privoxy do this better?

    @@ -549,7 +579,7 @@ Request: 66.70.21.80/scripts/click.php?hid=a71b9f6504b0c5681fa5&si=Ua

    -

    5.18. At one site +

    5.19. At one site Privoxy just hangs, and starts taking all CPU. Why is this?

    This is probably a manifestation of the "100% @@ -568,7 +598,7 @@ Request: 66.70.21.80/scripts/click.php?hid=a71b9f6504b0c5681fa5&si=Ua

    -

    5.19. I just +

    5.20. I just installed Privoxy, and all my browsing has slowed to a crawl. What gives?

    @@ -582,7 +612,7 @@ Request: 66.70.21.80/scripts/click.php?hid=a71b9f6504b0c5681fa5&si=Ua

    -

    5.20. Why do +

    5.21. Why do my filters work on some sites but not on others?

    It's probably due to compression. It is a common practice for web @@ -599,7 +629,7 @@ Request: 66.70.21.80/scripts/click.php?hid=a71b9f6504b0c5681fa5&si=Ua

    -

    5.21. On +

    5.22. On some HTTPS sites my browser warns me about unauthenticated content, the URL bar doesn't get highlighted and the lock symbol appears to be broken. What's going on?

    @@ -645,7 +675,7 @@ Request: 66.70.21.80/scripts/click.php?hid=a71b9f6504b0c5681fa5&si=Ua

    -

    5.22. I get selinux +

    5.23. I get selinux error messages. How can I fix this?

    Please report the problem to the creator of your selinux @@ -670,7 +700,7 @@ Request: 66.70.21.80/scripts/click.php?hid=a71b9f6504b0c5681fa5&si=Ua

    -

    5.23. I +

    5.24. I compiled Privoxy with Gentoo's portage and it appears to be very slow. Why?

    diff --git a/doc/webserver/index.html b/doc/webserver/index.html index b32c7e66..5cc2f4ca 100644 --- a/doc/webserver/index.html +++ b/doc/webserver/index.html @@ -52,7 +52,7 @@

    The most recent release is 3.0.21 (stable).

    + "_top">3.0.22 (UNRELEASED).

    diff --git a/doc/webserver/privoxy-index.html b/doc/webserver/privoxy-index.html index eef47e60..4ea7856e 100644 --- a/doc/webserver/privoxy-index.html +++ b/doc/webserver/privoxy-index.html @@ -19,7 +19,7 @@

    Privoxy - The Privacy Enhancing Proxy

    -

    Project Index Page v3.0.21

    +

    Project Index Page v3.0.22

    diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html index 3a318b3e..221e7e2a 100644 --- a/doc/webserver/user-manual/actions-file.html +++ b/doc/webserver/user-manual/actions-file.html @@ -6,7 +6,7 @@ Actions Files - + @@ -21,7 +21,7 @@ 
    -#        forward-socks5             /     127.0.0.1:9050 .
+#        forward-socks5t             /     127.0.0.1:9050 .
    - + @@ -117,7 +117,7 @@ in default.action are:

    - +

    Table 1. Default Configurations

    @@ -314,7 +314,7 @@ actions.

    -

    8.1. Finding the Right +

    8.1. Finding the Right Mix

    Note that some actions, like @@ -339,7 +339,7 @@

    -

    8.2. How to +

    8.2. How to Edit

    The easiest way to edit the actions files is with a browser by using @@ -430,8 +430,8 @@ and potentially match against many similar patterns.

    Generally, an URL pattern has the form <domain><port>/<path>, where the - <domain>, the <host><port>/<path>, where the + <host>, the <port> and the <path> are optional. (This is why the special / pattern matches all URLs). Note that the @@ -440,15 +440,15 @@ "EMPHASIS">not be included in the pattern. This is assumed already!

    -

    The pattern matching syntax is different for the domain and path - parts of the URL. The domain part uses a simple globbing type matching +

    The pattern matching syntax is different for the host and path parts + of the URL. The host part uses a simple globbing type matching technique, while the path part uses more flexible "Regular Expressions" (POSIX 1003.2).

    The port part of a pattern is a decimal port number preceded by a - colon (:). If the domain part contains a + colon (:). If the host part contains a numerical IPv6 address, it has to be put into angle brackets (<, >).

    @@ -457,7 +457,7 @@
    www.example.com/
    -

    is a domain-only pattern and will match any request to +

    is a host-only pattern and will match any request to www.example.com, regardless of which document on that server is requested. So ALL pages in this domain would be covered by the scope of this action. Note that a simple @@ -468,7 +468,7 @@

    www.example.com
    -

    means exactly the same. For domain-only patterns, the trailing +

    means exactly the same. For host-only patterns, the trailing / may be omitted.

    @@ -510,6 +510,14 @@

    Matches any URL pointing to TCP port 8000.

    +
    10.0.0.1/
    + +
    +

    Matches any URL with the host address 10.0.0.1. (Note that the real URL uses plain + brackets, not angle brackets.)

    +
    +
    <2001:db8::1>/
    @@ -529,12 +537,14 @@

    -

    8.4.1. The Domain - Pattern

    +

    8.4.1. The + Host Pattern

    -

    The matching of the domain part offers some flexible options: if - the domain starts or ends with a dot, it becomes unanchored at that - end. For example:

    +

    The matching of the host part offers some flexible options: if the + host pattern starts or ends with a dot, it becomes unanchored at that + end. The host pattern is often referred to as domain pattern as it is + usually used to match domain names and not IP addresses. For + example:

    @@ -634,7 +644,7 @@
    -

    8.4.2. The Path +

    8.4.2. The Path Pattern

    Privoxy uses

    + +
    +

    8.4.4. The Negative Tag Patterns

    + +

    To match requests that do not have a certain tag, specify a + negative tag pattern by prefixing the tag pattern line with either + "NO-REQUEST-TAG:" or "NO-RESPONSE-TAG:" instead of "TAG:".

    + +

    Negative tag patterns created with "NO-REQUEST-TAG:" are checked after all client headers + are scanned, the ones created with "NO-RESPONSE-TAG:" are checked after all server + headers are scanned. In both cases all the created tags are + considered.

    +
    @@ -4336,7 +4364,7 @@ example.org/instance-that-is-delivered-as-xml-but-is-not
    -

    8.5.35. +

    8.5.35. Summary

    Note that many of these actions have the potential to cause a page @@ -4495,7 +4523,7 @@ example.org/instance-that-is-delivered-as-xml-but-is-not together:

    -

    8.7.1. +

    8.7.1. match-all.action

    Remember all actions @@ -4544,7 +4572,7 @@ example.org/instance-that-is-delivered-as-xml-but-is-not

    -

    8.7.2. +

    8.7.2. default.action

    If you aren't a developer, there's no need for you to edit the @@ -4887,7 +4915,7 @@ wiki.

    -

    8.7.3. +

    8.7.3. user.action

    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 9b1cc1bf..54fb4765 100644 --- a/doc/webserver/user-manual/appendix.html +++ b/doc/webserver/user-manual/appendix.html @@ -6,7 +6,7 @@ Appendix - + @@ -19,7 +19,7 @@

    Privoxy 3.0.21 User ManualPrivoxy 3.0.22 User Manual
    - + @@ -293,7 +293,7 @@
    -

    14.2. Privoxy's +

    14.2. Privoxy's Internal Pages

    Since Privoxy proxies each @@ -313,7 +313,7 @@

    Privoxy 3.0.21 User ManualPrivoxy 3.0.22 User Manual
    - + @@ -2030,7 +2030,7 @@ @@ -2288,6 +2288,9 @@ HTTP connections into Privoxy.

    +

    Note that intercepting encrypted connections (HTTPS) isn't + supported.

    +

    Make sure that Privoxy's own requests aren't redirected as well. Additionally take care that Privoxy can't diff --git a/doc/webserver/user-manual/configuration.html b/doc/webserver/user-manual/configuration.html index 1e2e346c..22454888 100644 --- a/doc/webserver/user-manual/configuration.html +++ b/doc/webserver/user-manual/configuration.html @@ -6,7 +6,7 @@ Privoxy Configuration - + @@ -20,7 +20,7 @@

    Privoxy 3.0.21 User ManualPrivoxy 3.0.22 User Manual 
    -  forward-socks5   /               127.0.0.1:9050 .
+  forward-socks5t   /               127.0.0.1:9050 .
    - + @@ -46,7 +46,7 @@ controlled easily with a web browser.

    -

    6.1. Controlling +

    6.1. Controlling Privoxy with Your Web Browser

    Privoxy's user interface can be @@ -63,8 +63,8 @@ -

        Privoxy Menu

    +

        Privoxy Menu
    @@ -104,7 +104,7 @@
    @@ -147,7 +147,9 @@

    For Unix, *BSD and Linux, all configuration files are located in /etc/privoxy/ by default. For MS Windows, OS/2, and AmigaOS these are all in the same directory as the - Privoxy executable.

    + Privoxy executable. The name and + number of configuration files has changed from previous versions, and + is subject to change as development progresses.

    The installed defaults provide a reasonable starting point, though some settings may be aggressive by some standards. For the time being, @@ -236,6 +238,12 @@ "QUOTE">"wake up" requests must obviously be sent to the old listening address.

    + +

    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 "default" setting, may change, so please check all your + configuration files on important issues.

    diff --git a/doc/webserver/user-manual/contact.html b/doc/webserver/user-manual/contact.html index 87b96447..603801f9 100644 --- a/doc/webserver/user-manual/contact.html +++ b/doc/webserver/user-manual/contact.html @@ -7,7 +7,7 @@ Requests - +     - + @@ -260,7 +260,8 @@

  • "Bugs" in the programming code that makes up Privoxy, such as that - might cause a crash.

    + might cause a crash. Documentation issues, for example spelling + errors and unclear descriptions, are bugs, too.

    • diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html index 1c18ffb3..6864deed 100644 --- a/doc/webserver/user-manual/copyright.html +++ b/doc/webserver/user-manual/copyright.html @@ -6,7 +6,7 @@ Privoxy Copyright, License and History - + @@ -22,7 +22,7 @@
    Privoxy 3.0.21 User ManualPrivoxy 3.0.22 User Manual
    -         ▪  Documentation
    Privoxy 3.0.21 User ManualPrivoxy 3.0.22 User Manual
    - + @@ -493,7 +493,8 @@ Public License instead of this License. provided patches, made suggestions or contributed in some way. These include (in alphabetical order):

    -

     Ken Arromdee
    +

     Anatoly Arzhnikov
    +  Ken Arromdee
     Natxo Asenjo
     Devin Bayer
     Havard Berland
    @@ -568,8 +569,10 @@ Public License instead of this License.  Spinor S.
     Peter Thoenen
     Martin Thomas
    +  Reuben Thomas
     Bobby G. Vinyard
     Jochen Voss
    +  David Wagner
     Glenn Washburn
     Song Weijia
     Jörg Weinmann
    diff --git a/doc/webserver/user-manual/filter-file.html b/doc/webserver/user-manual/filter-file.html index f01f6893..49284e01 100644 --- a/doc/webserver/user-manual/filter-file.html +++ b/doc/webserver/user-manual/filter-file.html @@ -6,7 +6,7 @@ Filter Files - + @@ -20,7 +20,7 @@

    Privoxy 3.0.21 User ManualPrivoxy 3.0.22 User Manual
    - + @@ -134,9 +134,28 @@ FILTER: foo Replace all "foo" with "bar" "_top">Perl's s/// operator. If you are familiar with Perl, you will find this to be quite intuitive, and may want to look at the PCRS documentation for the subtle differences to Perl - behaviour. Most notably, the non-standard option letter + +

    Most notably, the non-standard option letter U is supported, which turns the default to ungreedy - matching.

    + matching (add ? to quantifiers to turn them + greedy again).

    + +

    The non-standard option letter D (dynamic) + allows to use the variables $host, $origin (the IP address the request + came from), $path and $url. They will be replaced with the value they + refer to before the filter is executed.

    + +

    Note that '$' is a bad choice for a delimiter in a dynamic filter as + you might end up with unintended variables if you use a variable name + directly after the delimiter. Variables will be resolved without escaping + anything, therefore you also have to be careful not to chose delimiters + that appear in the replacement text. For example '<' should be save, + while '?' will sooner or later cause conflicts with $url.

    + +

    The non-standard option letter T (trivial) + prevents parsing for backreferences in the substitute. Use it if you want + to include text like '$&' in your substitute without quoting.

    If you are new to

    -

    9.1. Filter File +

    9.1. Filter File Tutorial

    Now, let's complete our "foo" content diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html index 09386f82..3746844f 100644 --- a/doc/webserver/user-manual/index.html +++ b/doc/webserver/user-manual/index.html @@ -3,7 +3,7 @@ - Privoxy 3.0.21 User Manual + Privoxy 3.0.22 User Manual @@ -16,14 +16,14 @@ "#840084" alink="#0000FF">

    -

    Privoxy 3.0.21 User +

    Privoxy 3.0.22 User Manual

    Copyright © 2001-2013 by Privoxy Developers

    -

    $Id: user-manual.sgml,v 2.175 2013/03/20 11:30:28 +

    $Id: user-manual.sgml,v 2.182 2014/05/05 10:08:43 fabiankeil Exp $

    @@ -173,7 +173,7 @@
    -
    6.1. Controlling Privoxy +
    6.1. Controlling Privoxy with Your Web Browser
    6.2. Configuration @@ -345,10 +345,10 @@
    -
    8.1. Finding the Right +
    8.1. Finding the Right Mix
    -
    8.2. How to Edit
    +
    8.2. How to Edit
    8.3. How Actions are Applied to Requests
    @@ -358,14 +358,18 @@
    -
    8.4.1. The Domain +
    8.4.1. The Host Pattern
    -
    8.4.2. The Path +
    8.4.2. The Path Pattern
    8.4.3. The Tag Pattern
    + +
    8.4.4. The Negative Tag + Patterns
    @@ -475,7 +479,7 @@ "actions-file.html#SET-IMAGE-BLOCKER">set-image-blocker
    8.5.35. Summary
    + "actions-file.html#AEN4847">Summary
    @@ -487,13 +491,13 @@
    8.7.1. match-all.action
    + "actions-file.html#AEN4911">match-all.action
    8.7.2. default.action
    + "actions-file.html#AEN4933">default.action
    8.7.3. user.action
    + "actions-file.html#AEN5046">user.action
    @@ -503,7 +507,7 @@
    -
    9.1. Filter File +
    9.1. Filter File Tutorial
    9.2. The @@ -567,7 +571,7 @@
    14.1. Regular Expressions
    -
    14.2. Privoxy's Internal +
    14.2. Privoxy's Internal Pages
    diff --git a/doc/webserver/user-manual/installation.html b/doc/webserver/user-manual/installation.html index 021c2e92..f637e431 100644 --- a/doc/webserver/user-manual/installation.html +++ b/doc/webserver/user-manual/installation.html @@ -6,7 +6,7 @@ Installation - + @@ -20,7 +20,7 @@

    Privoxy 3.0.21 User ManualPrivoxy 3.0.22 User Manual
    - + @@ -252,8 +252,8 @@ diff --git a/doc/webserver/user-manual/introduction.html b/doc/webserver/user-manual/introduction.html index dcd6e5b5..66ebe7a6 100644 --- a/doc/webserver/user-manual/introduction.html +++ b/doc/webserver/user-manual/introduction.html @@ -6,8 +6,8 @@ Introduction - - + + @@ -20,7 +20,7 @@
    Privoxy 3.0.21 User ManualPrivoxy 3.0.22 User Manual 
    - tar xzvf privoxy-3.0.21-stable-src.tar.gz
- cd privoxy-3.0.21-stable
+ tar xzvf privoxy-3.0.22-beta-src.tar.gz
+ cd privoxy-3.0.22-beta
    - + @@ -40,8 +40,17 @@

    1. Introduction

    -

    This documentation is included with the current stable version of - Privoxy, 3.0.21.

    +

    This documentation is included with the current UNRELEASED version of + Privoxy, 3.0.22, 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.

    + +

    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 CVS sources). And there may be bugs, though hopefully not many!

    1.1. @@ -50,8 +59,8 @@

    In addition to the core features of ad blocking and cookie management, Privoxy provides many - supplemental features, that give the end-user more control, more - privacy and more freedom:

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

    • @@ -157,7 +166,7 @@

    - diff --git a/doc/webserver/user-manual/quickstart.html b/doc/webserver/user-manual/quickstart.html index 880d3bd7..ef1a179d 100644 --- a/doc/webserver/user-manual/quickstart.html +++ b/doc/webserver/user-manual/quickstart.html @@ -6,7 +6,7 @@ Quickstart to Using Privoxy - + @@ -21,7 +21,7 @@
    Privoxy 3.0.21 User ManualPrivoxy 3.0.22 User Manual
    Privoxy 3.0.21 User + Privoxy 3.0.22 User Manual  
    - + @@ -343,7 +343,7 @@ "GUIBUTTON">Edit":

    - +

    Figure 1. Actions Files in Use

    diff --git a/doc/webserver/user-manual/seealso.html b/doc/webserver/user-manual/seealso.html index 2621350e..3dd23847 100644 --- a/doc/webserver/user-manual/seealso.html +++ b/doc/webserver/user-manual/seealso.html @@ -6,7 +6,7 @@ See Also - + @@ -21,7 +21,7 @@
    Privoxy 3.0.21 User ManualPrivoxy 3.0.22 User Manual
    - + diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html index c0868408..4d2418a0 100644 --- a/doc/webserver/user-manual/startup.html +++ b/doc/webserver/user-manual/startup.html @@ -6,7 +6,7 @@ Starting Privoxy - + @@ -21,7 +21,7 @@
    Privoxy 3.0.21 User ManualPrivoxy 3.0.22 User Manual
    - + @@ -55,7 +55,7 @@ protocols.

    - +

    Figure 2. Proxy Configuration Showing Mozilla/Netscape HTTP and HTTPS (SSL) Settings

    @@ -112,7 +112,7 @@ only HTTP and HTTPS (SSL)!

    - +

    Figure 3. Proxy Configuration Showing Internet Explorer HTTP and HTTPS (Secure) Settings

    @@ -320,12 +320,12 @@

    --pre-chroot-nslookup hostname

    -

    Specifies a hostname to look up before doing a chroot. On some - systems, initializing the resolver library involves reading config - files from /etc and/or loading additional shared libraries from - /lib. On these systems, doing a hostname lookup before the chroot - reduces the number of files that must be copied into the chroot - tree.

    +

    Specifies a hostname (for example www.privoxy.org) to look up + before doing a chroot. On some systems, initializing the resolver + library involves reading config files from /etc and/or loading + additional shared libraries from /lib. On these systems, doing a + hostname lookup before the chroot reduces the number of files that + must be copied into the chroot tree.

    For fastest startup speed, a good value is a hostname that is not in /etc/hosts but that your local name server (listed in diff --git a/doc/webserver/user-manual/templates.html b/doc/webserver/user-manual/templates.html index 40e3065b..265341d9 100644 --- a/doc/webserver/user-manual/templates.html +++ b/doc/webserver/user-manual/templates.html @@ -6,7 +6,7 @@ Privoxy's Template Files - +

    - + diff --git a/doc/webserver/user-manual/whatsnew.html b/doc/webserver/user-manual/whatsnew.html index 4d385c78..af685472 100644 --- a/doc/webserver/user-manual/whatsnew.html +++ b/doc/webserver/user-manual/whatsnew.html @@ -6,7 +6,7 @@ What's New in this Release - + @@ -21,7 +21,7 @@
    Privoxy 3.0.21 User ManualPrivoxy 3.0.22 User Manual
    Privoxy 3.0.21 User ManualPrivoxy 3.0.22 User Manual
    - +
    Privoxy 3.0.21 User ManualPrivoxy 3.0.22 User Manual