Catch up on recent source changes.

[privoxy.git] / doc / webserver / user-manual / upgradersnote.html

diff --git a/doc/webserver/user-manual/upgradersnote.html b/doc/webserver/user-manual/upgradersnote.html
index 087a7b7..3fc7d24 100644 (file)
--- a/doc/webserver/user-manual/upgradersnote.html
+++ b/doc/webserver/user-manual/upgradersnote.html
@@ -71,63 +71,78 @@ CLASS="SECT1"
 CLASS="SECT1"
 ><A
 NAME="UPGRADERSNOTE"
->4. Note to Upgraders</A
+>3. Note to Upgraders</A
 ></H1
 ><P
-> There are very significant changes from older versions of 
+> There are very significant changes from earlier 
  <SPAN
 CLASS="APPLICATION"
 >Junkbuster</SPAN
-> to the current
+> versions to the current
  <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
->. Configuration is substantially 
- changed. <SPAN
+>. The number, names, syntax, and
+ purposes of configuration files have substantially  changed.
+ <SPAN
 CLASS="APPLICATION"
 >Junkbuster 2.0.x</SPAN
-> and earlier 
- configuration files will not migrate. The functionality of the old
- <TT
+> configuration
+ files will not migrate, <SPAN
+CLASS="APPLICATION"
+>Junkbuster 2.9.x</SPAN
+>
+ and <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> configurations will need to be
+ ported. The functionalities of the old <TT
 CLASS="FILENAME"
 >blockfile</TT
->, <TT
+>,
+ <TT
 CLASS="FILENAME"
 >cookiefile</TT
-> and
- <TT
+> and <TT
 CLASS="FILENAME"
 >imagelist</TT
->, are now combined into the
- <SPAN
+> 
+ are now combined into the <A
+HREF="actions-file.html"
+><SPAN
 CLASS="QUOTE"
->"actions files"</SPAN
->.  <TT
+>"actions
+ files"</SPAN
+></A
+>.  
+ <TT
 CLASS="FILENAME"
 >default.action</TT
->, 
- is the main actions file. Local exceptions should best be put into 
- <TT
+>, is the main actions file. Local
+ exceptions should best be put into <TT
 CLASS="FILENAME"
 >user.action</TT
 >.</P
 ><P
-> A <SPAN
+> A <A
+HREF="filter-file.html"
+><SPAN
 CLASS="QUOTE"
 >"filter file"</SPAN
-> (typically <TT
+></A
+> (typically
+ <TT
 CLASS="FILENAME"
 >default.filter</TT
->)
- is new as of <SPAN
+>) is new as of <SPAN
 CLASS="APPLICATION"
->Privoxy 2.9.x</SPAN
->, and provides some
- of the new sophistication (explained below). <TT
+>Privoxy
+ 2.9.x</SPAN
+>, and provides some of the new sophistication (explained
+ below). <TT
 CLASS="FILENAME"
 >config</TT
-> is 
- much the same as before.</P
+> is much the same as before.</P
 ><P
 > If upgrading from a 2.0.x version, you will have to use the new config 
  files, and possibly adapt any personal rules from your older files.
@@ -182,17 +197,17 @@ CLASS="APPLICATION"
 ></LI
 ><LI
 ><P
->   The primary configuration file for cookie management, ad and banner 
+>   The primary configuration files for cookie management, ad and banner 
    blocking, and many other aspects of <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
 >
-   configuration is in the <SPAN
-CLASS="QUOTE"
->"actions"</SPAN
-> files. It is strongly
-   recommended to become familiar with the new actions concept below, 
-   before modifying these files. Locally defined rules 
+   configuration are the <A
+HREF="actions-file.html"
+>actions
+   files</A
+>. It is strongly recommended to become familiar with the new
+   actions concept below, before modifying these files. Locally defined rules 
    should go into <TT
 CLASS="FILENAME"
 >user.action</TT