Updated, mostly the new config stuff.

diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html
index f9fd338..09b7230 100644 (file)
--- a/doc/webserver/user-manual/actions-file.html
+++ b/doc/webserver/user-manual/actions-file.html
@@ -259,7 +259,7 @@ CLASS="FILENAME"
 >    <DIV
 CLASS="TABLE"
 ><A
 >    <DIV
 CLASS="TABLE"
 ><A

-NAME="AEN2107"
+NAME="AEN2085"

 ></A
 ><P
 ><B
 ></A
 ><P
 ><B


@@ -528,7 +528,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
 ><H2
 CLASS="SECT2"
 ><A

-NAME="AEN2206"
+NAME="AEN2184"

 >8.1. Finding the Right Mix</A
 ></H2
 ><P
 >8.1. Finding the Right Mix</A
 ></H2
 ><P


@@ -563,7 +563,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
 ><H2
 CLASS="SECT2"
 ><A

-NAME="AEN2213"
+NAME="AEN2191"

 >8.2. How to Edit</A
 ></H2
 ><P
 >8.2. How to Edit</A
 ></H2
 ><P


@@ -573,23 +573,29 @@ HREF="http://config.privoxy.org/show-status"
 TARGET="_top"
 >http://config.privoxy.org/show-status</A
 >.
 TARGET="_top"
 >http://config.privoxy.org/show-status</A
 >.

- The editor allows both fine-grained control over every single feature on a
- per-URL basis, and easy choosing from wholesale sets of defaults like
- <SPAN
+ Note: the config file option <A
+HREF="config.html#ENABLE-EDIT-ACTIONS"
+>enale-edit-actions</A
+> must be enabled for
+ this to work. The editor allows both fine-grained control over every single
+ feature on a per-URL basis, and easy choosing from wholesale sets of defaults
+ like <SPAN

 CLASS="QUOTE"
 >"Cautious"</SPAN
 >, <SPAN
 CLASS="QUOTE"
 >"Medium"</SPAN
 CLASS="QUOTE"
 >"Cautious"</SPAN
 >, <SPAN
 CLASS="QUOTE"
 >"Medium"</SPAN

-> or <SPAN
+> or
+ <SPAN

 CLASS="QUOTE"
 >"Advanced"</SPAN
 CLASS="QUOTE"
 >"Advanced"</SPAN

->.
- Warning: the <SPAN
+>. Warning: the <SPAN

 CLASS="QUOTE"
 >"Advanced"</SPAN
 CLASS="QUOTE"
 >"Advanced"</SPAN

-> setting is more aggressive, and 
- will be more likely to cause problems for some sites. Experienced users only!</P
+> setting is more
+ aggressive, and will be more likely to cause problems for some sites.
+ Experienced users only! 
+ </P

 ><P
 > If you prefer plain text editing to GUIs, you can of course also directly edit the
  the actions files with your favorite text editor. Look at
 ><P
 > If you prefer plain text editing to GUIs, you can of course also directly edit the
  the actions files with your favorite text editor. Look at


@@ -887,7 +893,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
 ><H3
 CLASS="SECT3"
 ><A

-NAME="AEN2303"
+NAME="AEN2282"

 >8.4.1. The Domain Pattern</A
 ></H3
 ><P
 >8.4.1. The Domain Pattern</A
 ></H3
 ><P


@@ -1111,7 +1117,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
 ><H3
 CLASS="SECT3"
 ><A

-NAME="AEN2374"
+NAME="AEN2353"

 >8.4.2. The Path Pattern</A
 ></H3
 ><P
 >8.4.2. The Path Pattern</A
 ></H3
 ><P


@@ -6596,7 +6602,7 @@ WIDTH="90%"
 ><PRE
 CLASS="SCREEN"
 ># Tag every request with the declared content type
 ><PRE
 CLASS="SCREEN"
 ># Tag every request with the declared content type

-{+client-header-filter{content-type}}
+{+client-header-tagger{content-type}}

 /
     </PRE
 ></TD
 /
     </PRE
 ></TD


@@ -7150,7 +7156,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
 ><H3
 CLASS="SECT3"
 ><A

-NAME="AEN4178"
+NAME="AEN4157"

 >8.5.39. Summary</A
 ></H3
 ><P
 >8.5.39. Summary</A
 ></H3
 ><P


