Sync with recent changes.

[privoxy.git] / doc / webserver / faq / general.html

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 
-  with a  <A
+  with a <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
->  A  <A
+>  A <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
->, 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
->. See
-  the <A
+>. For details, see
+  <A
 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),
@@ -217,9 +215,9 @@ TARGET="_top"
 >  <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
@@ -434,7 +432,7 @@ CLASS="APPLICATION"
  <SPAN
 CLASS="APPLICATION"
 >Junkbuster</SPAN
-> left off. All the old features remain.
+> left off.
  The new <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN