X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=doc%2Fwebserver%2Ffaq%2Fconfiguration.html;h=946bc2ff0521cf24b835cfb0f1c2caf02ca2e7c8;hp=00967b1b30f99d3a145873587f0f4c93f728dc77;hb=3db7a58b2bbed7b6356b2a0600e93ec4f2846499;hpb=1284f78d7c4454f212d1283695d76d78e23d6b4f

diff --git a/doc/webserver/faq/configuration.html b/doc/webserver/faq/configuration.html
index 00967b1b..946bc2ff 100644
--- a/doc/webserver/faq/configuration.html
+++ b/doc/webserver/faq/configuration.html
@@ -84,7 +84,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN347"
+NAME="AEN360"
 >3.1. What exactly is an <SPAN
 CLASS="QUOTE"
 >"actions"</SPAN
@@ -186,7 +186,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN370"
+NAME="AEN383"
 >3.3. How are actions files configured? What is the easiest
 way to do this?</A
 ></H3
@@ -228,7 +228,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN379"
+NAME="AEN392"
 >3.4. There are several different <SPAN
 CLASS="QUOTE"
 >"actions"</SPAN
@@ -236,26 +236,7 @@ CLASS="QUOTE"
 the differences?</A
 ></H3
 ><P
-> Three actions files 
- are being included by the developers, to be used for 
- different purposes: These are 
- <TT
-CLASS="FILENAME"
->default.action</TT
->, the <SPAN
-CLASS="QUOTE"
->"main"</SPAN
-> actions file
- which is actively maintained by the <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
->
- developers and typically sets the default policies, <TT
-CLASS="FILENAME"
->user.action</TT
->,
- where users are encouraged to make their private customizations.
- Please see <A
+> Please have a look at the <A
 HREF="../user-manual/actions-file.html"
 TARGET="_top"
 >the actions chapter</A
@@ -264,19 +245,7 @@ TARGET="_top"
 HREF="../user-manual/index.html"
 TARGET="_top"
 >User Manual</A
-> for a more
- detailed explanation.</P
-><P
-> Earlier versions included three different versions of the 
- <TT
-CLASS="FILENAME"
->default.action</TT
-> file. The new scheme allows for 
- greater flexibility of local configuration, and for browser based 
- selection of pre-defined <SPAN
-CLASS="QUOTE"
->"aggressiveness"</SPAN
-> levels.</P
+> for a detailed explanation.</P
 ></DIV
 ><DIV
 CLASS="SECT2"
@@ -643,7 +612,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN474"
+NAME="AEN480"
 >3.11. What is the <TT
 CLASS="FILENAME"
 >default.filter</TT
@@ -691,7 +660,7 @@ CLASS="LITERAL"
 >
  action</A
 > in one of the actions files. Content filtering is automatically
- disabled for inappropriate MIME types, but if you now better than Privoxy
+ disabled for inappropriate MIME types, but if you know better than Privoxy
  what should or should not be filtered you can filter any content you like.</P
 ><P
 > Filters should
@@ -870,7 +839,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN525"
+NAME="AEN531"
 >3.13. Instead of ads, now I get a checkerboard pattern. I don't want to see anything.</A
 ></H3
 ><P
@@ -937,7 +906,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN542"
+NAME="AEN548"
 >3.14. Why would anybody want to see a checkerboard pattern?</A
 ></H3
 ><P
@@ -967,7 +936,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN548"
+NAME="AEN554"
 >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
@@ -1172,23 +1141,29 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="OUTLOOK"
->3.21. How can I configure Privoxy for use with Outlook
- Express?</A
+>3.21. How can I configure Privoxy for use with Outlook?</A
 ></H3
 ><P
-> <SPAN
+> Versions of <SPAN
 CLASS="APPLICATION"
->Outlook Express</SPAN
-> uses <SPAN
+>Outlook</SPAN
+> prior to Office 2007, use
+ <SPAN
 CLASS="APPLICATION"
 >Internet Explorer</SPAN
-> 
- components to both render HTML, and fetch any HTTP requests that may be embedded in an HTML email.
- So however you have <SPAN
+> components to both render HTML,
+ and fetch any HTTP requests that may be embedded in an HTML email. So however
+ you have <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
-> configured to work
- with IE, this configuration should automatically be shared.</P
+> configured to work with IE, this
+ configuration should automatically be shared, at least with older version of
+ Internet Explorer.</P
+><P
+> Starting with Office 2007, Microsoft is instead using the MS-Word rendering
+ engine with Outlook. It is unknown whether this can be configured to use a
+ proxy.
+ </P
 ></DIV
 ><DIV
 CLASS="SECT2"