@@ -7455,7 +7461,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
 ><H3
 CLASS="SECT3"
 ><A

-NAME="AEN4243"
+NAME="AEN4222"

 >8.7.1. default.action</A
 ></H3
 ><P
 >8.7.1. default.action</A
 ></H3
 ><P


@@ -8386,7 +8392,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
 ><H3
 CLASS="SECT3"
 ><A

-NAME="AEN4430"
+NAME="AEN4409"

 >8.7.2. user.action</A
 ></H3
 ><P
 >8.7.2. user.action</A
 ></H3
 ><P

diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html
index 1015501..7a39bc8 100644 (file)
--- a/doc/webserver/user-manual/appendix.html
+++ b/doc/webserver/user-manual/appendix.html
@@ -745,7 +745,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
 ><H2
 CLASS="SECT2"
 ><A

-NAME="AEN5309"
+NAME="AEN5288"

 >14.2. Privoxy's Internal Pages</A
 ></H2
 ><P
 >14.2. Privoxy's Internal Pages</A
 ></H2
 ><P


@@ -791,7 +791,7 @@ CLASS="APPLICATION"
    Privoxy main page: 
   </P
 ><A
    Privoxy main page: 
   </P
 ><A

-NAME="AEN5323"
+NAME="AEN5302"

 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"


@@ -824,7 +824,7 @@ CLASS="APPLICATION"
     editing of actions files:
   </P
 ><A
     editing of actions files:
   </P
 ><A

-NAME="AEN5331"
+NAME="AEN5310"

 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"


@@ -844,7 +844,7 @@ TARGET="_top"
     Show the source code version numbers:
   </P
 ><A
     Show the source code version numbers:
   </P
 ><A

-NAME="AEN5336"
+NAME="AEN5315"

 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"


@@ -864,7 +864,7 @@ TARGET="_top"
    Show the browser's request headers:
   </P
 ><A
    Show the browser's request headers:
   </P
 ><A

-NAME="AEN5341"
+NAME="AEN5320"

 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"


@@ -884,7 +884,7 @@ TARGET="_top"
    Show which actions apply to a URL and why:
   </P
 ><A
    Show which actions apply to a URL and why:
   </P
 ><A

-NAME="AEN5346"
+NAME="AEN5325"

 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"


@@ -908,7 +908,7 @@ CLASS="QUOTE"
    to run, but only as a pass-through proxy, with no actions taking place:
   </P
 ><A
    to run, but only as a pass-through proxy, with no actions taking place:
   </P
 ><A

-NAME="AEN5352"
+NAME="AEN5331"

 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"


@@ -925,7 +925,7 @@ TARGET="_top"
 >   Short cuts. Turn off, then on: 
   </P
 ><A
 >   Short cuts. Turn off, then on: 
   </P
 ><A

-NAME="AEN5356"
+NAME="AEN5335"

 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"


@@ -939,7 +939,7 @@ TARGET="_top"
    </P
 ></BLOCKQUOTE
 ><A
    </P
 ></BLOCKQUOTE
 ><A

-NAME="AEN5359"
+NAME="AEN5338"

 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"

diff --git a/doc/webserver/user-manual/config.html b/doc/webserver/user-manual/config.html
index 6214cb8..fee0eb3 100644 (file)
--- a/doc/webserver/user-manual/config.html
+++ b/doc/webserver/user-manual/config.html
@@ -260,8 +260,12 @@ CLASS="SCREEN"
 >
   </P
 ><P
 >
   </P
 ><P

->   The User Manual is then available to anyone with access to the proxy, by 
-   following the built-in URL: <TT
+>   The User Manual is then available to anyone with access to
+   <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>, by following the built-in URL:
+   <TT

 CLASS="LITERAL"
 >http://config.privoxy.org/user-manual/</TT
 >
 CLASS="LITERAL"
 >http://config.privoxy.org/user-manual/</TT
 >


@@ -411,7 +415,10 @@ CLASS="VARIABLELIST"
 >Specifies:</DT
 ><DD
 ><P
 >Specifies:</DT
 ><DD
 ><P

->    An email address to reach the proxy administrator.
+>    An email address to reach the <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> administrator.

    </P
 ></DD
 ><DT
    </P
 ></DD
 ><DT


