Sync with recent changes.

diff --git a/doc/webserver/faq/configuration.html b/doc/webserver/faq/configuration.html
index 7141571..ef87830 100644 (file)
--- a/doc/webserver/faq/configuration.html
+++ b/doc/webserver/faq/configuration.html
@@ -294,12 +294,12 @@ NAME="GETUPDATES"
 >3.5. Where can I get updated Actions Files?</A
 ></H3
 ><P
 >3.5. Where can I get updated Actions Files?</A
 ></H3
 ><P

->   Based on your feedback and the continuing development, updates of 
-   <TT
+>  Based on your feedback and the continuing development, updates of 
+  <TT

 CLASS="FILENAME"
 >default.action</TT
 > will be
 CLASS="FILENAME"
 >default.action</TT
 > will be

-   made available from   time to time on the <A
+  made available from time to time on the <A

 HREF="http://sourceforge.net/project/showfiles.php?group_id=11118"
 TARGET="_top"
 >files section</A
 HREF="http://sourceforge.net/project/showfiles.php?group_id=11118"
 TARGET="_top"
 >files section</A


@@ -319,7 +319,7 @@ CLASS="APPLICATION"
 HREF="http://lists.sourceforge.net/lists/listinfo/ijbswa-announce/"
 TARGET="_top"
 >subscribe
 HREF="http://lists.sourceforge.net/lists/listinfo/ijbswa-announce/"
 TARGET="_top"
 >subscribe

-  to our announce  mailing list</A
+  to our announce mailing list</A

 >, ijbswa-announce@lists.sourceforge.net.
  </P
 ></DIV
 >, ijbswa-announce@lists.sourceforge.net.
  </P
 ></DIV


@@ -749,7 +749,7 @@ HREF="http://config.privoxy.org/show-status"
 TARGET="_top"
 >web-based actions file editor</A
 >.
 TARGET="_top"
 >web-based actions file editor</A
 >.

