Fixing merge conflict in Quickstart section.

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

diff --git a/doc/webserver/faq/general.html b/doc/webserver/faq/general.html
index de198e6..c157e7c 100644 (file)
--- a/doc/webserver/faq/general.html
+++ b/doc/webserver/faq/general.html
@@ -4,7 +4,8 @@
 >General Information</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.60"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
+"><LINK
 REL="HOME"
 TITLE="Privoxy Frequently Asked Questions"
 HREF="index.html"><LINK
@@ -122,7 +123,10 @@ CLASS="APPLICATION"
  </P
 ><P
 > 
-  Please see the History section for more
+  Please see the <A
+HREF="copyright.html"
+>History section</A
+> for more
   information on the history of <SPAN
 CLASS="APPLICATION"
 >Junkbuster</SPAN
@@ -138,7 +142,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN47"
+NAME="AEN39"
 >1.2. Why <SPAN
 CLASS="QUOTE"
 >"Privoxy"</SPAN
@@ -161,12 +165,16 @@ CLASS="EMPHASIS"
  <SPAN
 CLASS="APPLICATION"
 >Junkbuster</SPAN
-> name, which is a trademark of 
+> name, which is a registered trademark of 
  <A
 HREF="http://junkbusters.com"
 TARGET="_top"
 >Junkbusters Corporation</A
 >.
+ And thus they <SPAN
+CLASS="QUOTE"
+>"own"</SPAN
+> the rights to the name.
  (There are, however, no objections from Junkbusters Corporation to the 
  <SPAN
 CLASS="APPLICATION"
@@ -245,70 +253,75 @@ NAME="FEATURES"
 ><UL
 ><LI
 ><P
->   Integrated browser based configuration and control utility (<A
-HREF="http://p.p"
+>   Integrated browser based configuration and control utility at <A
+HREF="http://config.privoxy.org/"
+TARGET="_top"
+>http://config.privoxy.org/</A
+>
+   (shortcut: <A
+HREF="http://p.p/"
 TARGET="_top"
->http://p.p</A
->). Browser-based tracing of rule
-   and filter effects.
+>http://p.p/</A
+>). Browser-based
+   tracing of rule and filter effects. Remote toggling.
   </P
 ></LI
 ><LI
 ><P
->    Blocking of annoying pop-up browser windows.
+>   Web page content filtering (removes banners based on size,
+   invisible <SPAN
+CLASS="QUOTE"
+>"web-bugs"</SPAN
+>, JavaScript and HTML annoyances, pop-up windows, etc.)
   </P
 ></LI
 ><LI
 ><P
->   HTTP/1.1 compliant (most, but not all 1.1 features are supported).
+>   Modularized configuration that allows for standard settings and
+   user settings to reside in separate files, so that installing updated
+   actions files won't overwrite idividual user settings.
   </P
 ></LI
 ><LI
 ><P
->   Support for Perl Compatible Regular Expressions in the configuration files, and 
-   generally a more sophisticated and flexible configuration syntax over
-   previous versions. 
+>   HTTP/1.1 compliant (but not all optional 1.1 features are supported).
   </P
 ></LI
 ><LI
 ><P
->   GIF de-animation. 
+>   Support for Perl Compatible Regular Expressions in the configuration files, and 
+   generally a more sophisticated and flexible configuration syntax over
+   previous versions.
   </P
 ></LI
 ><LI
 ><P
->   Web page content filtering (removes banners based on size,
-   invisible <SPAN
-CLASS="QUOTE"
->"web-bugs"</SPAN
->, JavaScript, pop-ups, status bar abuse,
-   etc.)
+>   Improved cookie management features (e.g. session based cookies).
   </P
 ></LI
 ><LI
 ><P
->   Bypass many click-tracking scripts (avoids script redirection).
- 
+>   GIF de-animation. 
   </P
 ></LI
 ><LI
 ><P
->   Multi-threaded (POSIX and native threads).
+>   Bypass many click-tracking scripts (avoids script redirection).
   </P
 ></LI
 ><LI
 ><P
->   Auto-detection and re-reading of config file changes.
+>   Multi-threaded (POSIX and native threads).
   </P
 ></LI
 ><LI
 ><P
->   User-customizable HTML templates (e.g. 404 error page).
+>   User-customizable HTML templates for all proxy-generated pages (e.g. "blocked" page).
   </P
 ></LI
 ><LI
 ><P
->   Improved cookie management features (e.g. session based cookies).
+>   Auto-detection and re-reading of config file changes.
   </P
 ></LI
 ><LI
@@ -318,14 +331,13 @@ CLASS="QUOTE"
 ></LI
 ><LI
 ><P
->   Builds from source on most UNIX-like systems. Packages available for: Linux
-   (RedHat, SuSE, or Debian), Windows, Sun Solaris, Mac OSX, OS/2, HP-UX 11 and AmigaOS.
- 
+>   Every feature now controllable on a per-site or per-location basis, configuration
+   more powerful and versatile over-all.
   </P
 ></LI
 ><LI
 ><P
->   In addition, the configuration is much more powerful and versatile over-all.
+>   Many smaller new features added, limitations and bugs removed, and security holes fixed.
   </P
 ></LI
 ></UL
@@ -404,7 +416,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN123"
+NAME="AEN117"
 >1.6. How does <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
@@ -458,7 +470,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN135"
+NAME="AEN129"
 >1.7. Can <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
@@ -479,7 +491,7 @@ CLASS="APPLICATION"
  includes tools to help identify these types of situations so they can be
  addressed as needed, allowing you to customize your installation.
  (<A
-HREF="trouble.html#AEN645"
+HREF="trouble.html#AEN578"
 >See the Troubleshooting section below</A
 >.)</P
 ></DIV
@@ -537,8 +549,15 @@ CLASS="APPLICATION"
 >Privoxy</SPAN
 > is licensed under the GNU General Public
   License (GPL). It is free to use, copy, modify or distribute as you wish
-  under the terms of this license.  Please see the Copyright section for more
-  information on the license and copyright.
+  under the terms of this license.  Please see the <A
+HREF="copyright.html"
+>Copyright</A
+> section for more information on the
+  license and copyright. Or the <TT
+CLASS="FILENAME"
+>LICENSE</TT
+> file 
+  that should be included.
 
   </P
 ><P