@@ -665,8 +672,13 @@ CLASS="VARIABLELIST"
 ><P
 >    Privoxy's original templates are usually overwritten
     with each update. Use this option to relocate customized templates
 ><P
 >    Privoxy's original templates are usually overwritten
     with each update. Use this option to relocate customized templates

-    that should be kept. Note that you might be missing new features
-    if you use outdated templates.
+    that should be kept. Note that template variables might change
+    between updates and templates are not guaranteed to work with
+    <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> releases other than the one
+    they were part of.

    </P
 ></DD
 ></DL
    </P
 ></DD
 ></DL


@@ -963,7 +975,7 @@ HREF="appendix.html#REGEX"
 >regular expressions</A
 >. These rules permit
     powerful changes on the content of Web pages, and optionally the headers
 >regular expressions</A
 >. These rules permit
     powerful changes on the content of Web pages, and optionally the headers

-    as well, e.g., you could disable your favorite JavaScript annoyances,
+    as well, e.g., you could try to disable your favorite JavaScript annoyances,

     re-write the actual displayed text, or just have some fun 
     playing buzzword bingo with web pages.
    </P
     re-write the actual displayed text, or just have some fun 
     playing buzzword bingo with web pages.
    </P


@@ -1066,10 +1078,10 @@ CLASS="EMPHASIS"
 >Effect if unset:</DT
 ><DD
 ><P
 >Effect if unset:</DT
 ><DD
 ><P

->    No log file is used, all log messages go to the console (<TT
+>    Logging is disabled unless <TT

 CLASS="LITERAL"
 CLASS="LITERAL"

->STDERR</TT
->).
+>--no-daemon</TT
+> mode is used.

    </P
 ></DD
 ><DT
    </P
 ></DD
 ><DT


@@ -1086,9 +1098,22 @@ CLASS="LITERAL"
 CLASS="APPLICATION"
 >Privoxy</SPAN
 > (e.g., it's not blocking an ad you
 CLASS="APPLICATION"
 >Privoxy</SPAN
 > (e.g., it's not blocking an ad you

-    think it should block) but in most cases you probably will never look at
-    it. For this reason, it is disabled by default. For troubleshooting
-    purposes, you will have to explicitly enable it.
+    think it should block) and it can help you to monitor what your browser
+    is doing.
+   </P
+><P
+>    Many users will never look at it, however, and it's a privacy risk
+    if third parties can get access to it. It is therefore disabled by
+    default in <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> 3.0.7 and later.
+  </P
+><P
+>    For troubleshooting purposes, you will have to explicitly enable it.
+    Please don't file any support requests without trying to reproduce
+    the problem with logging enabled first. Once you read the log messages,
+    you may even be able to solve the problem on your own.

    </P
 ><P
 >    Your logfile will grow indefinitely, and you will probably want to
    </P
 ><P
 >    Your logfile will grow indefinitely, and you will probably want to


@@ -1103,23 +1128,11 @@ CLASS="COMMAND"
 > script has been included.
    </P
 ><P
 > script has been included.
    </P
 ><P

->    On SuSE Linux systems, you can place a line like <SPAN
-CLASS="QUOTE"
->"/var/log/privoxy.*
-    +1024k 644 nobody.nogroup"</SPAN
-> in <TT
-CLASS="FILENAME"
->/etc/logfiles</TT
->, with
-    the effect that cron.daily will automatically archive, gzip, and empty the
-    log, when it exceeds 1M size.
-   </P
-><P

 >    Any log files must be writable by whatever user <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
 >
 >    Any log files must be writable by whatever user <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
 >

-    is being run as (default on UNIX, user id is <SPAN
+    is being run as (on Unix, default user id is <SPAN

 CLASS="QUOTE"
 >"privoxy"</SPAN
 >).
 CLASS="QUOTE"
 >"privoxy"</SPAN
 >).


@@ -1190,7 +1203,10 @@ CLASS="EMPHASIS"
    </P
 ><P
 >    If debug 8 (show header parsing) is enabled, cookies are
    </P
 ><P
 >    If debug 8 (show header parsing) is enabled, cookies are

-    written to the logfile with the rest of the headers.
+    also written to the logfile with the rest of the headers.
+    Therefore this option isn't very useful and may be removed
+    in future releases. Please report to the developers if you
+    are still using it.

    </P
 ></DD
 ></DL
    </P
 ></DD
 ></DL


