Sync with source.

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

diff --git a/doc/webserver/faq/general.html b/doc/webserver/faq/general.html
index de198e6..9a1eb46 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="AEN42"
 >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,12 +253,23 @@ NAME="FEATURES"
 ><UL
 ><LI
 ><P
->   Integrated browser based configuration and control utility (<A
-HREF="http://p.p"
+>  FIXME: complete the list of features. change the order: most important
+  features to the top of the list. prefix new features with "NEW".
+  </P
+></LI
+><LI
+><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
@@ -260,7 +279,7 @@ TARGET="_top"
 ></LI
 ><LI
 ><P
->   HTTP/1.1 compliant (most, but not all 1.1 features are supported).
+>   HTTP/1.1 compliant (but not all optional 1.1 features are supported).
   </P
 ></LI
 ><LI
@@ -281,14 +300,12 @@ TARGET="_top"
    invisible <SPAN
 CLASS="QUOTE"
 >"web-bugs"</SPAN
->, JavaScript, pop-ups, status bar abuse,
-   etc.)
+>, JavaScript and HTML annoyances, pop-ups, etc.)
   </P
 ></LI
 ><LI
 ><P
 >   Bypass many click-tracking scripts (avoids script redirection).
- 
   </P
 ></LI
 ><LI
@@ -318,14 +335,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 +420,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN123"
+NAME="AEN122"
 >1.6. How does <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
@@ -458,7 +474,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN135"
+NAME="AEN134"
 >1.7. Can <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
@@ -479,7 +495,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#AEN570"
 >See the Troubleshooting section below</A
 >.)</P
 ></DIV