- Note  that the custom actions editor must be explicitly enabled in
+ Note that the custom actions editor must be explicitly enabled in

  the main config file (see <A
 HREF="../user-manual/config.html#ENABLE-EDIT-ACTIONS"
 TARGET="_top"
  the main config file (see <A
 HREF="../user-manual/config.html#ENABLE-EDIT-ACTIONS"
 TARGET="_top"


@@ -1310,7 +1310,7 @@ TARGET="_top"
  method that browsers can use to store data between pages, or between browser
  sessions. Sometimes there is a good reason for this, and the user's life is a
  bit easier as a result. But there is a long history of some websites taking
  method that browsers can use to store data between pages, or between browser
  sessions. Sometimes there is a good reason for this, and the user's life is a
  bit easier as a result. But there is a long history of some websites taking

- advantage of this layer of trust, and using the data they glean from you  and 
+ advantage of this layer of trust, and using the data they glean from you and 

  your browsing habits for their own purposes, and maybe to your potential
  detriment. Such sites are using you and storing their data on your system.
  That is why the privacy conscious watch from whom those cookies come, and why
  your browsing habits for their own purposes, and maybe to your potential
  detriment. Such sites are using you and storing their data on your system.
  That is why the privacy conscious watch from whom those cookies come, and why

diff --git a/doc/webserver/faq/copyright.html b/doc/webserver/faq/copyright.html
index a638ccb..0c5ddc2 100644 (file)
--- a/doc/webserver/faq/copyright.html
+++ b/doc/webserver/faq/copyright.html
@@ -106,7 +106,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
 ><H2
 CLASS="SECT2"
 ><A

-NAME="AEN1397"
+NAME="AEN1402"

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


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

-NAME="AEN1413"
+NAME="AEN1418"

 >7.2. History</A
 ></H2
 ><P
 >7.2. History</A
 ></H2
 ><P

diff --git a/doc/webserver/faq/general.html b/doc/webserver/faq/general.html
index 441314d..8a8e10a 100644 (file)
--- a/doc/webserver/faq/general.html
+++ b/doc/webserver/faq/general.html
@@ -152,7 +152,7 @@ CLASS="APPLICATION"
 CLASS="APPLICATION"
 >Privoxy's</SPAN
 > configuration can be done 
 CLASS="APPLICATION"
 >Privoxy's</SPAN
 > configuration can be done 

-  with a  <A
+  with a <A

 HREF="http://en.wikipedia.org/wiki/Web_browser"
 TARGET="_top"
 >Web browser</A
 HREF="http://en.wikipedia.org/wiki/Web_browser"
 TARGET="_top"
 >Web browser</A


@@ -184,29 +184,27 @@ CLASS="QUOTE"
 Privoxy work?</A
 ></H3
 ><P
 Privoxy work?</A
 ></H3
 ><P

->  A  <A
+>  A <A

 HREF="http://en.wikipedia.org/wiki/Proxy_server"
 TARGET="_top"
 >web proxy</A
 >
 HREF="http://en.wikipedia.org/wiki/Proxy_server"
 TARGET="_top"
 >web proxy</A
 >

-  is a service, based on a software such as
-  <SPAN
+  is a service, based on a software such as <SPAN

 CLASS="APPLICATION"
 >Privoxy</SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN

->, that clients (i.e. browsers) can use
-  instead of connecting directly to web servers on the Internet. The
-  clients then ask the proxy to fetch the objects they need (web pages,
-  images, movies etc) on their behalf, and when the proxy has done so, it
-  hands the results back to the client. It is a <SPAN
+>, that clients
+  (i.e. browsers) can use instead of connecting to web servers directly.
+  The clients then ask the proxy to request objects (web pages, images, movies etc)
+  on their behalf and to forward the data to the clients.
+  It is a <SPAN

 CLASS="QUOTE"
 >"go-between"</SPAN
 CLASS="QUOTE"
 >"go-between"</SPAN

->. See
-  the <A
+>. For details, see
+  <A

 HREF="http://en.wikipedia.org/wiki/Proxy_server"
 TARGET="_top"
 HREF="http://en.wikipedia.org/wiki/Proxy_server"
 TARGET="_top"

->Wikipedia proxy
-  definition</A
-> for more.
+>Wikipedia's proxy definition</A
+>.

  </P
 ><P
 >  There are many reasons to use web proxies, such as security (firewalling),
  </P
 ><P
 >  There are many reasons to use web proxies, such as security (firewalling),


@@ -217,9 +215,9 @@ TARGET="_top"
 >  <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
 >  <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN

-> is a proxy that is primarily focused on privacy
-  protection, ad and junk elimination and freeing the user from restrictions placed on his 
-  activities. Sitting between your browser(s) and the Internet,
+> is a proxy that is primarily focused on
+  privacy enhancement, ad and junk elimination and freeing the user from
+  restrictions placed on his activities. Sitting between your browser(s) and the Internet,

   it is in a perfect position to filter outbound personal information that your
   browser is leaking, as well as inbound junk. It uses a variety of techniques to do
   this, all of which are under your complete control via the various configuration
   it is in a perfect position to filter outbound personal information that your
   browser is leaking, as well as inbound junk. It uses a variety of techniques to do
   this, all of which are under your complete control via the various configuration


@@ -434,7 +432,7 @@ CLASS="APPLICATION"
  <SPAN
 CLASS="APPLICATION"
 >Junkbuster</SPAN
  <SPAN
 CLASS="APPLICATION"
 >Junkbuster</SPAN

-> left off. All the old features remain.
+> left off.

  The new <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
  The new <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN

diff --git a/doc/webserver/faq/index.html b/doc/webserver/faq/index.html
index 52ad8ff..e1a87ac 100644 (file)
--- a/doc/webserver/faq/index.html
+++ b/doc/webserver/faq/index.html
@@ -48,7 +48,7 @@ TARGET="_top"
 ><BR></P
 ><P
 CLASS="PUBDATE"
 ><BR></P
 ><P
 CLASS="PUBDATE"

->$Id: faq.sgml,v 2.40 2008/02/22 05:54:27 markm68k Exp $<BR></P
+>$Id: faq.sgml,v 2.42 2008/06/07 13:11:15 fabiankeil Exp $<BR></P

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


@@ -58,7 +58,7 @@ CLASS="ABSTRACT"
 NAME="AEN9"
 ></A
 ><P
 NAME="AEN9"
 ></A
 ><P

-> This FAQ gives quick answers to frequently asked  questions about
+> This FAQ gives quick answers to frequently asked questions about

  <A
 HREF="http://www.privoxy.org/"
 TARGET="_top"
  <A
 HREF="http://www.privoxy.org/"
 TARGET="_top"


@@ -770,7 +770,7 @@ HREF="trouble.html#MACOSXIE"
 >5.8. <A
 HREF="trouble.html#MACOSXUNINSTALL"
 >In Mac OS X, I dragged the Privoxy folder to the trash in order to 
 >5.8. <A
 HREF="trouble.html#MACOSXUNINSTALL"
 >In Mac OS X, I dragged the Privoxy folder to the trash in order to 

- uninstall it.  Now the finder tells me I don't have sufficient privileges to
+ uninstall it. Now the finder tells me I don't have sufficient privileges to

  empty the trash.</A
 ></DT
 ><DT
  empty the trash.</A
 ></DT
 ><DT


@@ -922,12 +922,12 @@ HREF="copyright.html"
 ><DL
 ><DT
 >7.1. <A
 ><DL
 ><DT
 >7.1. <A

-HREF="copyright.html#AEN1397"
+HREF="copyright.html#AEN1402"

 >License</A
 ></DT
 ><DT
 >7.2. <A
 >License</A
 ></DT
 ><DT
 >7.2. <A

-HREF="copyright.html#AEN1413"
+HREF="copyright.html#AEN1418"

 >History</A
 ></DT
 ></DL
 >History</A
 ></DT
 ></DL

diff --git a/doc/webserver/faq/misc.html b/doc/webserver/faq/misc.html
index 66089b9..0747278 100644 (file)
--- a/doc/webserver/faq/misc.html
+++ b/doc/webserver/faq/misc.html
@@ -404,7 +404,7 @@ CLASS="emphasis"
 CLASS="EMPHASIS"
 >you</I
 ></SPAN
 CLASS="EMPHASIS"
 >you</I
 ></SPAN

-> more freedom  to decide which sites 
+> more freedom to decide which sites 

  you can trust, and what details you want to reveal. But it neither 
  hides your IP address, nor can it guarantee that the rest of the system
  behaves correctly. There are several possibilities how a web sites can find
  you can trust, and what details you want to reveal. But it neither 
  hides your IP address, nor can it guarantee that the rest of the system
  behaves correctly. There are several possibilities how a web sites can find


@@ -1254,7 +1254,7 @@ CLASS="EMPHASIS"
 CLASS="APPLICATION"
 >Privoxy</SPAN
 > does not do FTP at all, only HTTP 
 CLASS="APPLICATION"
 >Privoxy</SPAN
 > does not do FTP at all, only HTTP 

- and  HTTPS (SSL) protocols, so please don't try.</P
+ and HTTPS (SSL) protocols.</P

 ></DIV
 ><DIV
 CLASS="SECT2"
 ></DIV
 ><DIV
 CLASS="SECT2"


@@ -1670,9 +1670,9 @@ CLASS="QUOTE"
 >"Text replacements for subversive browsing
  fun!"</SPAN
 > or you are using an older Privoxy version and have implicitly
 >"Text replacements for subversive browsing
  fun!"</SPAN
 > or you are using an older Privoxy version and have implicitly

- activated it by choosing the  <SPAN
+ activated it by choosing the <SPAN

 CLASS="QUOTE"
 CLASS="QUOTE"

->"Adventuresome"</SPAN
+>"Advanced"</SPAN

 > profile in the
  web-based editor. Please upgrade.</P
 ></DIV
 > profile in the
  web-based editor. Please upgrade.</P
 ></DIV

diff --git a/doc/webserver/faq/trouble.html b/doc/webserver/faq/trouble.html
index 9bc7655..3fda0ab 100644 (file)
--- a/doc/webserver/faq/trouble.html
+++ b/doc/webserver/faq/trouble.html
@@ -535,18 +535,18 @@ CLASS="SECT2"
 ><A
 NAME="MACOSXUNINSTALL"
 >5.8. In Mac OS X, I dragged the Privoxy folder to the trash in order to 
 ><A
 NAME="MACOSXUNINSTALL"
 >5.8. In Mac OS X, I dragged the Privoxy folder to the trash in order to 

- uninstall it.  Now the finder tells me I don't have sufficient privileges to
+ uninstall it. Now the finder tells me I don't have sufficient privileges to

  empty the trash.</A
 ></H3
 ><P
 > Note: This ONLY applies to privoxy 3.0.6 and earlier.
  </P
 ><P
  empty the trash.</A
 ></H3
 ><P
 > Note: This ONLY applies to privoxy 3.0.6 and earlier.
  </P
 ><P

-> Just dragging the <SPAN
+>  Just dragging the <SPAN

 CLASS="APPLICATION"
 >Privoxy</SPAN
 > folder to the trash is
 CLASS="APPLICATION"
 >Privoxy</SPAN
 > folder to the trash is

-  not enough to delete it.  <SPAN
+  not enough to delete it. <SPAN

 CLASS="APPLICATION"
 >Privoxy</SPAN
 > supplies an
 CLASS="APPLICATION"
 >Privoxy</SPAN
 > supplies an


@@ -554,11 +554,11 @@ CLASS="APPLICATION"
 CLASS="APPLICATION"
 >uninstall.command</SPAN
 > file that takes care of
 CLASS="APPLICATION"
 >uninstall.command</SPAN
 > file that takes care of

-  these details.  Open the trash, drag the <SPAN
+  these details. Open the trash, drag the <SPAN

 CLASS="APPLICATION"
 >uninstall.command</SPAN
 >
 CLASS="APPLICATION"
 >uninstall.command</SPAN
 >

-  file out of the trash and double-click on it.  You will be prompted for
+  file out of the trash and double-click on it. You will be prompted for

   confirmation and the administration password.
  </P
 ><P
   confirmation and the administration password.
  </P
 ><P


@@ -710,6 +710,13 @@ CLASS="FILENAME"
  file. If this file has been changed from the original, try reverting it to
  see if that helps. Make sure whatever name(s) are used for the local system,
  that they resolve both ways.</P
  file. If this file has been changed from the original, try reverting it to
  see if that helps. Make sure whatever name(s) are used for the local system,
  that they resolve both ways.</P

+><P
+> You should also be able to work around the problem with the
+ <A
+HREF="../user-manual/config.html#HOSTNAME"
+TARGET="_top"
+>hostname option</A
+>.</P

 ></DIV
 ><DIV
 CLASS="SECT2"
 ></DIV
 ><DIV
 CLASS="SECT2"


@@ -912,7 +919,7 @@ CLASS="APPLICATION"
 >Privoxy</SPAN
 >
  merely initiates the process and hands it off, and then later reports
 >Privoxy</SPAN
 >
  merely initiates the process and hands it off, and then later reports

- whatever the outcome was. And tries to give a coherent message if there seems
+ whatever the outcome was and tries to give a coherent message if there seems

  to be a problem. In some cases, this might otherwise be mitigated by the
  browser itself which might try some work-arounds and alternate approaches (e.g
  adding <SPAN
  to be a problem. In some cases, this might otherwise be mitigated by the
  browser itself which might try some work-arounds and alternate approaches (e.g
  adding <SPAN


@@ -966,16 +973,21 @@ CLASS="APPLICATION"
 >Privoxy's</SPAN
 > page filtering
  mechanism is trying to match against absurdly long strings and this becomes
 >Privoxy's</SPAN
 > page filtering
  mechanism is trying to match against absurdly long strings and this becomes

- very CPU-intensive, taking a long, long time to complete. Until a better
- solution comes along, disable filtering on these pages, particularly the
- <TT
+ very CPU-intensive, taking a long, long time to complete.</P
+><P
+> Until a better solution comes along, disable filtering on these pages,
+ particularly the <TT

 CLASS="LITERAL"
 >js-annoyances</TT
 CLASS="LITERAL"
 >js-annoyances</TT

-> and <TT
+> and
+ <TT

 CLASS="LITERAL"
 >unsolicited-popups</TT
 CLASS="LITERAL"
 >unsolicited-popups</TT

->
- filters.</P
+> filters. If you run into this problem
+ with a recent <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> version, please send a problem report.</P

 ></DIV
 ><DIV
 CLASS="SECT2"
 ></DIV
 ><DIV
 CLASS="SECT2"


@@ -991,7 +1003,11 @@ browsing has slowed to a crawl. What gives?</A
  it does not happen. I would suspect some inadvertent interaction of software
  components such as anti-virus software, spyware protectors, personal
  firewalls or similar components. Try disabling (or uninstalling) these one
  it does not happen. I would suspect some inadvertent interaction of software
  components such as anti-virus software, spyware protectors, personal
  firewalls or similar components. Try disabling (or uninstalling) these one

- at a time and see if that helps.</P
+ at a time and see if that helps. Either way, if you are using a
+ recent <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> version, please report the problem.</P

 ></DIV
 ><DIV
 CLASS="SECT2"
 ></DIV
 ><DIV
 CLASS="SECT2"