@@ -1566,7 +1582,7 @@ CLASS="EMPHASIS"
 >Notes:</DT
 ><DD
 ><P
 >Notes:</DT
 ><DD
 ><P

->    This option is only there for debug purposes and you should never
+>    This option is only there for debugging purposes and you should never

     need to use it. <SPAN
 CLASS="emphasis"
 ><I
     need to use it. <SPAN
 CLASS="emphasis"
 ><I


@@ -1681,7 +1697,7 @@ HREF="config.html#ACLS"
 CLASS="APPLICATION"
 >Privoxy</SPAN
 > to untrusted users, you will
 CLASS="APPLICATION"
 >Privoxy</SPAN
 > to untrusted users, you will

-    also want to turn off the <TT
+    also want to make sure that the following actions are disabled:  <TT

 CLASS="LITERAL"
 ><A
 HREF="config.html#ENABLE-EDIT-ACTIONS"
 CLASS="LITERAL"
 ><A
 HREF="config.html#ENABLE-EDIT-ACTIONS"


@@ -1695,7 +1711,6 @@ HREF="config.html#ENABLE-REMOTE-TOGGLE"
 >enable-remote-toggle</A
 ></TT
 >
 >enable-remote-toggle</A
 ></TT
 >

-    options!

    </P
 ></DD
 ><DT
    </P
 ></DD
 ><DT


@@ -1780,20 +1795,11 @@ CLASS="APPLICATION"
 CLASS="QUOTE"
 >"toggled off"</SPAN
 > mode, i.e. mostly behave like a normal,
 CLASS="QUOTE"
 >"toggled off"</SPAN
 > mode, i.e. mostly behave like a normal,

-    content-neutral proxy where all ad blocking, filtering, etc are disabled. See
-    <TT
+    content-neutral proxy with both ad blocking and content filtering
+    disabled. See <TT

 CLASS="LITERAL"
 >enable-remote-toggle</TT
 CLASS="LITERAL"
 >enable-remote-toggle</TT

-> below. This is not really useful
-    anymore, since toggling is much easier via <A
-HREF="http://config.privoxy.org/toggle"
-TARGET="_top"
->the web interface</A
-> than via
-    editing the <TT
-CLASS="FILENAME"
->conf</TT
-> file.
+> below.

    </P
 ><P
 >    The windows version will only display the toggle icon in the system tray
    </P
 ><P
 >    The windows version will only display the toggle icon in the system tray


@@ -1855,8 +1861,7 @@ TARGET="_top"
 CLASS="APPLICATION"
 >Privoxy</SPAN
 > mostly acts like a normal,
 CLASS="APPLICATION"
 >Privoxy</SPAN
 > mostly acts like a normal,

-    content-neutral proxy, i.e. it acts as if none of the actions applied to
-    any URL.
+    content-neutral proxy, i.e. doesn't block ads or filter content.

    </P
 ><P
 >    Access to the toggle feature can <SPAN
    </P
 ><P
 >    Access to the toggle feature can <SPAN


@@ -1888,14 +1893,18 @@ CLASS="EMPHASIS"
 >not recommended</I
 ></SPAN
 >
 >not recommended</I
 ></SPAN
 >

-    for multi-user environments with untrusted users. Because of 
-    the obvious security implications, this feature is off by default.
-    Note that malicious client side code (e.g JavaScript) is also potentially
-    capable of changing <SPAN
+    for multi-user environments with untrusted users.
+   </P
+><P
+>    Note that malicious client side code (e.g Java) is also
+    capable of using this option.
+   </P
+><P
+>    As a lot of <SPAN

 CLASS="APPLICATION"
 CLASS="APPLICATION"

->Privoxy's</SPAN
-> intended
-    behavior.
+>Privoxy</SPAN
+> users don't read
+    documentation, this feature has been disabled by default.

    </P
 ><P
 >    Note that you must have compiled <SPAN
    </P
 ><P
 >    Note that you must have compiled <SPAN


@@ -1969,11 +1978,11 @@ CLASS="APPLICATION"
 >Privoxy</SPAN
 > in a environment with trusted clients,
     you may enable this feature at your discretion. Note that malicious client
 >Privoxy</SPAN
 > in a environment with trusted clients,
     you may enable this feature at your discretion. Note that malicious client

-    side code (e.g JavaScript) is also potentially capable of changing
-    <SPAN
-CLASS="APPLICATION"
->Privoxy's</SPAN
-> intended behavior.
+    side code (e.g Java) is also capable of using this feature.
+   </P
+><P
+>    This option may be removed in future releases as it has been obsoleted
+    by the more general header taggers.

    </P
 ></DD
 ></DL
    </P
 ></DD
 ></DL


@@ -2049,20 +2058,30 @@ CLASS="QUOTE"
 CLASS="LITERAL"
 >listen-address</TT
 > above) can
 CLASS="LITERAL"
 >listen-address</TT
 > above) can

-    modify its configuration for all users. This option is <SPAN
+    modify its configuration for all users.
+   </P
+><P
+>    This option is <SPAN

 CLASS="emphasis"
 ><I
 CLASS="EMPHASIS"
 CLASS="emphasis"
 ><I
 CLASS="EMPHASIS"

->not
-    recommended</I
+>not recommended</I

 ></SPAN
 ></SPAN

-> for multi-user environments with untrusted users 
-    and is therefore disabled by default. Note that malicious client side code
-    (e.g JavaScript) is also potentially capable of changing
-    <SPAN
+> for environments
+    with untrusted users and is therefore disabled by default.
+   </P
+><P
+>    Note that malicious client side code (e.g Java) is also
+    capable of using the actions editor and you shouldn't enable
+    this options unless you understand the consequences and are
+    sure your browser is configured correctly.
+   </P
+><P
+>    As a lot of <SPAN

 CLASS="APPLICATION"
 CLASS="APPLICATION"

->Privoxy's</SPAN
-> intended behavior.
+>Privoxy</SPAN
+> users don't read
+    documentation, this feature has been disabled by default.

    </P
 ><P
 >    Note that you must have compiled <SPAN
    </P
 ><P
 >    Note that you must have compiled <SPAN


@@ -2998,7 +3017,7 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
 ><TD
 ><PRE
 CLASS="SCREEN"

->  forward-socks4   /               127.0.0.1:9050 .</PRE
+>  forward-socks4a   /               127.0.0.1:9050 .</PRE

 ></TD
 ></TR
 ></TABLE
 ></TD
 ></TR
 ></TABLE


@@ -3008,8 +3027,9 @@ CLASS="SCREEN"
 >    The public <SPAN
 CLASS="APPLICATION"
 >Tor</SPAN
 >    The public <SPAN
 CLASS="APPLICATION"
 >Tor</SPAN

-> network can't be used to reach your local network,
-    therefore it's a good idea to make some exceptions:
+> network can't be used to
+    reach your local network, if you need to access local servers you
+    therefore might want to make some exceptions:

    </P
 ><P
 >    <TABLE
    </P
 ><P
 >    <TABLE


@@ -3031,7 +3051,11 @@ CLASS="SCREEN"
 ><P
 >    Unencrypted connections to systems in these address ranges will
     be as (un)secure as the local network is, but the alternative is that you
 ><P
 >    Unencrypted connections to systems in these address ranges will
     be as (un)secure as the local network is, but the alternative is that you

-    can't reach the network at all.
+    can't reach the local network through <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>
+    at all.

    </P
 ><P
 >    If you also want to be able to reach servers in your local network by
    </P
 ><P
 >    If you also want to be able to reach servers in your local network by


@@ -3284,7 +3308,7 @@ CLASS="QUOTE"
     that Privoxy forwards through other proxies. This option is not limited to the HTTP CONNECT method.
    </P
 ><P
     that Privoxy forwards through other proxies. This option is not limited to the HTTP CONNECT method.
    </P
 ><P

->    Only use this option, if you are getting many forwarding related error messages,
+>    Only use this option, if you are getting lots of forwarding-related error messages

     that go away when you try again manually. Start with a small value and check Privoxy's
     logfile from time to time, to see how many retries are usually needed.
    </P
     that go away when you try again manually. Start with a small value and check Privoxy's
     logfile from time to time, to see how many retries are usually needed.
    </P

diff --git a/doc/webserver/user-manual/configuration.html b/doc/webserver/user-manual/configuration.html
index 9190dfc..45bb8e9 100644 (file)
--- a/doc/webserver/user-manual/configuration.html
+++ b/doc/webserver/user-manual/configuration.html
@@ -95,7 +95,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
 ><H2
 CLASS="SECT2"
 ><A

-NAME="AEN762"
+NAME="AEN733"

 >6.1. Controlling Privoxy with Your Web Browser</A
 ></H2
 ><P
 >6.1. Controlling Privoxy with Your Web Browser</A
 ></H2
 ><P


@@ -126,7 +126,7 @@ CLASS="SCREEN"
 > <H2
 CLASS="BRIDGEHEAD"
 ><A
 > <H2
 CLASS="BRIDGEHEAD"
 ><A

-NAME="AEN770"
+NAME="AEN741"

 ></A
 >    Privoxy Menu</H2
 ><P
 ></A
 >    Privoxy Menu</H2
 ><P

diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html
index 6403fba..0f80fab 100644 (file)
--- a/doc/webserver/user-manual/copyright.html
+++ b/doc/webserver/user-manual/copyright.html
@@ -99,7 +99,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
 ><H2
 CLASS="SECT2"
 ><A

-NAME="AEN5054"
+NAME="AEN5033"

 >12.1. License</A
 ></H2
 ><P
 >12.1. License</A
 ></H2
 ><P

diff --git a/doc/webserver/user-manual/filter-file.html b/doc/webserver/user-manual/filter-file.html
index 6f0606f..4e3d303 100644 (file)
--- a/doc/webserver/user-manual/filter-file.html
+++ b/doc/webserver/user-manual/filter-file.html
@@ -363,7 +363,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
 ><H2
 CLASS="SECT2"
 ><A

-NAME="AEN4584"
+NAME="AEN4563"

 >9.1. Filter File Tutorial</A
 ></H2
 ><P
 >9.1. Filter File Tutorial</A
 ></H2
 ><P

diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html
index d459770..03e71b7 100644 (file)
--- a/doc/webserver/user-manual/index.html
+++ b/doc/webserver/user-manual/index.html
@@ -47,7 +47,7 @@ TARGET="_top"
 ><BR></P
 ><P
 CLASS="PUBDATE"
 ><BR></P
 ><P
 CLASS="PUBDATE"

->$Id: user-manual.sgml,v 2.38 2007/09/22 16:01:42 fabiankeil Exp $<BR></P
+>$Id: user-manual.sgml,v 2.39 2007/11/05 02:34:49 hal9 Exp $<BR></P

 ><DIV
 ><DIV
 CLASS="ABSTRACT"
 ><DIV
 ><DIV
 CLASS="ABSTRACT"


@@ -292,7 +292,7 @@ HREF="configuration.html"
 ><DL
 ><DT
 >6.1. <A
 ><DL
 ><DT
 >6.1. <A

-HREF="configuration.html#AEN762"
+HREF="configuration.html#AEN733"

 >Controlling Privoxy with Your Web Browser</A
 ></DT
 ><DT
 >Controlling Privoxy with Your Web Browser</A
 ></DT
 ><DT


@@ -515,12 +515,12 @@ HREF="actions-file.html"
 ><DL
 ><DT
 >8.1. <A
 ><DL
 ><DT
 >8.1. <A

-HREF="actions-file.html#AEN2206"
+HREF="actions-file.html#AEN2184"

 >Finding the Right Mix</A
 ></DT
 ><DT
 >8.2. <A
 >Finding the Right Mix</A
 ></DT
 ><DT
 >8.2. <A

-HREF="actions-file.html#AEN2213"
+HREF="actions-file.html#AEN2191"

 >How to Edit</A
 ></DT
 ><DT
 >How to Edit</A
 ></DT
 ><DT


@@ -537,12 +537,12 @@ HREF="actions-file.html#AF-PATTERNS"
 ><DL
 ><DT
 >8.4.1. <A
 ><DL
 ><DT
 >8.4.1. <A

-HREF="actions-file.html#AEN2303"
+HREF="actions-file.html#AEN2282"

 >The Domain Pattern</A
 ></DT
 ><DT
 >8.4.2. <A
 >The Domain Pattern</A
 ></DT
 ><DT
 >8.4.2. <A

-HREF="actions-file.html#AEN2374"
+HREF="actions-file.html#AEN2353"

 >The Path Pattern</A
 ></DT
 ><DT
 >The Path Pattern</A
 ></DT
 ><DT


@@ -754,7 +754,7 @@ HREF="actions-file.html#TREAT-FORBIDDEN-CONNECTS-LIKE-BLOCKS"
 ></DT
 ><DT
 >8.5.39. <A
 ></DT
 ><DT
 >8.5.39. <A

-HREF="actions-file.html#AEN4178"
+HREF="actions-file.html#AEN4157"

 >Summary</A
 ></DT
 ></DL
 >Summary</A
 ></DT
 ></DL


@@ -773,12 +773,12 @@ HREF="actions-file.html#ACT-EXAMPLES"
 ><DL
 ><DT
 >8.7.1. <A
 ><DL
 ><DT
 >8.7.1. <A

-HREF="actions-file.html#AEN4243"
+HREF="actions-file.html#AEN4222"

 >default.action</A
 ></DT
 ><DT
 >8.7.2. <A
 >default.action</A
 ></DT
 ><DT
 >8.7.2. <A

-HREF="actions-file.html#AEN4430"
+HREF="actions-file.html#AEN4409"

 >user.action</A
 ></DT
 ></DL
 >user.action</A
 ></DT
 ></DL


@@ -794,7 +794,7 @@ HREF="filter-file.html"
 ><DL
 ><DT
 >9.1. <A
 ><DL
 ><DT
 >9.1. <A

-HREF="filter-file.html#AEN4584"
+HREF="filter-file.html#AEN4563"

 >Filter File Tutorial</A
 ></DT
 ><DT
 >Filter File Tutorial</A
 ></DT
 ><DT


@@ -862,7 +862,7 @@ HREF="copyright.html"
 ><DL
 ><DT
 >12.1. <A
 ><DL
 ><DT
 >12.1. <A

-HREF="copyright.html#AEN5054"
+HREF="copyright.html#AEN5033"

 >License</A
 ></DT
 ><DT
 >License</A
 ></DT
 ><DT


@@ -896,7 +896,7 @@ HREF="appendix.html#REGEX"
 ></DT
 ><DT
 >14.2. <A
 ></DT
 ><DT
 >14.2. <A

-HREF="appendix.html#AEN5309"
+HREF="appendix.html#AEN5288"

 >Privoxy's Internal Pages</A
 ></DT
 ><DD
 >Privoxy's Internal Pages</A
 ></DT
 ><DD

diff --git a/doc/webserver/user-manual/quickstart.html b/doc/webserver/user-manual/quickstart.html
index ca1147b..07585fa 100644 (file)
--- a/doc/webserver/user-manual/quickstart.html
+++ b/doc/webserver/user-manual/quickstart.html
@@ -680,7 +680,7 @@ CLASS="GUIBUTTON"
 >  <DIV
 CLASS="FIGURE"
 ><A
 >  <DIV
 CLASS="FIGURE"
 ><A

-NAME="AEN515"
+NAME="AEN486"

 ></A
 ><P
 ><B
 ></A
 ><P
 ><B

diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html
index ab3643b..cc4010c 100644 (file)
--- a/doc/webserver/user-manual/startup.html
+++ b/doc/webserver/user-manual/startup.html
@@ -111,7 +111,7 @@ CLASS="APPLICATION"
 >  <DIV
 CLASS="FIGURE"
 ><A
 >  <DIV
 CLASS="FIGURE"
 ><A

-NAME="AEN570"
+NAME="AEN541"

 ></A
 ><P
 ><B
 ></A
 ><P
 ><B


@@ -245,7 +245,7 @@ CLASS="EMPHASIS"
 >  <DIV
 CLASS="FIGURE"
 ><A
 >  <DIV
 CLASS="FIGURE"
 ><A

-NAME="AEN614"
+NAME="AEN585"

 ></A
 ><P
 ><B
 ></A
 ><P
 ><B

diff --git a/doc/webserver/user-manual/whatsnew.html b/doc/webserver/user-manual/whatsnew.html
index 327d2b7..ed3921c 100644 (file)
--- a/doc/webserver/user-manual/whatsnew.html
+++ b/doc/webserver/user-manual/whatsnew.html
@@ -144,171 +144,41 @@ CLASS="APPLICATION"
 ></LI
 ><LI
 ><P
 ></LI
 ><LI
 ><P

->     See the full documentation on 
-     <TT
-CLASS="LITERAL"
-><A
-HREF="actions-file.html#FAST-REDIRECTS"
->fast-redirects</A
-></TT
->
-     which has changed syntax, and will require adjustments to local configs, 
-     such as <TT
-CLASS="FILENAME"
->user.action</TT
->. You must reference the new 
-     syntax: 
-   </P
-><P
-> <TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="90%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
->  { +fast-redirects{check-decoded-url} }
-   .example.com
-   mybank.com
-   .google.</PRE
-></TD
-></TR
-></TABLE
-></P
-></LI
-><LI
-><P
->     The <TT
-CLASS="FILENAME"
->jarfile</TT
->, 
-     <A
-HREF="http://en.wikipedia.org/wiki/Browser_cookie"
-TARGET="_top"
->cookie</A
-> logger, is off by default now.
-    </P
-></LI
-><LI
-><P

 >  
 >  

-   What constitutes a <SPAN
-CLASS="QUOTE"
->"default"</SPAN
-> configuration has changed, 
-   and you may want to review which actions are <SPAN
-CLASS="QUOTE"
->"on"</SPAN
-> by 
-   default. This is primarily a matter of emphasis, but some features 
-   you may have been used to, may now be <SPAN
-CLASS="QUOTE"
->"off"</SPAN
-> by default.
-   There are also a number of new actions and filters you may want to
-   consider, most of which are not fully incorporated into the default
-   settings as yet (see above).
-  </P
-></LI
-><LI
-><P
->    The default actions setting is now <TT
-CLASS="LITERAL"
->Cautious</TT
->. Previous
-    releases had a default setting of <TT
-CLASS="LITERAL"
->Medium</TT
->. Experienced
-    users may want to adjust this, as it is fairly conservative by <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
->
-    standards and past practices. See <A
-HREF="http://config.privoxy.org/edit-actions-list?f=default"
-TARGET="_top"
->    http://config.privoxy.org/edit-actions-list?f=default</A
->. New users
-    should try the default settings for a while before turning up the volume.
-   </P
-></LI
-><LI
-><P
->    The default setting has filtering turned <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->off</I
-></SPAN
->, which
-    subsequently means that compression is <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->on</I
-></SPAN
->. Remember
-    that filtering does not work on compressed pages, so if you use, or want to
-    use, filtering, you will need to force compression off. Example:
-   </P
-><P
-> <TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="90%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
->  { +<A
-HREF="actions-file.html#FILTER"
->filter</A
->{google}  +<A
-HREF="actions-file.html#PREVENT-COMPRESSION"
->prevent-compression</A
-> }
-   .google.</PRE
-></TD
-></TR
-></TABLE
->
-   </P
-><P
->    Or if you use a number of filters, or filter many sites, you may just want
-    to turn off compression for all sites in
-    <TT
+   <TT

 CLASS="FILENAME"
 CLASS="FILENAME"

->default.action</TT
-> (or
-    <TT
-CLASS="FILENAME"
->user.action</TT
->). 
-   </P
+>standard.action</TT
+> now only includes the enabled actions.
+   Not all actions as before.
+  </P

 ></LI
 ><LI
 ><P
 ></LI
 ><LI
 ><P

->   Also, <A
-HREF="actions-file.html#SESSION-COOKIES-ONLY"
->session-cookies-only</A
-> is 
-   off by default now. If you've liked this feature in the past, you may want 
-   to turn it back on in <TT
-CLASS="FILENAME"
->user.action</TT
-> now.
-  </P
+>     Logging is off by default now. If you need logging, it can be turned on
+     in the <A
+HREF="config.html#LOGFILE"
+>config file</A
+>.
+    </P

 ></LI
 ><LI
 ><P
 ></LI
 ><LI
 ><P

->   
-   Some installers may not automatically start
-   <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> after installation.
-  </P
+>     Three other config file settings are now off by default: 
+     <A
+HREF="config.html#ENABLE-REMOTE-TOGGLE"
+>enable-remote-toggle</A
+>,
+     <A
+HREF="config.html#ENABLE-REMOTE-HTTP-TOGGLE"
+>enable-remote-http-toggle</A
+>,
+     and  <A
+HREF="config.html#ENABLE-EDIT-ACTIONS"
+>enable-edit-actions</A
+>. 
+     If you use or want these, you will need to explicitly enable them, and
+     be aware of the security issues involved. 
+    </P

 ></LI
 ></UL
 ></P
 ></LI
 ></UL
 ></P