Privoxy Man page

@@ -73,7 +62,8 @@ body {
4.2.1. Comment, Comment, Comment

Explanation:
Explanation:
Comment as much as possible without commenting the obvious. For example do not comment "variable_a is equal to variable_b". Instead @@ -88,9 +78,9 @@ body { comment describes something different than what the code is doing then maybe a programming error is occurring.
Example:
Example:
- +
@@ -119,7 +109,8 @@ is actually being done.
         4.2.2. Use blocks for
         comments
 
-        Explanation:
+        Explanation:
 
         Comments can help or they can clutter. They help when they are
         differentiated from the code they describe. One line comments do not
@@ -127,9 +118,9 @@ is actually being done.
         identifiers do, by surrounding the code with a clear, definable
         pattern.
 
-        Example:
+        Example:
 
-        
+        

           
             
               @@ -158,7 +149,8 @@ if ( this_variable == that_variable ) /* this may not either */
           
         
 
-        Exception:
+        Exception:
 
         If you are trying to add a small logic comment and do not wish to
         "disrupt" the flow of the code, feel free to use a 1 line comment
@@ -169,7 +161,8 @@ if ( this_variable == that_variable ) /* this may not either */
         
4.2.3. Keep Comments on their
         own line
 
-        Explanation:
+        Explanation:
 
         It goes back to the question of readability. If the comment is on
         the same line as the code it will be harder to read than the comment
@@ -179,9 +172,9 @@ if ( this_variable == that_variable ) /* this may not either */
         freely and often: during the definition of variables, at the end of
         closing braces, when used to comment parameters.
 
-        Example:
+        Example:
 
-        
+        

           
             
               @@ -229,7 +222,8 @@ short do_something_very_important(
         4.2.4. Comment each logical
         step
 
-        Explanation:
+        Explanation:
 
         Logical steps should be commented to help others follow the intent
         of the written code and comments will make the code more
@@ -246,7 +240,8 @@ short do_something_very_important(
         
4.2.5. Comment All Functions
         Thoroughly
 
-        Explanation:
+        Explanation:
 
         A reader of the code should be able to look at the comments just
         prior to the beginning of a function and discern the reason for its
@@ -265,7 +260,8 @@ short do_something_very_important(
         
4.2.6. Comment at the end of
         braces if the content is more than one screen length
 
-        Explanation:
+        Explanation:
 
         Each closing brace should be followed on the same line by a
         comment that describes the origination of the brace if the original
@@ -279,9 +275,9 @@ short do_something_very_important(
         
use following a closing brace: } /* -END- if() or while () or
         etc... */
 
-        Example:
+        Example:
 
-        
+        

           
             
               @@ -312,7 +308,8 @@ if ( 1 == X )
         4.3.1. Variable
         Names
 
-        Explanation:
+        Explanation:
 
         Use all lowercase, and separate words via an underscore ('_'). Do
         not start an identifier with an underscore. (ANSI C reserves these
@@ -320,9 +317,9 @@ if ( 1 == X )
         which are reserved in ANSI C++. (E.g. template, class, true, false,
         ...). This is in case we ever decide to port Privoxy to C++.
 
-        Example:
+        Example:
 
-        
+        

           
             
               @@ -332,9 +329,10 @@ int ms_iis5_hack = 0;
           
         
 
-        Instead of:
+        Instead
+        of:
 
-        
+        

           
             
               @@ -349,7 +347,8 @@ int msiis5hack = 0; int msIis5Hack = 0;
         4.3.2. Function
         Names
 
-        Explanation:
+        Explanation:
 
         Use all lowercase, and separate words via an underscore ('_'). Do
         not start an identifier with an underscore. (ANSI C reserves these
@@ -357,9 +356,9 @@ int msiis5hack = 0; int msIis5Hack = 0;
         which are reserved in ANSI C++. (E.g. template, class, true, false,
         ...). This is in case we ever decide to port Privoxy to C++.
 
-        Example:
+        Example:
 
-        
+        

           
             
               @@ -369,9 +368,10 @@ int load_some_file( struct client_state *csp )
           
         
 
-        Instead of:
+        Instead
+        of:
 
-        
+        

           
             
               @@ -387,15 +387,16 @@ int loadSomeFile( struct client_state *csp )
         4.3.3. Header file
         prototypes
 
-        Explanation:
+        Explanation:
 
         Use a descriptive parameter name in the function prototype in
         header files. Use the same parameter name in the header file that you
         use in the c file.
 
-        Example:
+        Example:
 
-        
+        

           
             
               @@ -406,9 +407,10 @@ int loadSomeFile( struct client_state *csp )
           
         
 
-        Instead of:
+        Instead
+        of:
 
-        
+        

           
             
               @@ -425,15 +427,16 @@ int loadSomeFile( struct client_state *csp )
         4.3.4. Enumerations, and
         #defines
 
-        Explanation:
+        Explanation:
 
         Use all capital letters, with underscores between words. Do not
         start an identifier with an underscore. (ANSI C reserves these for
         use by the compiler and system headers.)
 
-        Example:
+        Example:
 
-        
+        

           
             
               @@ -444,14 +447,14 @@ int loadSomeFile( struct client_state *csp )
           
         
 
-        Note: We have a standard
-        naming scheme for #defines that toggle a feature in the preprocessor:
-        FEATURE_>, where > is a short (preferably 1 or 2 word)
-        description.
+        Note: We
+        have a standard naming scheme for #defines that toggle a feature in
+        the preprocessor: FEATURE_>, where > is a short (preferably 1
+        or 2 word) description.
 
-        Example:
+        Example:
 
-        
+        

           
             
               @@ -469,7 +472,8 @@ int loadSomeFile( struct client_state *csp )
       
         4.3.5. Constants
 
-        Explanation:
+        Explanation:
 
         Spell common words out entirely (do not remove vowels).
 
@@ -479,9 +483,9 @@ int loadSomeFile( struct client_state *csp )
         Use underscore (_) to separate adjacent acronyms and
         abbreviations. Never terminate a name with an underscore.
 
-        Example:
+        Example:
 
-        
+        

           
             
               @@ -491,9 +495,10 @@ int loadSomeFile( struct client_state *csp )
           
         
 
-        Instead of:
+        Instead
+        of:
 
-        
+        

           
             
               @@ -516,16 +521,17 @@ int loadSomeFile( struct client_state *csp )
         4.4.1. Put braces on a line
         by themselves.
 
-        Explanation:
+        Explanation:
 
         The brace needs to be on a line all by itself, not at the end of
         the statement. Curly braces should line up with the construct that
         they're associated with. This practice makes it easier to identify
         the opening and closing braces for a block.
 
-        Example:
+        Example:
 
-        
+        

           
             
               @@ -538,7 +544,8 @@ if ( this == that )
           
         
 
-        Instead of:
+        Instead
+        of:
 
         if ( this == that ) { ... }
 
@@ -546,18 +553,19 @@ if ( this == that )
 
         if ( this == that ) { ... }
 
-        Note: In the special
-        case that the if-statement is inside a loop, and it is trivial, i.e.
-        it tests for a condition that is obvious from the purpose of the
-        block, one-liners as above may optically preserve the loop structure
-        and make it easier to read.
+        Note: In the
+        special case that the if-statement is inside a loop, and it is
+        trivial, i.e. it tests for a condition that is obvious from the
+        purpose of the block, one-liners as above may optically preserve the
+        loop structure and make it easier to read.
 
-        Status:
+        
Status:
         developer-discretion.
 
-        Example exception:
+        Example
+        exception:
 
-        
+        

           
             
               @@ -578,15 +586,16 @@ while ( more lines are read )
         4.4.2. ALL control
         statements should have a block
 
-        Explanation:
+        Explanation:
 
         Using braces to make a block will make your code more readable and
         less prone to error. All control statements should have a block
         defined.
 
-        Example:
+        Example:
 
-        
+        

           
             
               @@ -600,7 +609,8 @@ if ( this == that )
           
         
 
-        Instead of:
+        Instead
+        of:
 
         if ( this == that ) do_something(); do_something_else();
 
@@ -608,20 +618,20 @@ if ( this == that )
 
         if ( this == that ) do_something();
 
-        Note: The first example
-        in "Instead of" will execute in a manner other than that which the
-        developer desired (per indentation). Using code braces would have
-        prevented this "feature". The "explanation" and "exception" from the
-        point above also applies.
+        Note: The
+        first example in "Instead of" will execute in a manner other than
+        that which the developer desired (per indentation). Using code braces
+        would have prevented this "feature". The "explanation" and
+        "exception" from the point above also applies.
       
 
       
         4.4.3. Do not
         belabor/blow-up boolean expressions
 
-        Example:
+        Example:
 
-        
+        

           
             
               @@ -631,30 +641,32 @@ structure->flag = ( condition );
           
         
 
-        Instead of:
+        Instead
+        of:
 
         if ( condition ) { structure->flag = 1; } else {
         structure->flag = 0; }
 
-        Note: The former is
-        readable and concise. The later is wordy and inefficient. Please
-        assume that any developer new to the project has at least a "good"
-        knowledge of C/C++. (Hope I do not offend by that last comment ...
-        8-)
+        Note: The
+        former is readable and concise. The later is wordy and inefficient.
+        Please assume that any developer new to the project has at least a
+        "good" knowledge of C/C++. (Hope I do not offend by that last comment
+        ... 8-)
       
 
       
         4.4.4. Use white space
         freely because it is free
 
-        Explanation:
+        Explanation:
 
         Make it readable. The notable exception to using white space
         freely is listed in the next guideline.
 
-        Example:
+        Example:
 
-        
+        

           
             
               @@ -676,7 +688,8 @@ first_value = old_value + ( ( some_value - another_value ) - whatever )
         4.4.5. Don't use white space
         around structure operators
 
-        Explanation:
+        Explanation:
 
         - structure pointer operator ( "->" ) - member operator ( "." )
         - functions and parentheses
@@ -685,9 +698,9 @@ first_value = old_value + ( ( some_value - another_value ) - whatever )
         function parentheses next to names. With spaces, the connection
         between the object and variable/function name is not as clear.
 
-        Example:
+        Example:
 
-        
+        

           
             
               @@ -699,17 +712,17 @@ function_name();
           
         
 
-        Instead of: a_struct
-        -> a_member; a_struct . a_member; function_name ();
+        Instead of:
+        a_struct -> a_member; a_struct . a_member; function_name ();
       
 
       
         4.4.6. Make the last brace
         of a function stand out
 
-        Example:
+        Example:
 
-        
+        

           
             
               @@ -729,20 +742,21 @@ int function2( ... )
           
         
 
-        Instead of:
+        Instead
+        of:
 
         int function1( ... ) { ...code... return( ret_code ); } int
         function2( ... ) { }
 
-        Note: Use 1 blank line
-        before the closing brace and 2 lines afterward. This makes the end of
-        function standout to the most casual viewer. Although function
-        comments help separate functions, this is still a good coding
-        practice. In fact, I follow these rules when using blocks in "for",
-        "while", "do" loops, and long if {} statements too. After all
+        
Note: Use 1
+        blank line before the closing brace and 2 lines afterward. This makes
+        the end of function standout to the most casual viewer. Although
+        function comments help separate functions, this is still a good
+        coding practice. In fact, I follow these rules when using blocks in
+        "for", "while", "do" loops, and long if {} statements too. After all
         whitespace is free!
 
-        Status:
+        
Status:
         developer-discretion on the number of blank lines. Enforced is the
         end of function comments.
       
@@ -751,16 +765,17 @@ int function2( ... )
         4.4.7. Use 3 character
         indentions
 
-        Explanation:
+        Explanation:
 
         If some use 8 character TABs and some use 3 character TABs, the
         code can look *very* ragged. So use 3 character indentions only. If
         you like to use TABs, pass your code through a filter such as "expand
         -t3" before checking in your code.
 
-        Example:
+        Example:
 
-        
+        

           
             
               @@ -798,15 +813,16 @@ int function1( ... )
         4.5.1. Initialize all
         variables
 
-        Explanation:
+        Explanation:
 
         Do not assume that the variables declared will not be used until
         after they have been assigned a value somewhere else in the code.
         Remove the chance of accidentally using an unassigned variable.
 
-        Example:
+        Example:
 
-        
+        

           
             
               @@ -818,12 +834,12 @@ struct *ptr = NULL;
           
         
 
-        Note: It is much easier
-        to debug a SIGSEGV if the message says you are trying to access
-        memory address 00000000 and not 129FA012; or array_ptr[20] causes a
-        SIGSEV vs. array_ptr[0].
+        Note: It is
+        much easier to debug a SIGSEGV if the message says you are trying to
+        access memory address 00000000 and not 129FA012; or array_ptr[20]
+        causes a SIGSEV vs. array_ptr[0].
 
-        Status:
+        
Status:
         developer-discretion if and only if the variable is assigned a value
         "shortly after" declaration.
       
@@ -836,14 +852,15 @@ struct *ptr = NULL;
         4.6.1. Name functions that
         return a boolean as a question.
 
-        Explanation:
+        Explanation:
 
         Value should be phrased as a question that would logically be
         answered as a true or false statement
 
-        Example:
+        Example:
 
-        
+        

           
             
               @@ -860,7 +877,8 @@ is_web_page_blank();
         4.6.2. Always specify a
         return type for a function.
 
-        Explanation:
+        Explanation:
 
         The default return for a function is an int. To avoid ambiguity,
         create a return for a function when the return has a purpose, and
@@ -872,14 +890,15 @@ is_web_page_blank();
         
4.6.3. Minimize function
         calls when iterating by using variables
 
-        Explanation:
+        Explanation:
 
         It is easy to write the following code, and a clear argument can
         be made that the code is easy to understand:
 
-        Example:
+        Example:
 
-        
+        

           
             
               @@ -892,22 +911,22 @@ for ( size_t cnt = 0; cnt < block_list_length(); cnt++ )
           
         
 
-        Note: Unfortunately,
-        this makes a function call for each and every iteration. This
-        increases the overhead in the program, because the compiler has to
-        look up the function each time, call it, and return a value.
-        Depending on what occurs in the block_list_length() call, it might
-        even be creating and destroying structures with each iteration, even
-        though in each case it is comparing "cnt" to the same value, over and
-        over. Remember too - even a call to block_list_length() is a function
-        call, with the same overhead.
+        Note:
+        Unfortunately, this makes a function call for each and every
+        iteration. This increases the overhead in the program, because the
+        compiler has to look up the function each time, call it, and return a
+        value. Depending on what occurs in the block_list_length() call, it
+        might even be creating and destroying structures with each iteration,
+        even though in each case it is comparing "cnt" to the same value,
+        over and over. Remember too - even a call to block_list_length() is a
+        function call, with the same overhead.
 
         Instead of using a function call during the iterations, assign the
         value to a variable, and evaluate using the variable.
 
-        Example:
+        Example:
 
-        
+        

           
             
               @@ -922,16 +941,18 @@ for ( size_t cnt = 0; cnt < len; cnt++ )
           
         
 
-        Exceptions: if the value
-        of block_list_length() *may* change or could *potentially* change,
-        then you must code the function call in the for/while loop.
+        Exceptions:
+        if the value of block_list_length() *may* change or could
+        *potentially* change, then you must code the function call in the
+        for/while loop.
       
 
       
         4.6.4. Pass and Return by
         Const Reference
 
-        Explanation:
+        Explanation:
 
         This allows a developer to define a const pointer and call your
         function. If your function does not have the const keyword, we may
@@ -949,7 +970,8 @@ for ( size_t cnt = 0; cnt < len; cnt++ )
         
4.6.5. Pass and Return by
         Value
 
-        Explanation:
+        Explanation:
 
         Most structures cannot fit onto a normal stack entry (i.e. they
         are not 4 bytes or less). Aka, a function declaration like: int
@@ -964,7 +986,8 @@ for ( size_t cnt = 0; cnt < len; cnt++ )
         
4.6.6. Names of include
         files
 
-        Explanation:
+        Explanation:
 
         Your include statements should contain the file name without a
         path. The path should be listed in the Makefile, using -I as
@@ -973,9 +996,9 @@ for ( size_t cnt = 0; cnt < len; cnt++ )
         path to distinguish their header files from system or other header
         files.
 
-        Example:
+        Example:
 
-        
+        

           
             
               @@ -986,9 +1009,10 @@ for ( size_t cnt = 0; cnt < len; cnt++ )
           
         
 
-        Exception:
+        Exception:
 
-        
+        

           
             
               @@ -999,16 +1023,17 @@ for ( size_t cnt = 0; cnt < len; cnt++ )
           
         
 
-        Note: Please! do not add
-        "-I." to the Makefile without a _very_ good reason. This duplicates
-        the #include "file.h" behavior.
+        Note:
+        Please! do not add "-I." to the Makefile without a _very_ good
+        reason. This duplicates the #include "file.h" behavior.
       
 
       
         4.6.7. Provide multiple
         inclusion protection
 
-        Explanation:
+        Explanation:
 
         Prevents compiler and linker errors resulting from redefinition of
         items.
@@ -1017,9 +1042,9 @@ for ( size_t cnt = 0; cnt < len; cnt++ )
         multiple inclusions of the file. Of course, replace PROJECT_H with
         your file name, with "." Changed to "_", and make it uppercase.
 
-        Example:
+        Example:
 
-        
+        

           
             
               @@ -1037,15 +1062,16 @@ for ( size_t cnt = 0; cnt < len; cnt++ )
         4.6.8. Use `extern "C"` when
         appropriate
 
-        Explanation:
+        Explanation:
 
         If our headers are included from C++, they must declare our
         functions as `extern "C"`. This has no cost in C, but increases the
         potential re-usability of our code.
 
-        Example:
+        Example:
 
-        
+        

           
             
               @@ -1069,14 +1095,15 @@ extern "C"
         4.6.9. Where Possible, Use
         Forward Struct Declaration Instead of Includes
 
-        Explanation:
+        Explanation:
 
         Useful in headers that include pointers to other struct's.
         Modifications to excess header files may cause needless compiles.
 
-        Example:
+        Example:
 
-        
+        

           
             
               @@ -1090,13 +1117,13 @@ extern file_list *xyz;
           
         
 
-        Note: If you declare
-        "file_list xyz;" (without the pointer), then including the proper
-        header file is necessary. If you only want to prototype a pointer,
-        however, the header file is unnecessary.
+        Note: If you
+        declare "file_list xyz;" (without the pointer), then including the
+        proper header file is necessary. If you only want to prototype a
+        pointer, however, the header file is unnecessary.
 
-        Status: Use with
-        discretion.
+        Status: Use
+        with discretion.
       
     
 
@@ -1108,7 +1135,8 @@ extern file_list *xyz;
         4.7.1. Turn on
         warnings
 
-        Explanation
+        Explanation
 
         Compiler warnings are meant to help you find bugs. You should turn
         on as many as possible. With GCC, the switch is "-Wall". Try and fix
@@ -1119,16 +1147,17 @@ extern file_list *xyz;
         
4.7.2. Provide a default
         case for all switch statements
 
-        Explanation:
+        Explanation:
 
         What you think is guaranteed is never really guaranteed. The value
         that you don't think you need to check is the one that someday will
         be passed. So, to protect yourself from the unknown, always have a
         default step in a switch statement.
 
-        Example:
+        Example:
 
-        
+        

           
             
               @@ -1153,27 +1182,28 @@ switch( hash_string( cmd ) )
           
         
 
-        Note: If you already
-        have a default condition, you are obviously exempt from this point.
-        Of note, most of the WIN32 code calls `DefWindowProc' after the
-        switch statement. This API call *should* be included in a default
+        
Note: If you
+        already have a default condition, you are obviously exempt from this
+        point. Of note, most of the WIN32 code calls `DefWindowProc' after
+        the switch statement. This API call *should* be included in a default
         statement.
 
-        Another Note: This is
-        not so much a readability issue as a robust programming issue. The
-        "anomaly code goes here" may be no more than a print to the STDERR
-        stream (as in load_config). Or it may really be an abort
-        condition.
+        Another
+        Note: This is not so much a readability issue as a robust
+        programming issue. The "anomaly code goes here" may be no more than a
+        print to the STDERR stream (as in load_config). Or it may really be
+        an abort condition.
 
-        Status: Programmer
-        discretion is advised.
+        Status:
+        Programmer discretion is advised.
       
 
       
         4.7.3. Try to avoid falling
         through cases in a switch statement.
 
-        Explanation:
+        Explanation:
 
         In general, you will want to have a 'break' statement within each
         'case' of a switch statement. This allows for the code to be more
@@ -1196,23 +1226,25 @@ switch( hash_string( cmd ) )
         
4.7.4. Use 'long' or 'short'
         Instead of 'int'
 
-        Explanation:
+        Explanation:
 
         On 32-bit platforms, int usually has the range of long. On 16-bit
         platforms, int has the range of short.
 
-        Status: open-to-debate.
-        In the case of most FSF projects (including X/GNU-Emacs), there are
-        typedefs to int4, int8, int16, (or equivalence ... I forget the exact
-        typedefs now). Should we add these to IJB now that we have a
-        "configure" script?
+        Status:
+        open-to-debate. In the case of most FSF projects (including
+        X/GNU-Emacs), there are typedefs to int4, int8, int16, (or
+        equivalence ... I forget the exact typedefs now). Should we add these
+        to IJB now that we have a "configure" script?
       
 
       
         4.7.5. Don't mix size_t and
         other types
 
-        Explanation:
+        Explanation:
 
         The type of size_t varies across platforms. Do not make
         assumptions about whether it is signed or unsigned, or about how long
@@ -1225,14 +1257,15 @@ switch( hash_string( cmd ) )
         
4.7.6. Declare each variable
         and struct on its own line.
 
-        Explanation:
+        Explanation:
 
         It can be tempting to declare a series of variables all on one
         line. Don't.
 
-        Example:
+        Example:
 
-        
+        

           
             
               @@ -1244,22 +1277,23 @@ long c = 0;
           
         
 
-        Instead of:
+        Instead
+        of:
 
         long a, b, c;
 
-        Explanation: - there is
-        more room for comments on the individual variables - easier to add
-        new variables without messing up the original ones - when searching
-        on a variable to find its type, there is less clutter to "visually"
-        eliminate
+        Explanation:
+        - there is more room for comments on the individual variables -
+        easier to add new variables without messing up the original ones -
+        when searching on a variable to find its type, there is less clutter
+        to "visually" eliminate
 
-        Exceptions: when you
-        want to declare a bunch of loop variables or other trivial variables;
-        feel free to declare them on one line. You should, although, provide
-        a good comment on their functions.
+        Exceptions:
+        when you want to declare a bunch of loop variables or other trivial
+        variables; feel free to declare them on one line. You should,
+        although, provide a good comment on their functions.
 
-        Status:
+        
Status:
         developer-discretion.
       
 
@@ -1267,7 +1301,8 @@ long c = 0;
         4.7.7. Use malloc/zalloc
         sparingly
 
-        Explanation:
+        Explanation:
 
         Create a local struct (on the stack) if the variable will live and
         die within the context of one function call.
@@ -1275,9 +1310,9 @@ long c = 0;
         Only "malloc" a struct (on the heap) if the variable's life will
         extend beyond the context of one function call.
 
-        Example:
+        Example:
 
-        
+        

           
             
               @@ -1293,7 +1328,8 @@ list, then it should definitely be allocated via `malloc'.
         4.7.8. The Programmer Who
         Uses 'malloc' is Responsible for Ensuring 'free'
 
-        Explanation:
+        Explanation:
 
         If you have to "malloc" an instance, you are responsible for
         insuring that the instance is `free'd, even if the deallocation event
@@ -1303,9 +1339,9 @@ list, then it should definitely be allocated via `malloc'.
         You may need to offer a free/unload/destructor type function to
         accommodate this.
 
-        Example:
+        Example:
 
-        
+        

           
             
               @@ -1316,12 +1352,13 @@ static void unload_re_filterfile( void *f ) { ... }
           
         
 
-        Exceptions:
+        Exceptions:
 
         The developer cannot be expected to provide `free'ing functions
         for C run-time library functions ... such as `strdup'.
 
-        Status:
+        
Status:
         developer-discretion. The "main" use of this standard is for
         allocating and freeing data structures (complex or nested).
       
@@ -1330,23 +1367,25 @@ static void unload_re_filterfile( void *f ) { ... }
         4.7.9. Add loaders to the
         `file_list' structure and in order
 
-        Explanation:
+        Explanation:
 
         I have ordered all of the "blocker" file code to be in alpha
         order. It is easier to add/read new blockers when you expect a
         certain order.
 
-        Note: It may appear that
-        the alpha order is broken in places by POPUP tests coming before PCRS
-        tests. But since POPUPs can also be referred to as KILLPOPUPs, it is
-        clear that it should come first.
+        Note: It may
+        appear that the alpha order is broken in places by POPUP tests coming
+        before PCRS tests. But since POPUPs can also be referred to as
+        KILLPOPUPs, it is clear that it should come first.
       
 
       
         4.7.10. "Uncertain" new code
         and/or changes to existing code, use FIXME or XXX
 
-        Explanation:
+        Explanation:
 
         If you have enough confidence in new code or confidence in your
         changes, but are not *quite* sure of the repercussions, add this:
@@ -1365,10 +1404,10 @@ static void unload_re_filterfile( void *f ) { ... }
         /* FIXME: new code that *may* break something else... */ ...new
         code here...
 
-        Note: If you make it
-        clear that this may or may not be a "good thing (tm)", it will be
-        easier to identify and include in the project (or conversely exclude
-        from the project).
+        Note: If you
+        make it clear that this may or may not be a "good thing (tm)", it
+        will be easier to identify and include in the project (or conversely
+        exclude from the project).
       
     
 
@@ -1376,10 +1415,10 @@ static void unload_re_filterfile( void *f ) { ... }
       4.8. Addendum: Template for
       files and function comment blocks:
 
-      Example for file
-      comments:
+      Example for file
+      comments:
 
-      
+      

         
           
             @@ -1425,21 +1464,22 @@ const char FILENAME_h_rcs[] = FILENAME_H_VERSION;
         
       
 
-      Note: This declares the
-      rcs variables that should be added to the "show-proxy-args" page. If
-      this is a brand new creation by you, you are free to change the
-      "Copyright" section to represent the rights you wish to maintain.
+      Note: This
+      declares the rcs variables that should be added to the
+      "show-proxy-args" page. If this is a brand new creation by you, you are
+      free to change the "Copyright" section to represent the rights you wish
+      to maintain.
 
-      Note: The formfeed
-      character that is present right after the comment flower box is handy
-      for (X|GNU)Emacs users to skip the verbiage and get to the heart of the
-      code (via `forward-page' and `backward-page'). Please include it if you
-      can.
+      Note: The
+      formfeed character that is present right after the comment flower box
+      is handy for (X|GNU)Emacs users to skip the verbiage and get to the
+      heart of the code (via `forward-page' and `backward-page'). Please
+      include it if you can.
 
-      Example for file header
-      comments:
+      Example for file header
+      comments:
 
-      
+      

         
           
             @@ -1507,10 +1547,10 @@ extern const char FILENAME_h_rcs[];
         
       
 
-      Example for function
-      comments:
+      Example for function
+      comments:
 
-      
+      

         
           
             @@ -1538,14 +1578,14 @@ int FUNCTION_NAME( void *param1, const char *x )
         
       
 
-      Note: If we all follow
-      this practice, we should be able to parse our code to create a
-      "self-documenting" web page.
+      Note: If we
+      all follow this practice, we should be able to parse our code to create
+      a "self-documenting" web page.
     
   
 
   
-    
+    
 
     
diff --git a/doc/webserver/developer-manual/contact.html b/doc/webserver/developer-manual/contact.html
index f5d8a0ae..1c5345ef 100644
--- a/doc/webserver/developer-manual/contact.html
+++ b/doc/webserver/developer-manual/contact.html
@@ -14,20 +14,10 @@
   "copyright.html">
   
-  
 
-
+
     

   
 
   
@@ -45,7 +35,7 @@ body {
         "copyright.html" accesskey="N">Next
       
     
-    
+    
   
 
   
@@ -150,8 +140,8 @@ body {
         "_top">http://sourceforge.net/tracker/?group_id=11118&atid=111118.
 
         Before doing so, please make sure that the bug has not already been submitted and observe
-        the additional hints at the top of the not already been submitted
+        and observe the additional hints at the top of the submit form. If already submitted, please feel free
         to add any info to the original report that might help to solve the
@@ -330,7 +320,7 @@ body {
   
 
   
-    
+    
 
     
diff --git a/doc/webserver/developer-manual/copyright.html b/doc/webserver/developer-manual/copyright.html
index 1087509a..ec5c4d2b 100644
--- a/doc/webserver/developer-manual/copyright.html
+++ b/doc/webserver/developer-manual/copyright.html
@@ -13,20 +13,10 @@
   
-  
 
-
+
     

   
   
 
   
@@ -44,7 +34,7 @@ body {
         accesskey="N">Next
       
     
-    
+    
   
 
   
@@ -60,7 +50,7 @@ body {
     "CITETITLE">GNU General Public License.
 
     
-      9.1. License
+      9.1. License
 
       Privoxy is free software; you can
       redistribute it and/or modify it under the terms of the This program is distributed in the hope that it will be useful, but
       WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for details.

+      "_top">GNU General Public License for
+      details.
 
       You should have received a copy of the GNU
       GPL along with this program; if not, write to the
@@ -86,7 +76,7 @@ body {
     

 
     
-      9.2. History
+      9.2. History
 
       A long time ago, there was the 
 
   

-    
+    
 
     
diff --git a/doc/webserver/developer-manual/cvs.html b/doc/webserver/developer-manual/cvs.html
index 5302a34f..0f4226ca 100644
--- a/doc/webserver/developer-manual/cvs.html
+++ b/doc/webserver/developer-manual/cvs.html
@@ -12,20 +12,10 @@
   "documentation.html">
   
-  
 
-
+
     

   
 
   
@@ -43,7 +33,7 @@ body {
         "documentation.html" accesskey="N">Next
       
     
-    
+    
   

 
   
@@ -90,8 +80,8 @@ body {
       (e.g. 3.0.x), a branch is created just for stable series releases (e.g.
       3.0.0 -> 3.0.1 -> 3.0.2, etc). Once the initial stable release of
       any stable branch has taken place, this branch is only used for bugfixes, which have had
-      prior testing before being committed to CVS. (See only used for bugfixes, which
+      have had prior testing before being committed to CVS. (See Version Numbers below for details
       on versioning.)
 
@@ -122,9 +112,10 @@ body {
 
         
           Your commit message should give a concise overview of
-          what you changed (no big
-          details) and why you changed
-          it Just check previous messages for good examples.
+          what you
+          changed (no big details) and why you changed it Just
+          check previous messages for good examples.
         
 
         
@@ -157,7 +148,7 @@ body {
   
 
   
-    
+    
 
     
diff --git a/doc/webserver/developer-manual/documentation.html b/doc/webserver/developer-manual/documentation.html
index a2a6ba2e..7c6895ef 100644
--- a/doc/webserver/developer-manual/documentation.html
+++ b/doc/webserver/developer-manual/documentation.html
@@ -11,21 +11,10 @@
   
-  
 
-
+
     

   
   
 
   
@@ -43,7 +32,7 @@ body {
         accesskey="N">Next
       
     
-    
+    
   
 
   
@@ -56,10 +45,10 @@ body {
     DTD's and the Docbook modular stylesheets (or comparable alternatives),
     and either jade or openjade (recommended) installed in order to build
-    docs from source. Currently there is user-manual, FAQ, and, of
-    course this, the developer-manual in this
+    docs from source. Currently there is user-manual, FAQ, and,
+    of course this, the developer-manual in this
     format. The README, AUTHORS, INSTALL, privoxy.1 (man page), and config
@@ -69,8 +58,9 @@ body {
     "FILENAME">index.html (and a variation on this file, privoxy-index.html, meant for inclusion with doc
     packages), are maintained as SGML as well. DO NOT edit these directly. Edit the SGML
-    source, or contact someone involved in the documentation.
+    "emphasis">DO NOT edit these directly.
+    Edit the SGML source, or contact someone involved in the
+    documentation.
 
     config requires some special handling. The
     reason it is maintained this way is so that the extensive comments in the
@@ -125,9 +115,10 @@ body {
     "FILENAME">doc/webserver/*/*.html) so that those without the ability
     to build them locally, have access to them if needed. This is especially
     important just prior to a new release! Please do this after the $VERSION
-    and other release specific data in configure.in
-    has been updated (this is done just prior to a new release).
+    "emphasis">after the $VERSION and other release specific data in configure.in has been updated (this is done just prior to
+    a new release).
 
     
       3.1. Quickstart to Docbook
@@ -172,65 +163,65 @@ body {
       
-            
+            
-            
+            
-            
+            
-            
+            
-            
-            
-            
+            
-            
-            
+            
-            
+            
         
           <para></para>,
-            paragraph delimiter. Most text needs to be within paragraph
-            elements (there are some exceptions). <para></para>, paragraph
+            delimiter. Most text needs to be within paragraph elements (there
+            are some exceptions).
           
 
           <emphasis></emphasis>,
-            the stylesheets make this italics. <emphasis></emphasis>, the
+            stylesheets make this italics.
           
 
           <filename></filename>,
-            files and directories. <filename></filename>, files
+            and directories.
           
 
           <command></command>,
-            command examples. <command></command>, command
+            examples.
           
 
           <literallayout></literallayout>,
+            <literallayout></literallayout>,
             like <pre>, more or less.
           
 
           <itemizedlist></itemizedlist>,
+            <itemizedlist></itemizedlist>,
             list with bullets.
           
 
           <listitem></listitem>,
-            member of the above. <listitem></listitem>, member
+            of the above.
           
 
           <screen></screen>,
-            screen output, implies <screen></screen>, screen
+            output, implies <literallayout>.
           
 
           <ulink
-            url="example.com"></ulink>, like HTML <a> tag. <ulink
+            url="example.com"></ulink>, like HTML
+            <a> tag.
           
 
           <quote></quote>, for,
-            doh, quoting text. <quote></quote>, for, doh,
+            quoting text.
           
         
       
@@ -260,9 +251,9 @@ body {
         
 
         
-          Tags delimiting a block of text (even small blocks)
-          should be on their own line. Like:
+          Tags delimiting a block of text (even small blocks) should be
+          on their own line. Like:
 
            <para>

             Some text goes here.

@@ -357,9 +348,9 @@ body {
       with generic text, that is used by multiple docs. This way we can write
       something once, and use it repeatedly without having to re-write the
       same content over and over again. If editing such a file, keep in mind
-      that it should be generic.
-      That is the purpose; so it can be used in varying contexts without
-      additional modifications.
+      that it should be generic. That is the purpose; so it can be used
+      in varying contexts without additional modifications.
 
       We are also using what Docbook
       calls "internal entities". These are like
@@ -394,33 +385,36 @@ body {
           
-                
+                
-                
-                
+                
-                
+                
-                
+                
             
               p-version: the
-                Privoxy version string, e.g.
-                "3.0.20". p-version: the Privoxy version string, e.g.
+                "3.0.19".
               
 
               p-status: the
-                project status, either "alpha",
-                "beta", or p-status: the project status, either
+                "alpha", "beta", or "stable".
               
 
               p-not-stable:
-                use to conditionally include text in "not
-                stable" releases (e.g. "beta"). p-not-stable: use to conditionally
+                include text in "not stable"
+                releases (e.g. "beta").
               
 
               p-stable: just
-                the opposite. p-stable: just the opposite.
               
 
               p-text: this
-                doc is only generated as text. p-text: this doc is only generated as
+                text.
               
             
           
@@ -433,7 +427,7 @@ body {
   

 
   
-    
+    
 
     
diff --git a/doc/webserver/developer-manual/index.html b/doc/webserver/developer-manual/index.html
index 29fdc718..cb1fc2fa 100644
--- a/doc/webserver/developer-manual/index.html
+++ b/doc/webserver/developer-manual/index.html
@@ -9,20 +9,10 @@
   
-  
 
-
+
     
       Privoxy Developer
@@ -32,33 +22,35 @@ body {
       2001-2009 by Privoxy
       Developers

 
-      $Id: developer-manual.sgml,v 2.39 2012/03/18
-      01:16:35 diem Exp $

-
-      
-        
-
-        The developer manual provides guidance on coding, testing,
-        packaging, documentation and other issues of importance to those
-        involved with Privoxy development.
-        It is mandatory (and helpful!) reading for anyone who wants to join
-        the team. Note that it's currently out of date and may not be
-        entirely correct. As always, patches are welcome.
-
-        Please note that this document is constantly evolving. This copy
-        represents the state at the release of version 3.0.20. You can find
-        the latest version of the this manual at http://www.privoxy.org/developer-manual/. Please see
-        the Contact section on how to contact the
-        developers.
+      $Id: developer-manual.sgml,v 2.38 2011/12/26
+      17:05:40 fabiankeil Exp $

+
+      
+        
+          
+
+          The developer manual provides guidance on coding, testing,
+          packaging, documentation and other issues of importance to those
+          involved with Privoxy development.
+          It is mandatory (and helpful!) reading for anyone who wants to join
+          the team. Note that it's currently out of date and may not be
+          entirely correct. As always, patches are welcome.
+
+          Please note that this document is constantly evolving. This copy
+          represents the state at the release of version 3.0.19. You can find
+          the latest version of the this manual at http://www.privoxy.org/developer-manual/. Please see
+          the Contact section on how to contact
+          the developers.
+        
       
       
     
 
     
       
-        Table of Contents
+        Table of Contents
 
         1. Introduction
 
@@ -365,9 +357,9 @@ body {
 
         
           
-            9.1. License
+            9.1. License
 
-            9.2. History
+            9.2. History
           
         
 
@@ -377,7 +369,7 @@ body {
   
 
   
-    
+    
 
     

   
   
 
   
diff --git a/doc/webserver/developer-manual/introduction.html b/doc/webserver/developer-manual/introduction.html
index 1dd4bda1..d92ad406 100644
--- a/doc/webserver/developer-manual/introduction.html
+++ b/doc/webserver/developer-manual/introduction.html
@@ -11,19 +11,10 @@
   
-  
 
-
+
     

   
   
 
   
@@ -41,7 +32,7 @@ body {
         accesskey="N">Next
       
     
-    
+    
   
 
   
@@ -84,7 +75,7 @@ body {
   
 
   
-    
+    
 
     
diff --git a/doc/webserver/developer-manual/newrelease.html b/doc/webserver/developer-manual/newrelease.html
index ea1df347..af9aae3b 100644
--- a/doc/webserver/developer-manual/newrelease.html
+++ b/doc/webserver/developer-manual/newrelease.html
@@ -11,23 +11,10 @@
   
-  
 
-
+
     

   
   
 
   
@@ -45,7 +32,7 @@ body {
         "webserver-update.html" accesskey="N">Next
       
     
-    
+    
   
 
   
@@ -121,9 +108,9 @@ body {
           being committed. Stable branches will then have their version
           reported as 0.0.0, during that period
           between releases when changes are being added. This is to denote
-          that this code is not for
-          release. Then as the release nears, the version is bumped
-          according: e.g. 3.0.1 -> 0.0.0 ->
+          that this code is not
+          for release. Then as the release nears, the version is
+          bumped according: e.g. 3.0.1 -> 0.0.0 ->
           3.0.2.
         
       
@@ -140,15 +127,15 @@ body {
       -> 3.0.1 -> 3.0.2, etc are all stable releases from within the
       stable branch. 3.1.x is currently the main trunk, and where work on
       3.2.x is taking place. If any questions, please post to the devel list
-      before committing to a stable
-      branch!
+      before committing
+      to a stable branch!
 
       Developers should remember too that if they commit a bugfix to the
       stable branch, this will more than likely require a separate submission
       to the main trunk, since these are separate development trees within
       CVS. If you are working on both, then this would require at least two
-      separate check outs (i.e main trunk, and the stable release branch, which is
+      separate check outs (i.e main trunk, and the stable release branch, which is
       v_3_0_branch at the moment).
     

 
@@ -156,8 +143,8 @@ body {
       6.2.
       Before the Release: Freeze
 
-      The following must be done by one
-      of the developers prior to each new release.
+      The following must be
+      done by one of the developers prior to each new release.
 
       
         
@@ -179,7 +166,7 @@ body {
           last release (i.e. software release or standalone actions file
           release), bump up its version info to A.B in this line:
 
-          
+          

             
               
                 @@ -226,8 +213,8 @@ body {
         
 
         
-          Commit all files that were
-          changed in the above steps!
+          Commit all files that
+          were changed in the above steps!
         
 
         
@@ -263,13 +250,13 @@ body {
       GPL reasons the first package to be released is always the source
       tarball.
 
-      For all types of packages,
-      including the source tarball, you
-      must make sure that you build from clean sources by exporting the right
-      version from CVS into an empty directory (just press return when
-      asked for a password):
+      For all types
+      of packages, including the source tarball, you must make sure that you build from
+      clean sources by exporting the right version from CVS into an empty
+      directory (just press return when asked for a password):
 
-      
+      

         
           
             @@ -282,15 +269,16 @@ body {
         
       
 
-      Do NOT change a single
-      bit, including, but not limited to version information after export
-      from CVS. This is to make sure that all release packages, and with
-      them, all future bug reports, are based on exactly the same code.
+      Do NOT change
+      a single bit, including, but not limited to version information after
+      export from CVS. This is to make sure that all release packages, and
+      with them, all future bug reports, are based on exactly the same
+      code.
 
       
         
-            
+            
@@ -315,16 +303,16 @@ body {
         "PACK-GUIDELINES">6.3.1. Note on Privoxy PackagingPlease keep these general guidelines in mind when putting together
-        your package. These apply to all platforms!
+        your package. These apply to all platforms!

           
             Privoxy requires write access to: all
-            *.action files, all logfiles, and the
-            trust file. You will need to determine
-            the best way to do this for your platform.
+            "emphasis">requires write access
+            to: all *.action files, all logfiles,
+            and the trust file. You will need to
+            determine the best way to do this for your platform.
           
 
           
@@ -448,11 +436,12 @@ body {
         6.3.2. Source Tarball
 
-        First, make sure that you have
-        freshly exported the right version into an empty directory.
-        (See "Building and releasing packages" above). Then run:
+        First, make sure that
+        you have freshly exported the right version into an empty
+        directory. (See "Building and releasing packages" above).
+        Then run:
 
-        

           Warning Warning
           
 
           
 
         
 
         
+        

           
             
               @@ -465,7 +454,7 @@ body {
 
         Then do:
 
-        
+        

           
             
               @@ -477,7 +466,7 @@ body {
 
         To upload the package to Sourceforge, simply issue
 
-        
+        

           
             
               @@ -496,29 +485,31 @@ body {
         6.3.3.
         SuSE, Conectiva or Red Hat RPM
 
-        In following text, replace dist
-        with either "rh" for Red Hat or
-        "suse" for SuSE.
+        In following text, replace dist with either "rh" for Red Hat or "suse"
+        for SuSE.
 
-        First, make sure that you have
-        freshly exported the right version into an empty directory.
-        (See "Building and releasing packages" above).
+        First, make sure that
+        you have freshly exported the right version into an empty
+        directory. (See "Building and releasing packages"
+        above).
 
         As the only exception to not changing anything after export from
         CVS, now examine the file privoxy-dist.spec
+        "FILENAME">privoxy-dist.spec
         and make sure that the version information and the RPM release number
         are correct. The RPM release numbers for each version start at one.
         Hence it must be reset to one if this is the first RPM for dist which is built from version X.Y.Z. Check
-        the dist which is built from version X.Y.Z.
+        Check the file list if unsure. Else, it must be set to the highest
         already available RPM release number for that version plus one.
 
         Then run:
 
-        
+        

           
             
               @@ -531,11 +522,11 @@ body {
 
         Then do
 
-        
+        
@@ -543,19 +534,19 @@ body {
 
         To upload the package to Sourceforge, simply issue
 
-        
           
             
               -  make dist-dist
+  make dist-dist
 
             
           
+        

           
             
               -  make dist-upload rpm_packagerev
+  make dist-upload rpm_packagerev
 
             
           
         
 
-        where rpm_packagerev is the RPM
-        release number as determined above. Go to the displayed URL and
+        
where rpm_packagerev is the
+        RPM release number as determined above. Go to the displayed URL and
         release the file publicly on Sourceforge. Use the release notes and
         change log from the source tarball package.
       
@@ -564,12 +555,12 @@ body {
         6.3.4.
         OS/2
 
-        First, make sure that you have
-        freshly exported the right version into an empty directory.
-        (See "Building and releasing packages" above). Then get the OS/2
-        Setup module:
+        First, make sure that
+        you have freshly exported the right version into an empty
+        directory. (See "Building and releasing packages" above).
+        Then get the OS/2 Setup module:
 
-        
+        

           
             
               @@ -592,7 +583,7 @@ body {
         directory. Edit the os2build.cmd file to set the final executable
         filename. For example,
 
-        
+        

           
             
               @@ -606,7 +597,7 @@ body {
         release number matches in the PACKAGEID
         section:
 
-        
+        

           
             
               @@ -618,7 +609,7 @@ body {
 
         You're now ready to build. Run:
 
-        
+        

           
             
               @@ -641,7 +632,7 @@ body {
 
         Login to Sourceforge's compilefarm via ssh:
 
-        
+        

           
             
               @@ -652,11 +643,12 @@ body {
         
 
         Choose the right operating system (not the Debian one). When
-        logged in, make sure that you have
-        freshly exported the right version into an empty directory.
-        (See "Building and releasing packages" above). Then run:
+        logged in, make sure that
+        you have freshly exported the right version into an empty
+        directory. (See "Building and releasing packages" above).
+        Then run:
 
-        
+        

           
             
               @@ -669,7 +661,7 @@ body {
 
         Then run
 
-        
+        

           
             
               @@ -695,12 +687,12 @@ body {
         "_top">http://www.cygwin.com/). Run the following commands from
         within a Cygwin bash shell.
 
-        First, make sure that you have
-        freshly exported the right version into an empty directory.
-        (See "Building and releasing packages" above). Then get the Windows
-        setup module:
+        First, make sure that
+        you have freshly exported the right version into an empty
+        directory. (See "Building and releasing packages" above).
+        Then get the Windows setup module:
 
-        
+        

           
             
               @@ -714,7 +706,7 @@ body {
         controlled by winsetup/GNUmakefile. All you
         need to do is:
 
-        
+        

           
             
               @@ -736,17 +728,17 @@ body {
         6.3.7. Debian
 
-        First, make sure that you have
-        freshly exported the right version into an empty directory.
-        (See "Building and releasing packages" above). Then add a log entry
-        to debian/changelog, if it is not already
-        there, for example by running:
+        First, make sure that
+        you have freshly exported the right version into an empty
+        directory. (See "Building and releasing packages" above).
+        Then add a log entry to debian/changelog,
+        if it is not already there, for example by running:
 
-        
+        
@@ -754,7 +746,7 @@ body {
 
         Then, run:
 
-        
           
             
               -  debchange -v 3.0.20-UNRELEASED-1 "New upstream version"
+  debchange -v 3.0.19-stable-1 "New upstream version"
 
             
           
+        

           
             
               @@ -765,10 +757,10 @@ body {
         
 
         This will create ../privoxy_3.0.20-UNRELEASED-1_i386.deb which can be
+        "FILENAME">../privoxy_3.0.19-stable-1_i386.deb which can be
         uploaded. To upload the package to Sourceforge, simply issue
 
-        
+        

           
             
               @@ -783,135 +775,61 @@ body {
         6.3.8. Mac OS X
 
-        First, make sure that you have
-        freshly exported the right version into an empty directory.
-        (See "Building and releasing packages" above).
+        First, make sure that
+        you have freshly exported the right version into an empty
+        directory. (See "Building and releasing packages" above).
+        Then get the Mac OS X setup module:
 
-        There are three modules available in the CVS repository for use on
-        Mac OS X, though technically only two of them generate a release (the
-        other can be used to install from source).
-
-        
-          6.3.8.1. OSXPackageBuilder
-          module
-
-          The OSXPackageBuilder module generates OS X installer packages
-          supporting all Macs running OS X 10.4 and above. Obtain it from CVS
-          as follows into a folder parallel to the exported privoxy
-          source:
-
-          
-            
-              
-            
-          
-                -  cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co OSXPackageBuilder
-
-              
-
-          The module contains complete instructions on its usage in the
-          file OS X Package Builder HOWTO.txt.
-
-          Once the package(s) have been generated, you can then upload
-          them directly to the Files section of the Sourceforge project in
-          the Macintosh (OS X) folder. Each new version release of Privoxy
-          should have a new subfolder created in which to store its files.
-          Please ensure that the folder contains a readme file that makes it
-          clear which package is for whichversion of OS X.
-        
-
-        
-          6.3.8.2. osxsetup module
-          (DEPRECATED)
-
-          This module is deprecated
-          since the installer it generates places all Privoxy files in one
-          folder in a non-standard location, and supports only Intel Macs
-          running OS X 10.6 or higher.
-
-          Check out the module from CVS as follows into a folder parallel
-          to the exported privoxy source:
-
-          
-            
-              
+          
+        
-                +        
+          
+            
-            
-          
+                 cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co osxsetup
 
-              
+            
 
-          Then run:
+        Then run:
 
-          
-            
-              
+          
+        
-                +        
+          
+            
-            
-          
+                 cd osxsetup
   build
 
-              
+            
 
-          This will run autoheader, autoconf and configure as
-          well as make. Finally, it will copy over
-          the necessary files to the ./osxsetup/files directory for further
-          processing by PackageMaker.
+        This will run autoheader, autoconf and configure as
+        well as make. Finally, it will copy over
+        the necessary files to the ./osxsetup/files directory for further
+        processing by PackageMaker.
 
-          Bring up PackageMaker with the PrivoxyPackage.pmsp definition
-          file, modify the package name to match the release, and hit the
-          "Create package" button. If you specify ./Privoxy.pkg as the output
-          package name, you can then create the distributable zip file with
-          the command:
+        Bring up PackageMaker with the PrivoxyPackage.pmsp definition
+        file, modify the package name to match the release, and hit the
+        "Create package" button. If you specify ./Privoxy.pkg as the output
+        package name, you can then create the distributable zip file with the
+        command:
 
-          
-            
-              
+          
+        
-                +        
+          
+            
-            
-          
+                 zip -r privoxyosx_setup_x.y.z.zip Privoxy.pkg
 
-              
-
-          You can then upload this file directly to the Files section of
-          the Sourceforge project in the Macintosh (OS X) folder. Each new
-          version release of Privoxy should have a new subfolder created in
-          which to store its files. Please ensure that the folder contains a
-          readme file that makes it clear which version(s) of OS X the
-          package supports.
-        
-
-        
-          6.3.8.3. macsetup module
-
-          The macsetup module is ideal if you wish to build and install
-          Privoxy from source on a single machine.
-
-          Check out the module from CVS as follows into a folder parallel
-          to the exported privoxy source:
-
-          
-            
-              
-            
-          
-                -  cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co macsetup
-
-              
+            
 
-          The module contains complete instructions on its usage in its
-          README file. The end result will be the
-          the exported version of Privoxy installed on the build machine.
-        
+        You can then upload privoxyosx_setup_x.y.z.zip anonymously to uploads.sourceforge.net/incoming, create a release
+        for it, and you're done. Use the release notes and Change Log from
+        the source tarball package.
       
 
       
@@ -920,7 +838,7 @@ body {
 
         Login to Sourceforge's compile-farm via ssh:
 
-        
+        

           
             
               @@ -931,11 +849,11 @@ body {
         
 
         Choose the right operating system. When logged in, make sure that you have freshly exported the
-        right version into an empty directory. (See "Building and
-        releasing packages" above). Then run:
+        "emphasis">make sure that you have freshly
+        exported the right version into an empty directory. (See
+        "Building and releasing packages" above). Then run:
 
-        
+        

           
             
               @@ -948,7 +866,7 @@ body {
 
         Then run:
 
-        
+        

           
             
               @@ -969,11 +887,12 @@ body {
         6.3.10. HP-UX 11
 
-        First, make sure that you have
-        freshly exported the right version into an empty directory.
-        (See "Building and releasing packages" above). Then run:
+        First, make sure that
+        you have freshly exported the right version into an empty
+        directory. (See "Building and releasing packages" above).
+        Then run:
 
-        
+        

           
             
               @@ -991,11 +910,12 @@ body {
         6.3.11. Amiga OS
 
-        First, make sure that you have
-        freshly exported the right version into an empty directory.
-        (See "Building and releasing packages" above). Then run:
+        First, make sure that
+        you have freshly exported the right version into an empty
+        directory. (See "Building and releasing packages" above).
+        Then run:
 
-        
+        

           
             
               @@ -1015,7 +935,7 @@ body {
 
         Login to Sourceforge's compilefarm via ssh:
 
-        
+        

           
             
               @@ -1026,11 +946,11 @@ body {
         
 
         Choose the right operating system. When logged in, make sure that you have freshly exported the
-        right version into an empty directory. (See "Building and
-        releasing packages" above). Then run:
+        "emphasis">make sure that you have freshly
+        exported the right version into an empty directory. (See
+        "Building and releasing packages" above). Then run:
 
-        
+        

           
             
               @@ -1043,7 +963,7 @@ body {
 
         Then run:
 
-        
+        

           
             
               @@ -1095,7 +1015,7 @@ body {
       column, and click Add Release. You will then
       need to create a new release for your package, using the format of
       $VERSION ($CODE_STATUS), e.g. 3.0.20 (beta).
+      "emphasis">3.0.19 (beta).
 
       Now just follow the prompts. Be sure to add any appropriate Release
       notes. You should see your freshly uploaded packages in 
 
   

-    
+    
 
     
diff --git a/doc/webserver/developer-manual/seealso.html b/doc/webserver/developer-manual/seealso.html
index 961a86a8..b5917a8f 100644
--- a/doc/webserver/developer-manual/seealso.html
+++ b/doc/webserver/developer-manual/seealso.html
@@ -11,19 +11,10 @@
   "copyright.html">
   
-  
 
-
+
     

   
 
   
@@ -40,7 +31,7 @@ body {
          
       
     
-    
+    
   
 
   
@@ -173,7 +164,7 @@ body {
   
 
   
-    
+    
 
     
diff --git a/doc/webserver/developer-manual/testing.html b/doc/webserver/developer-manual/testing.html
index 20ebe03a..7433caa0 100644
--- a/doc/webserver/developer-manual/testing.html
+++ b/doc/webserver/developer-manual/testing.html
@@ -11,19 +11,10 @@
   
-  
 
-
+
     

   
   
 
   
@@ -41,7 +32,7 @@ body {
         "newrelease.html" accesskey="N">Next
       
     
-    
+    
   
 
   
@@ -137,7 +128,7 @@ body {
   
 
   
-    
+    
 
     
diff --git a/doc/webserver/developer-manual/webserver-update.html b/doc/webserver/developer-manual/webserver-update.html
index 4f97360d..7b0370fa 100644
--- a/doc/webserver/developer-manual/webserver-update.html
+++ b/doc/webserver/developer-manual/webserver-update.html
@@ -14,21 +14,10 @@
   "contact.html">
   
-  
 
-
+
     

   
 
   
@@ -46,7 +35,7 @@ body {
         accesskey="N">Next
       
     
-    
+    
   
 
   
@@ -61,7 +50,7 @@ body {
     If you have changed anything in the stable-branch documentation source
     SGML files, do:
 
-    
+    

       
         
           @@ -92,7 +81,7 @@ body {
     Next, commit any changes from the above steps to CVS. All set? If
     these are docs in the stable branch, then do:
 
-    
+    

       
         
           @@ -106,15 +95,15 @@ body {
     "_top">the webserver (www.privoxy.org) and ensure all files and
     directories there are group writable.
 
-    Please do NOT use any other
-    means of transferring files to the webserver to avoid permission
-    problems. Also, please do not upload docs from development branches or
-    versions. The publicly posted docs should be in sync with the last
-    official release.
+    Please do NOT
+    use any other means of transferring files to the webserver to avoid
+    permission problems. Also, please do not upload docs from development
+    branches or versions. The publicly posted docs should be in sync with the
+    last official release.
   
 
   
-    
+    
 
     
diff --git a/doc/webserver/faq/configuration.html b/doc/webserver/faq/configuration.html
index 90dfaa9d..3e9d7036 100644
--- a/doc/webserver/faq/configuration.html
+++ b/doc/webserver/faq/configuration.html
@@ -12,22 +12,10 @@
   
-  
 
-
+
     

   
   
 
   
@@ -46,7 +34,7 @@ body {
         accesskey="N">Next
       
     
-    
+    
   
 
   
@@ -186,7 +174,7 @@ body {
       cookie handling for them in the user.action
       file. An example for yahoo might look like:
 
-      
+      

         
           
             @@ -207,11 +195,11 @@ body {
       These kinds of sites are often quite complex and heavy with Javascript
       and thus "fragile". So if still a problem, we have an alias just
-      for such sticky situations:
+      "emphasis">still a problem, we have an
+      alias just for such sticky situations:
 
-      
+      

         
           
             @@ -247,18 +235,18 @@ body {
       default action "profiles" in the web based
       actions file editor at http://config.privoxy.org/show-status. See the
-      User Manual for a list of actions, and how the default
-      profiles are set.
+      User Manual for a list of actions, and how the
+      default profiles are set.
 
       Where the defaults are likely to break some sites, exceptions for
       known popular "problem" sites are included,
       but in general, the more aggressive your default settings are, the more
       exceptions you will have to make later. New users are best to start off
       in "Cautious" setting. This is safest and
-      will have the fewest problems. See the User Manual for a more
-      detailed discussion.
+      will have the fewest problems. See the User
+      Manual for a more detailed discussion.
 
       It should be noted that the "Advanced"
       profile (formerly known as the The default.filter file is where
-      filters as supplied by the
-      developers are defined. Filters are a special subset of actions that
-      can be used to modify or remove web page content or headers on the fly.
-      Content filters can be applied to anything in the page source, header
-      filters can be applied to either server or client headers. Regular
-      expressions are used to accomplish this.
+      filters as
+      supplied by the developers are defined. Filters are a special subset of
+      actions that can be used to modify or remove web page content or
+      headers on the fly. Content filters can be applied to anything in the page source,
+      header filters can be applied to either server or client headers.
+      Regular expressions are used to accomplish this.
 
       There are a number of pre-defined filters to deal with common
       annoyances. The filters are only defined here, to invoke them, you need
@@ -323,11 +311,11 @@ body {
       MIME types, but if you know better than Privoxy what should or should
       not be filtered you can filter any content you like.
 
-      Filters should not be
-      confused with blocks, which is a completely
-      different action, and is more typically used to block ads and unwanted
-      sites.
+      Filters should not be confused with blocks, which is a completely different action, and
+      is more typically used to block ads and unwanted sites.
 
       If you are familiar with regular expressions, and HTML, you can look
       at the provided default.filter with a text
@@ -370,7 +358,7 @@ body {
       Privoxy on port 8118, this line should
       look like:
 
-      
+      

         
           
             @@ -387,7 +375,7 @@ body {
       Alternately, you can have Privoxy
       listen on all available interfaces:
 
-      
+      

         
           
             @@ -424,8 +412,8 @@ body {
       your choice. Note that this choice only has effect for images which are
       blocked as images, i.e. whose URLs match both a handle-as-image and handle-as-image and block
       action.
 
@@ -450,8 +438,8 @@ body {
       navigation aid or otherwise innocent image was erroneously blocked. It
       is recommended for new users so they can "see" what is happening. Some people might also enjoy
-      seeing how many banners they don't have to see.
+      seeing how many banners they don't have to see.
     
 
     
@@ -640,8 +628,8 @@ body {
       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 they really need to be there.
+      come, and why they really need to be there.
 
       See the Wikipedia cookie definition for more.
@@ -661,7 +649,7 @@ body {
       unrestricted, both in and out, for example.com:
 
-      
+      

         
           
             @@ -704,7 +692,7 @@ body {
       Sure. There are a couple of things you can do for simple
       white-listing. Here's one real easy one:
 
-      
+      

         
           
             @@ -765,11 +753,11 @@ body {
       default.action file from scratch without the
       many ad blocking rules, and corresponding exceptions. Or lastly, if you
       are not concerned about the additional blocks that are done for privacy
-      reasons, you can very easily over-ride all blocking with the following very
-      simple rule in your user.action:
+      reasons, you can very easily over-ride all blocking with the following very simple rule
+      in your user.action:
 
-      
+      

         
           
             @@ -785,7 +773,7 @@ body {
       Or even a more comprehensive reversing of various ad related
       actions:
 
-      
+      

         
           
             @@ -812,8 +800,8 @@ body {
 
     
       3.29. How can I
-      have custom template pages, like the BLOCKED page?
+      have custom template pages, like the BLOCKED page?
 
       Privoxy "templates" are specialized text files utilized by
@@ -834,7 +822,8 @@ body {
     

       3.30. How can I
       remove the "Go There Anyway" link from the
-      BLOCKED page?
+      BLOCKED
+      page?
 
       There is more than one way to do it (although Perl is not
       involved).
@@ -846,7 +835,7 @@ body {
       that are available as compile-time options. You should configure the sources as follows:
 
-      
+      

         
           
             @@ -869,7 +858,7 @@ body {
   
 
   
-    
+    
 
     
diff --git a/doc/webserver/faq/contact.html b/doc/webserver/faq/contact.html
index d3543bba..ca2020e4 100644
--- a/doc/webserver/faq/contact.html
+++ b/doc/webserver/faq/contact.html
@@ -14,20 +14,10 @@
   "copyright.html">
   
-  
 
-
+
     

   
 
   
@@ -46,7 +36,7 @@ body {
         "copyright.html" accesskey="N">Next
       
     
-    
+    
   
 
   
@@ -151,8 +141,8 @@ body {
         "_top">http://sourceforge.net/tracker/?group_id=11118&atid=111118.
 
         Before doing so, please make sure that the bug has not already been submitted and observe
-        the additional hints at the top of the not already been submitted
+        and observe the additional hints at the top of the submit form. If already submitted, please feel free
         to add any info to the original report that might help to solve the
@@ -331,7 +321,7 @@ body {
   
 
   
-    
+    
 
     
diff --git a/doc/webserver/faq/copyright.html b/doc/webserver/faq/copyright.html
index 78bd0a23..5d53a4da 100644
--- a/doc/webserver/faq/copyright.html
+++ b/doc/webserver/faq/copyright.html
@@ -13,20 +13,10 @@
   "contact.html">
   
-  
 
-
+
     

   
 
   
@@ -44,7 +34,7 @@ body {
          
       
     
-    
+    
   
 
   
@@ -74,10 +64,10 @@ body {
 
       This program is distributed in the hope that it will be useful, but
       WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for details.
+      "_top">GNU General Public License for
+      details.
 
       You should have received a copy of the GNU
       GPL along with this program; if not, write to the
@@ -134,7 +124,7 @@ body {
   
 
   
-    
+    
 
     
diff --git a/doc/webserver/faq/general.html b/doc/webserver/faq/general.html
index 3f8647fc..dae3e32e 100644
--- a/doc/webserver/faq/general.html
+++ b/doc/webserver/faq/general.html
@@ -13,20 +13,10 @@
   
-  
 
-
+
     

   
   
 
   
@@ -45,7 +35,7 @@ body {
         "installation.html" accesskey="N">Next
       
     
-    
+    
   
 
   
@@ -200,12 +190,13 @@ body {
       past and make a name in their own right.
 
       Privoxy is the "Privacy Enhancing
-      Proxy". Also, its content modification and junk
-      suppression gives you, the
-      user, more control, more freedom, and allows you to browse your
-      personal and "private edition" of the web.
+      "QUOTE">"Privacy Enhancing
+      Proxy". Also, its content modification and junk
+      suppression gives you, the user, more control, more freedom, and
+      allows you to browse your personal and "private
+      edition" of the web.
     
 
     
@@ -316,9 +307,9 @@ body {
       is twofold:
 
       First, there are certain patterns in the locations (URLs) of banner images. This
-      applies to both the path (you wouldn't guess how many web sites serve
-      their banners from a directory called locations (URLs) of banner
+      images. This applies to both the path (you wouldn't guess how many web
+      sites serve their banners from a directory called "banners"!) and the host (blocking the big banner
       hosting services like doublecklick.net already helps a lot).
       Privoxy takes advantage of this fact
@@ -327,13 +318,13 @@ body {
       that sound like they would be ads or banners.
 
       Second, banners tend to come in certain sizes. But you can't tell the size of an
-      image by its URL without downloading it, and if you do, it's too late
-      to save bandwidth. Therefore, Privoxy
-      also inspects the HTML sources of web pages while they are loaded, and
-      replaces references to images with standard banner sizes by dummy
-      references, so that your browser doesn't request them anymore in the
-      first place.
+      "emphasis">sizes. But you can't tell the
+      size of an image by its URL without downloading it, and if you do, it's
+      too late to save bandwidth. Therefore, Privoxy also inspects the HTML sources of web
+      pages while they are loaded, and replaces references to images with
+      standard banner sizes by dummy references, so that your browser doesn't
+      request them anymore in the first place.
 
       Both of this involves a certain amount of guesswork and is, of
       course, freely and readily configurable.
@@ -363,9 +354,9 @@ body {
 
       That depends on your expectations. The default installation should
       give you a good starting point, and block most ads and unwanted content, but many
-      of the more advanced features are off by default, and require you to
-      activate them.
+      "emphasis">most ads and unwanted
+      content, but many of the more advanced features are off by default, and
+      require you to activate them.
 
       You do have to set up your browser to use Privoxy (see the 
 
-      
Modern browsers do indeed have some of the same functionality as
-      Privoxy. Maybe this is adequate for
-      you. But Privoxy is very versatile and
+      
Modern browsers do indeed have some of the same functionality as Privoxy. Maybe this is adequate for you. But
+      Privoxy is very versatile and
       powerful, and can probably do a number of things your browser just
       can't.

 
@@ -421,15 +412,16 @@ body {
       trust Privoxy?
 
       The most important reason is because you have access to everything, and you can control
-      everything. You can check every line of every configuration file
-      yourself. You can check every last bit of source code should you
+      "emphasis">everything, and you can
+      control everything. You can check every line of every configuration
+      file yourself. You can check every last bit of source code should you
       desire. And even if you can't read code, there should be some comfort
       in knowing that other people can, and do read it. You can build the
       software from scratch, if you want, so that you know the executable is
-      clean, and that it is yours.
-      In fact, we encourage this level of scrutiny. It is one reason we use
-      Privoxy ourselves.
+      clean, and that it is yours. In fact, we encourage this level of
+      scrutiny. It is one reason we use Privoxy ourselves.
     
 
     
@@ -445,9 +437,10 @@ body {
       for more information on the license and copyright. Or the LICENSE file that should be included.
 
-      There is no warranty of
-      any kind, expressed, implied or otherwise. That is something that would
-      cost real money ;-) There is no registration either.
+      There is no
+      warranty of any kind, expressed, implied or otherwise. That
+      is something that would cost real money ;-) There is no registration
+      either.
     
 
     
@@ -493,16 +486,17 @@ body {
         1.17.1.
         Would you like to participate?
 
-        Well, we always need
-        help. There is something for everybody who wants to help us. We
-        welcome new developers, packagers, testers, documentation writers or
-        really anyone with a desire to help in any way. You DO NOT need to be a "programmer". There are many other tasks available. In
-        fact, the programmers often can't spend as much time programming
-        because of some of the other, more mundane things that need to be
-        done, like checking the Tracker feedback sections or responding to
-        user questions on the mailing lists.
+        Well, we always need help. There is something for
+        everybody who wants to help us. We welcome new developers, packagers,
+        testers, documentation writers or really anyone with a desire to help
+        in any way. You DO
+        NOT need to be a "programmer".
+        There are many other tasks available. In fact, the programmers often
+        can't spend as much time programming because of some of the other,
+        more mundane things that need to be done, like checking the Tracker
+        feedback sections or responding to user questions on the mailing
+        lists.
 
         So first thing, subscribe to the 
 
   

-    
+    
 
     
diff --git a/doc/webserver/faq/index.html b/doc/webserver/faq/index.html
index 185c235b..3e400145 100644
--- a/doc/webserver/faq/index.html
+++ b/doc/webserver/faq/index.html
@@ -9,22 +9,10 @@
   
-  
 
-
+
     
       Privoxy Frequently Asked
@@ -37,59 +25,61 @@ body {
       $Id: faq.sgml,v 2.85 2011/12/26 17:05:40 fabiankeil
       Exp $

 
-      
-        
-
-        This FAQ gives quick answers to frequently asked questions about
-        Privoxy. It is
-        not a substitute for the Privoxy User
-        Manual.
-
-        What is Privoxy?
-
-        Privoxy is a non-caching web proxy with advanced filtering
-        capabilities for enhancing privacy, modifying web page data and HTTP
-        headers, controlling access, and removing ads and other obnoxious
-        Internet junk. Privoxy has a flexible configuration and can be
-        customized to suit individual needs and tastes. It has application
-        for both stand-alone systems and multi-user networks.
-
-        Privoxy is Free Software and licensed under the GNU GPLv2.
-
-        Privoxy is an associated project of Software in the Public
-        Interest (SPI).
-
-        Helping hands and donations are welcome:
-
-        
-          
-            http://www.privoxy.org/faq/general.html#PARTICIPATE
-          
-
-          
-            http://www.privoxy.org/faq/general.html#DONATE
-          
-        
-
-        Please note that this document is a work in progress. This copy
-        represents the state at the release of version 3.0.20. You can find
-        the latest version of the document at http://www.privoxy.org/faq/. Please see the Contact section if you want to contact the
-        developers.
+      
+        
+          
+
+          This FAQ gives quick answers to frequently asked questions about
+          Privoxy. It is
+          not a substitute for the Privoxy User Manual.
+
+          What is Privoxy?
+
+          Privoxy is a non-caching web proxy with advanced filtering
+          capabilities for enhancing privacy, modifying web page data and
+          HTTP headers, controlling access, and removing ads and other
+          obnoxious Internet junk. Privoxy has a flexible configuration and
+          can be customized to suit individual needs and tastes. It has
+          application for both stand-alone systems and multi-user
+          networks.
+
+          Privoxy is Free Software and licensed under the GNU GPLv2.
+
+          Privoxy is an associated project of Software in the Public
+          Interest (SPI).
+
+          Helping hands and donations are welcome:
+
+          
+            
+              http://www.privoxy.org/faq/general.html#PARTICIPATE
+            
+
+            
+              http://www.privoxy.org/faq/general.html#DONATE
+            
+          
+
+          Please note that this document is a work in progress. This copy
+          represents the state at the release of version 3.0.19. You can find
+          the latest version of the document at http://www.privoxy.org/faq/. Please see the Contact section if you want to contact the
+          developers.
+        
       
       
     
 
     
       
-        Table of Contents
+        Table of Contents
 
         1. General Information
 
@@ -288,12 +278,13 @@ body {
             off ad-blocking?
 
             3.29. How can I have
-            custom template pages, like the BLOCKED page?
+            custom template pages, like the BLOCKED page?
 
             3.30. How can I remove
             the "Go There Anyway" link from the
-            BLOCKED page?
+            BLOCKED
+            page?
           
         
 
@@ -529,7 +520,7 @@ body {
   
 
   
-    
+    
 
     

   
   
 
   
diff --git a/doc/webserver/faq/installation.html b/doc/webserver/faq/installation.html
index 5b52212b..c53b2f33 100644
--- a/doc/webserver/faq/installation.html
+++ b/doc/webserver/faq/installation.html
@@ -12,20 +12,10 @@
   
-  
 
-
+
     

   
   
 
   
@@ -44,7 +34,7 @@ body {
         "configuration.html" accesskey="N">Next
       
     
-    
+    
   
 
   
@@ -194,8 +184,8 @@ body {
       "Privoxy is not being used" dummy page
       although Privoxy is running and being used.
 
-      First, make sure that Privoxy is really running and being used by visiting
+      
First, make sure that Privoxy is really running and being used by visiting
       http://p.p/. You should see the
       Privoxy main page. If not, see the
       
 
   

-    
+    
 
     
diff --git a/doc/webserver/faq/misc.html b/doc/webserver/faq/misc.html
index 07d767b2..6ff52fde 100644
--- a/doc/webserver/faq/misc.html
+++ b/doc/webserver/faq/misc.html
@@ -12,21 +12,10 @@
   
-  
 
-
+
     

   
   
 
   
@@ -45,7 +34,7 @@ body {
         accesskey="N">Next
       
     
-    
+    
   

 
   
@@ -140,8 +129,8 @@ body {
       you get a page saying "Privoxy is not
       working" instead, then your browser didn't use Privoxy for the request, hence it could not be
-      intercepted, and you have accessed the real web site at config.privoxy.org.
+      intercepted, and you have accessed the real web site at config.privoxy.org.
     
 
     
@@ -223,12 +212,12 @@ body {
       assume that everything you do on the Web can be traced back to you.
 
       Privoxy can remove various
-      information about you, and allows you 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 out who you are, even if you are using a strict you 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 out
+      who you are, even if you are using a strict Privoxy configuration and chained it with
       Tor.
 
@@ -313,7 +302,7 @@ body {
       "../user-manual/config.html#FORWARDING" target="_top">forwarding
       section and uncomment the line:
 
-      
+      

         
           
             @@ -328,7 +317,7 @@ body {
       want to uncomment the following forward rules, to make sure your local
       network is still reachable through Privoxy:
 
-      
+      

         
           
             @@ -351,7 +340,7 @@ body {
       network by using their names, you will need additional exceptions that
       look like this:
 
-      
+      

         
           
             @@ -407,9 +396,9 @@ body {
       server. The results of which could inadvertently cause pages to load
       incorrectly, partially, or even not at all. And there may be no obvious
       clues as to just what went wrong, or why. Nowhere will there be a
-      message that says "Turn off fast-redirects
-      or else! "
+      message that says "Turn off fast-redirects or
+      else! "
 
       Similar thoughts apply to modifying JavaScript, and, to a lesser
       degree, HTML elements.
@@ -443,7 +432,7 @@ body {
       they can. Privoxy can help protect
       your privacy, but can't protect your system from intrusion attempts. It
       is, of course, perfectly possible to use both.
+      "emphasis">both.
     
 
     
@@ -453,8 +442,9 @@ body {
       It is technically possible to eliminate banners and ads in a way
       that frees their allocated page space. This could easily be done by
       blocking with Privoxy's filters, and
-      eliminating the entire image
-      references from the HTML page source.
+      eliminating the entire image references from the HTML page
+      source.
 
       But, this would consume considerably more CPU resources (IOW, slow
       things down), would likely destroy the layout of some web pages which
@@ -479,9 +469,10 @@ body {
 
       
Since secure HTTP connections are encrypted SSL sessions between
       your browser and the secure site, and are meant to be reliably
-      secure, there is little that
-      Privoxy can do but hand the raw
-      gibberish data though from one end to the other unprocessed.
+      secure, there is
+      little that Privoxy can do but hand
+      the raw gibberish data though from one end to the other
+      unprocessed.
 
       The only exception to this is blocking by host patterns, as the
       client needs to tell Privoxy the name
@@ -581,12 +572,12 @@ body {
 
       
A "crunch" simply means Privoxy intercepted something, nothing more. Often this is
-      indeed ads or banners, but Privoxy
-      uses the same mechanism for trapping requests for its own internal
-      pages. For instance, a request for Privoxy's configuration page at: something, nothing more.
+      Often this is indeed ads or banners, but Privoxy uses the same mechanism for trapping
+      requests for its own internal pages. For instance, a request for
+      Privoxy's configuration page at:
+      http://config.privoxy.org, is intercepted (i.e. it does not
       go out to the 'net), and the familiar CGI configuration is returned to
       the browser, and the log consequently will show a "good" content that we do want. Privoxy is blind to the differences, and can only
       distinguish "good from bad" by the
-      configuration parameters we
-      give it.
+      configuration parameters we give it.
 
       Privoxy knows the differences in
       files according to the "Content Type" as
@@ -640,11 +631,11 @@ body {
 
       
In short, filtering is "ON" if a) the
       content type as reported by the webserver is appropriate and b) the configuration allows it (or at
-      least does not disallow it). That's it. There is no magic cookie
-      anywhere to say this is "good" and this is
-      "bad". It's the configuration that lets it
-      all happen or not.
+      "emphasis">and b) the configuration
+      allows it (or at least does not disallow it). That's it. There is no
+      magic cookie anywhere to say this is "good"
+      and this is "bad". It's the configuration
+      that lets it all happen or not.
 
       If you download text files, you probably do not want these to be
       filtered, particularly if the content is source code, or other critical
@@ -653,8 +644,9 @@ body {
       off filtering for download sites (particularly if the content may be
       plain text files and you are using version 3.0.2 or earlier) in your
       user.action file. And also, for any site or
-      page where making any changes
-      at all to the content is to be avoided.
+      page where making any changes at all to the content is to be
+      avoided.
 
       Privoxy does not do FTP at all,
       only HTTP and HTTPS (SSL) protocols.
@@ -691,7 +683,7 @@ body {
       adding your list to your user.action
       file:
 
-      
+      

         
           
             @@ -898,7 +890,7 @@ body {
   
 
   
-    
+    
 
     
diff --git a/doc/webserver/faq/trouble.html b/doc/webserver/faq/trouble.html
index b08bc2bd..38b3fe95 100644
--- a/doc/webserver/faq/trouble.html
+++ b/doc/webserver/faq/trouble.html
@@ -14,21 +14,10 @@
   "contact.html">
   
-  
 
-
+
     

   
 
   
@@ -47,7 +36,7 @@ body {
         accesskey="N">Next
       
     
-    
+    
   
 
   
@@ -144,7 +133,7 @@ body {
       (meaning caught and BLOCKED) quite a few items in this example, but
       perhaps missed a few as well.
 
-      
+      

         
           
             @@ -215,9 +204,9 @@ Request: 66.70.21.80/scripts/click.php?hid=a71b9f6504b0c5681fa5&si=Ua
       need to be enabled in the main config file). Many sites are complex and
       require a number of related pages to help present their content. Look
       at what else might be used by the page in question, and what of that
-      might be required. Now, armed
-      with this information, go to required. Now, armed with this information, go to
+      http://config.privoxy.org/show-status and select the
       appropriate actions files for editing.
 
@@ -299,8 +288,8 @@ Request: 66.70.21.80/scripts/click.php?hid=a71b9f6504b0c5681fa5&si=Ua
       Privoxy cannot act as a proxy for
       FTP traffic, so do not configure your browser to use Privoxy as an FTP proxy. The same is true for
-      any protocol other than HTTP or
-      HTTPS (SSL).
+      any protocol other than HTTP
+      or HTTPS (SSL).
 
       Most browsers understand FTP as well as HTTP. If you connect to a
       site, with a URL like ftp://ftp.example.com,
@@ -311,9 +300,9 @@ Request: 66.70.21.80/scripts/click.php?hid=a71b9f6504b0c5681fa5&si=Ua
 
       
To complicate matters, some systems may have a generic "proxy" setting, which will enable various protocols,
-      including both HTTP and FTP
-      proxying! So it is possible to accidentally enable FTP proxying in
-      these cases. And of course, if this happens, both
+      HTTP and FTP proxying! So it is possible to accidentally enable FTP
+      proxying in these cases. And of course, if this happens, Privoxy will indeed cause problems since it does
       not know FTP. Newer version will give a sane error message if a FTP
       connection is attempted. Just disable the FTP setting and all will be
@@ -389,7 +378,7 @@ Request: 66.70.21.80/scripts/click.php?hid=a71b9f6504b0c5681fa5&si=Ua
       the site to a -prevent-compression section in
       user.action:
 
-      
+      

         
           
             @@ -416,9 +405,10 @@ Request: 66.70.21.80/scripts/click.php?hid=a71b9f6504b0c5681fa5&si=Ua
       Privoxy tries to get the hostname
       of the system its running on from the IP address of the system
       interface it is bound to (from the config
-      file listen-address setting).
-      If the system cannot supply this information, Privoxy logs this condition.
+      file listen-address setting). If the system cannot
+      supply this information, Privoxy logs
+      this condition.
 
       Typically, this would be considered a minor system configuration
       error. It is not a fatal error to If you are using Microsoft products, you do not need it. If you need
       to view pages with UTF-8 characters (such as Cyrillic or Chinese), then
       it will cause corruption of the fonts, and thus should not be on.
+      "emphasis">should not be on.
 
       On the other hand, if you use non-Microsoft products, and you
       occasionally notice weird characters on pages, you might want to try
@@ -630,7 +620,7 @@ Request: 66.70.21.80/scripts/click.php?hid=a71b9f6504b0c5681fa5&si=Ua
       by Privoxy and add the hosts (no path
       patterns) to a section like this:
 
-      
+      

         
           
             @@ -704,7 +694,7 @@ Request: 66.70.21.80/scripts/click.php?hid=a71b9f6504b0c5681fa5&si=Ua
   
 
   
-    
+    
 
     
diff --git a/doc/webserver/index.html b/doc/webserver/index.html
index 384baa17..e417d9da 100644
--- a/doc/webserver/index.html
+++ b/doc/webserver/index.html
@@ -34,56 +34,50 @@
   
-  
 
-
+
     
       Privoxy - Home Page
 
-      
-        
-
-        Privoxy is a non-caching web proxy with advanced filtering
-        capabilities for enhancing privacy, modifying web page data and HTTP
-        headers, controlling access, and removing ads and other obnoxious
-        Internet junk. Privoxy has a flexible configuration and can be
-        customized to suit individual needs and tastes. It has application
-        for both stand-alone systems and multi-user networks.
-
-        Privoxy is Free Software and licensed under the GNU GPLv2.
-
-        Privoxy is an associated project of Software in the Public
-        Interest (SPI).
-
-        Helping hands and donations are welcome:
-
-        
-          
-            http://www.privoxy.org/faq/general.html#PARTICIPATE
-          
-
-          
-            http://www.privoxy.org/faq/general.html#DONATE
-          
-        
-
-        The most recent release is 3.0.20 (UNRELEASED).
+      
+        
+          
+
+          Privoxy is a non-caching web proxy with advanced filtering
+          capabilities for enhancing privacy, modifying web page data and
+          HTTP headers, controlling access, and removing ads and other
+          obnoxious Internet junk. Privoxy has a flexible configuration and
+          can be customized to suit individual needs and tastes. It has
+          application for both stand-alone systems and multi-user
+          networks.
+
+          Privoxy is Free Software and licensed under the GNU GPLv2.
+
+          Privoxy is an associated project of Software in the Public
+          Interest (SPI).
+
+          Helping hands and donations are welcome:
+
+          
+            
+              http://www.privoxy.org/faq/general.html#PARTICIPATE
+            
+
+            
+              http://www.privoxy.org/faq/general.html#DONATE
+            
+          
+
+          The most recent release is 3.0.19 (stable).
+        
       
       
     
@@ -181,7 +175,7 @@ body {
 
         

   
 
   
-          +          
diff --git a/doc/webserver/man-page/privoxy-man-page.html b/doc/webserver/man-page/privoxy-man-page.html
index 97b4dcd5..58e137d3 100644
--- a/doc/webserver/man-page/privoxy-man-page.html
+++ b/doc/webserver/man-page/privoxy-man-page.html
@@ -3,7 +3,7 @@
 
+  "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
 
   Privoxy Man page
diff --git a/doc/webserver/privoxy-index.html b/doc/webserver/privoxy-index.html
index 90698812..1b23af01 100644
--- a/doc/webserver/privoxy-index.html
+++ b/doc/webserver/privoxy-index.html
@@ -34,55 +34,50 @@
   
-  
 
-
+
     
       Privoxy - The Privacy
       Enhancing Proxy
 
-      Project Index Page v3.0.20
-
-      
-        
-
-        Privoxy is a non-caching web proxy with advanced filtering
-        capabilities for enhancing privacy, modifying web page data and HTTP
-        headers, controlling access, and removing ads and other obnoxious
-        Internet junk. Privoxy has a flexible configuration and can be
-        customized to suit individual needs and tastes. It has application
-        for both stand-alone systems and multi-user networks.
-
-        Privoxy is Free Software and licensed under the GNU GPLv2.
-
-        Privoxy is an associated project of Software in the Public
-        Interest (SPI).
-
-        Helping hands and donations are welcome:
-
-        
-          
-            http://www.privoxy.org/faq/general.html#PARTICIPATE
-          
-
-          
-            http://www.privoxy.org/faq/general.html#DONATE
-          
-        
+      Project Index Page v3.0.19
+
+      
+        
+          
+
+          Privoxy is a non-caching web proxy with advanced filtering
+          capabilities for enhancing privacy, modifying web page data and
+          HTTP headers, controlling access, and removing ads and other
+          obnoxious Internet junk. Privoxy has a flexible configuration and
+          can be customized to suit individual needs and tastes. It has
+          application for both stand-alone systems and multi-user
+          networks.
+
+          Privoxy is Free Software and licensed under the GNU GPLv2.
+
+          Privoxy is an associated project of Software in the Public
+          Interest (SPI).
+
+          Helping hands and donations are welcome:
+
+          
+            
+              http://www.privoxy.org/faq/general.html#PARTICIPATE
+            
+
+            
+              http://www.privoxy.org/faq/general.html#DONATE
+            
+          
+        
       
       
     
diff --git a/doc/webserver/team/index.html b/doc/webserver/team/index.html
index e2bb1a86..168c9637 100644
--- a/doc/webserver/team/index.html
+++ b/doc/webserver/team/index.html
@@ -3,7 +3,7 @@
 
 
   
+  "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
   
 
   Privoxy - Team Photos
diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html
index 38deb3e8..9e8e95e6 100644
--- a/doc/webserver/user-manual/actions-file.html
+++ b/doc/webserver/user-manual/actions-file.html
@@ -6,36 +6,22 @@
   Actions Files
   
-  
+  
   
   
   
   
   
-  
 
 
-
+
   
     


 
           
             
 
   
   
   
 
   
-        
+        
@@ -48,7 +34,7 @@ body {
         "filter-file.html" accesskey="N">Next
       Privoxy 3.0.20 User Manual Privoxy 3.0.19 User Manual
       
 
       
       
     
-    
+    
   
 
   
@@ -56,7 +42,7 @@ body {
     Files
 
     The actions files are used to define what actions actions Privoxy takes for which URLs, and thus determines
     how ad images, cookies and various other aspects of HTTP content and
     transactions are handled, and on which sites (or even parts thereof).
@@ -100,8 +86,8 @@ body {
         Set to Advanced
 
         These have increasing levels of aggressiveness and have no influence on your browsing unless
-        you select them explicitly in the editor. A default
+        "emphasis">and have no influence on your browsing
+        unless you select them explicitly in the editor. A default
         installation should be pre-set to Cautious.
         New users should try this for a while before adjusting the settings
         to more aggressive levels. The more aggressive the settings, then the
@@ -131,9 +117,9 @@ body {
         in default.action are:
 
         
-          
+          
 
-          Table 1. Default Configurations
+          Table 1. Default Configurations
 
           @@ -300,20 +286,21 @@ body {
     default.action), followed by any exceptions
     (typically also in default.action), which are
     then followed lastly by any local preferences (typically in user.action).
-    Generally, user.action has the last word.
+    "emphasis">user.action). Generally, user.action has the last word.
An actions file typically has multiple sections. If you want to use
     "aliases" in an actions file, you have to
     place the (optional) alias
     section at the top of that file. Then comes the default set of rules
     which will apply universally to all sites and pages (be very careful with using such a universal
-    set in user.action or any other actions file
-    after default.action, because it will override
-    the result from consulting any previous file). And then below that,
-    exceptions to the defined universal policies. You can regard user.action as an appendix to very careful with using such a
+    universal set in user.action or any other
+    actions file after default.action, because it
+    will override the result from consulting any previous file). And then
+    below that, exceptions to the defined universal policies. You can regard
+    user.action as an appendix to default.action, with the advantage that it is a separate
     file, which makes preserving your personal settings across Privoxy upgrades easier.

@@ -327,7 +314,7 @@ body {
     actions.
 
     
-      8.1. Finding the Right
+      8.1. Finding the Right
       Mix
 
       Note that some actions, like
@@ -352,7 +339,7 @@ body {
     
 
     
-      8.2. How to
+      8.2. How to
       Edit
 
       The easiest way to edit the actions files is with a browser by using
@@ -401,11 +388,11 @@ body {
       +handle-as-image
       }, then later another one with just {
       +block }, resulting in
-      both actions to apply. And
-      there may well be cases where you will want to combine actions
-      together. Such a section then might look like:
+      both actions to
+      apply. And there may well be cases where you will want to combine
+      actions together. Such a section then might look like:
 
-      

             

 
     
+      

         
           
             @@ -435,12 +422,12 @@ body {
 
       As mentioned, Privoxy uses
       "patterns" to determine what actions might apply to which sites and
-      pages your browser attempts to access. These actions might apply to which
+      sites and pages your browser attempts to access. These "patterns" use wild card type pattern matching to achieve a high degree
-      of flexibility. This allows one expression to be expanded and
-      potentially match against many similar patterns.
+      "emphasis">pattern matching to achieve a
+      high degree of flexibility. This allows one expression to be expanded
+      and potentially match against many similar patterns.
 
       Generally, an URL pattern has the form <domain><port>/<path>, where the
@@ -449,9 +436,9 @@ body {
       "LITERAL"><path> are optional. (This is why the special
       / pattern matches all URLs). Note that the
       protocol portion of the URL pattern (e.g. http://) should not be included in the pattern. This is
-      assumed already!
+      "LITERAL">http://) should not be included in the pattern. This is assumed
+      already!
 
       The pattern matching syntax is different for the domain and path
       parts of the URL. The domain part uses a simple globbing type matching
@@ -506,7 +493,8 @@ body {
           

             matches the document /index.html,
             regardless of the domain, i.e. on any web server anywhere.
+            "emphasis">any web server
+            anywhere.
           
 
           /
@@ -541,7 +529,7 @@ body {
       
 
       
-        8.4.1. The Domain
+        8.4.1. The Domain
         Pattern
 
         The matching of the domain part offers some flexible options: if
@@ -566,18 +554,17 @@ body {
             
www.
 
             
-              matches any domain that STARTS with www. (It also matches the domain www but most of the time that doesn't
-              matter.)
+              matches any domain that STARTS with www.
+              (It also matches the domain www but
+              most of the time that doesn't matter.)
             
 
             .example.
 
             
-              matches any domain that CONTAINS matches any domain that CONTAINS .example.. And, by the way, also included would
               be any files or documents that exist within that domain since
               no path limitations are specified. (Correctly speaking: It
@@ -636,7 +623,7 @@ body {
               www4.example.cc, wwwd.example.cy, wwwz.example.com etc., but not not wwww.example.com.

             

           
@@ -647,7 +634,7 @@ body {
       

 
       
-        8.4.2. The Path
+        8.4.2. The Path
         Pattern
 
         Privoxy uses 
 
         
Please also note that matching in the path is CASE INSENSITIVE by default, but you
-        can switch to case sensitive at any point in the pattern by using the
-        "(?-i)" switch: www.example.com/(?-i)PaTtErN.* will match only
-        documents whose path starts with PaTtErN in
-        exactly this
-        capitalization.
+        "emphasis">CASE INSENSITIVE by
+        default, but you can switch to case sensitive at any point in the
+        pattern by using the "(?-i)" switch:
+        www.example.com/(?-i)PaTtErN.* will match
+        only documents whose path starts with PaTtErN in exactly this capitalization.
 
         
           
@@ -828,14 +815,14 @@ body {
           "QUOTE">"enabled" or "disabled".
           Syntax:
 
-          
+          
@@ -848,16 +835,15 @@ body {
           Parameterized, where some value is required in order to enable
           this type of action. Syntax:
 
-          
             
               
                 -  +name        # enable action name
-  -name        # disable action name
+  +name        # enable action name
+  -name        # disable action name
 
               
             
+          
@@ -876,25 +862,25 @@ body {
           Multi-value. These look exactly like parameterized actions, but
           they behave differently: If the action applies multiple times to
           the same URL, but with different parameters, all the parameters from all matches are remembered. This is
-          used for actions that can be executed for the same request
-          repeatedly, like adding multiple headers, or filtering through
-          multiple filters. Syntax:
+          "emphasis">all the parameters from
+          all matches
+          are remembered. This is used for actions that can be executed for
+          the same request repeatedly, like adding multiple headers, or
+          filtering through multiple filters. Syntax:
 
-          
             
               
                 -  +name{param}  # enable action and set parameter to param,
+  +name{param}  # enable action and set parameter to param,
                # overwriting parameter from previous match if necessary
   -name         # disable action. The parameter can be omitted
+"REPLACEABLE">name         # disable action. The parameter can be omitted
 
               
             
+          
@@ -978,7 +964,7 @@ body {
             Example usage:

-              

             
               
                 -  +name{param}   # enable action and add param to the list of parameters
-  -name{param}   # remove the parameter param from the list of parameters
+  +name{param}   # enable action and add param to the list of parameters
+  -name{param}   # remove the parameter param from the list of parameters
                 # If it was the last one left, disable the action.
   -name          # disable this action completely and remove all parameters from the list
+"REPLACEABLE">-name          # disable this action completely and remove all parameters from the list
 
               
             
 
             
+              

                 
                   
                     @@ -1042,7 +1028,7 @@ body {
               force feature is available and enabled).
 
               A very important exception occurs if both both block and handle-as-image,
               apply to the same request: it will then be replaced by an
@@ -1069,7 +1055,7 @@ body {
             
Example usage (section):

 
             
-              
+              

                 
                   
                     @@ -1150,7 +1136,7 @@ body {
             Example usage:
 
             
-              
+              

                 
                   
                     @@ -1223,7 +1209,7 @@ body {
             Example usage (section):
 
             
-              
+              

                 
                   
                     @@ -1288,7 +1274,7 @@ body {
             Example usage (section):
 
             
-              
+              

                 
                   
                     @@ -1412,7 +1398,7 @@ TAG:^User-Agent: MPlayer/
             Example usage (sections):
 
             
-              
+              

                 
                   
                     @@ -1474,10 +1460,10 @@ www.example.net/.*style
               every client header that contains the string you supplied as
               parameter.
 
-              Regular expressions are not supported and you can't use
-              this action to block different headers in the same request,
-              unless they contain the same string.
+              Regular expressions are not supported and you can't use this
+              action to block different headers in the same request, unless
+              they contain the same string.
 
               crunch-client-header is only meant
               for quick tests. If you have to block several different
@@ -1489,7 +1475,7 @@ www.example.net/.*style
               

                 
-                    
+                    
@@ -1505,7 +1491,7 @@ www.example.net/.*style
             Example usage (section):

-              

                   Warning Warning
                   
 
                   
 
             
+              

                 
                   
                     @@ -1581,7 +1567,7 @@ www.example.net/.*style
             Example usage (section):
 
             
-              
+              

                 
                   
                     @@ -1636,15 +1622,16 @@ www.example.net/.*style
 
             
               This action is only concerned with incoming HTTP cookies. For
-              outgoing HTTP
-              cookies, use incoming HTTP
+              cookies. For outgoing HTTP cookies, use crunch-outgoing-cookies.
-              Use both to disable
-              HTTP cookies completely.

+              Use both
+              to disable HTTP cookies completely.
 
-              It makes no sense at
-              all to use this action in conjunction with the
+              
It makes no sense
+              at all to use this action in conjunction with the
               session-cookies-only
               action, since it would prevent the session cookies from being
@@ -1655,7 +1642,7 @@ www.example.net/.*style
             
Example usage:

 
             
-              
+              

                 
                   
                     @@ -1710,10 +1697,10 @@ www.example.net/.*style
               every server header that contains the string you supplied as
               parameter.
 
-              Regular expressions are not supported and you can't use
-              this action to block different headers in the same request,
-              unless they contain the same string.
+              Regular expressions are not supported and you can't use this
+              action to block different headers in the same request, unless
+              they contain the same string.
 
               crunch-server-header is only meant
               for quick tests. If you have to block several different
@@ -1725,7 +1712,7 @@ www.example.net/.*style
               

                 
-                    
+                    
@@ -1741,7 +1728,7 @@ www.example.net/.*style
             Example usage (section):

-              

                   Warning Warning
                   
 
                   
 
             
+              

                 
                   
                     @@ -1793,15 +1780,16 @@ www.example.net/.*style
 
             
               This action is only concerned with outgoing HTTP cookies. For
-              incoming HTTP
-              cookies, use outgoing HTTP
+              cookies. For incoming HTTP cookies, use crunch-incoming-cookies.
-              Use both to disable
-              HTTP cookies completely.

+              Use both
+              to disable HTTP cookies completely.
 
-              It makes no sense at
-              all to use this action in conjunction with the
+              
It makes no sense
+              at all to use this action in conjunction with the
               session-cookies-only
               action, since it would prevent the session cookies from being
@@ -1811,7 +1799,7 @@ www.example.net/.*style
             
Example usage:

 
             
-              
+              

                 
                   
                     @@ -1877,7 +1865,7 @@ www.example.net/.*style
             Example usage:
 
             
-              
+              

                 
                   
                     @@ -1946,7 +1934,7 @@ www.example.net/.*style
             Example usage (section):
 
             
-              
+              

                 
                   
                     @@ -2066,7 +2054,7 @@ problem-host.example.com
             Example usage:
 
             
-              
+              

                 
                   
                     @@ -2130,8 +2118,8 @@ problem-host.example.com
               "FILENAME">user.filter.
 
               When used in its negative form, and without parameters,
-              all filtering is
-              completely disabled.
+              all
+              filtering is completely disabled.
             
 
             Notes:
@@ -2215,7 +2203,7 @@ problem-host.example.com
               
 
-              
+              

                 
                   
                     @@ -2227,7 +2215,7 @@ problem-host.example.com
 
               
 
-              
+              

                 
                   
                     @@ -2240,7 +2228,7 @@ problem-host.example.com
               
 
-              
+              

                 
                   
                     @@ -2253,7 +2241,7 @@ problem-host.example.com
               
 
-              
+              

                 
                   
                     @@ -2266,7 +2254,7 @@ problem-host.example.com
               
 
-              
+              

                 
                   
                     @@ -2279,7 +2267,7 @@ problem-host.example.com
               
 
-              
+              

                 
                   
                     @@ -2291,7 +2279,7 @@ problem-host.example.com
 
               
 
-              
+              

                 
                   
                     @@ -2304,7 +2292,7 @@ problem-host.example.com
               
 
-              
+              

                 
                   
                     @@ -2317,7 +2305,7 @@ problem-host.example.com
               
 
-              
+              

                 
                   
                     @@ -2330,7 +2318,7 @@ problem-host.example.com
               
 
-              
+              

                 
                   
                     @@ -2342,7 +2330,7 @@ problem-host.example.com
 
               
 
-              
+              

                 
                   
                     @@ -2355,7 +2343,7 @@ problem-host.example.com
               
 
-              
+              

                 
                   
                     @@ -2368,7 +2356,7 @@ problem-host.example.com
               
 
-              
+              

                 
                   
                     @@ -2381,7 +2369,7 @@ problem-host.example.com
               
 
-              
+              

                 
                   
                     @@ -2394,7 +2382,7 @@ problem-host.example.com
               
 
-              
+              

                 
                   
                     @@ -2407,7 +2395,7 @@ problem-host.example.com
               
 
-              
+              

                 
                   
                     @@ -2420,7 +2408,7 @@ problem-host.example.com
               
 
-              
+              

                 
                   
                     @@ -2432,7 +2420,7 @@ problem-host.example.com
 
               
 
-              
+              

                 
                   
                     @@ -2445,7 +2433,7 @@ problem-host.example.com
               
 
-              
+              

                 
                   
                     @@ -2458,7 +2446,7 @@ problem-host.example.com
               
 
-              
+              

                 
                   
                     @@ -2471,7 +2459,7 @@ problem-host.example.com
               
 
-              
+              

                 
                   
                     @@ -2483,7 +2471,7 @@ problem-host.example.com
 
               
 
-              
+              

                 
                   
                     @@ -2495,7 +2483,7 @@ problem-host.example.com
 
               
 
-              
+              

                 
                   
                     @@ -2507,7 +2495,7 @@ problem-host.example.com
 
               
 
-              
+              

                 
                   
                     @@ -2519,7 +2507,7 @@ problem-host.example.com
 
               
 
-              
+              

                 
                   
                     @@ -2531,7 +2519,7 @@ problem-host.example.com
 
               
 
-              
+              

                 
                   
                     @@ -2556,7 +2544,7 @@ problem-host.example.com
             
               Force Privoxy to treat a
               document as if it was in some kind of text format.
+              "emphasis">text format.
             
 
             Effect:
@@ -2594,7 +2582,7 @@ problem-host.example.com
               
                 
-                    
+                    
@@ -2611,7 +2599,7 @@ problem-host.example.com
             Example usage:

-              

                   Warning Warning
                   
 
                   
 
             
+              

                 
                   
                     @@ -2703,7 +2691,7 @@ problem-host.example.com
               
                 
-                    
+                    
@@ -2732,7 +2720,7 @@ problem-host.example.com
             Example usage:

-              

                   Warning Warning
                   
 
                   
 
             
+              

                 
                   
                     @@ -2769,8 +2757,8 @@ TAG:^User-Agent: fetch libfetch/2\.0$
 
             
               Mark URLs that should be replaced by empty documents
-              if they get
-              blocked
+              if they get
+              blocked
             
 
             Effect:
@@ -2779,12 +2767,13 @@ TAG:^User-Agent: fetch libfetch/2\.0$
               This action alone doesn't do anything noticeable. It just
               marks URLs. If the block action also applies, the presence or
-              absence of this mark decides whether an HTML "BLOCKED" page, or an empty document will be
-              sent to the client as a substitute for the blocked content. The
-              empty document isn't
-              literally empty, but actually contains a single space.
+              "emphasis">also applies, the
+              presence or absence of this mark decides whether an HTML
+              "BLOCKED" page, or an empty document
+              will be sent to the client as a substitute for the blocked
+              content. The empty document isn't literally empty, but
+              actually contains a single space.
             
 
             Type:
@@ -2818,7 +2807,7 @@ TAG:^User-Agent: fetch libfetch/2\.0$
             Example usage:
 
             
-              
+              

                 
                   
                     @@ -2846,8 +2835,8 @@ example.org/.*\.js$
 
             
               Mark URLs as belonging to images (so they'll be replaced by
-              images if they do get
-              blocked, rather than HTML pages)
+              images if they do
+              get blocked, rather than HTML pages)
             
 
             Effect:
@@ -2856,10 +2845,10 @@ example.org/.*\.js$
               This action alone doesn't do anything noticeable. It just
               marks URLs as images. If the block action also applies, the presence or
-              absence of this mark decides whether an HTML "blocked" page, or a replacement image (as
-              determined by the also applies, the
+              presence or absence of this mark decides whether an HTML
+              "blocked" page, or a replacement
+              image (as determined by the set-image-blocker
               action) will be sent to the client as a substitute for the
               blocked content.

@@ -2902,7 +2891,7 @@ example.org/.*\.js$
             Example usage (sections):
 
             
-              
+              

                 
                   
                     @@ -2987,7 +2976,7 @@ nasty-banner-server.example.com/junk.cgi\?output=trash
             Example usage (section):
 
             
-              
+              

                 
                   
                     @@ -3050,9 +3039,9 @@ nasty-banner-server.example.com/junk.cgi\?output=trash
               default.
 
               In most browsers that understand this header, it makes it
-              impossible to just
-              view the document, without downloading it first, even if
-              it's just a simple text file or an image.
+              impossible to just
+              view the document, without downloading it first,
+              even if it's just a simple text file or an image.
 
               Removing the "Content-Disposition:" header helps to prevent
@@ -3073,7 +3062,7 @@ nasty-banner-server.example.com/junk.cgi\?output=trash
             
Example usage:
 
             
-              
+              

                 
                   
                     @@ -3160,7 +3149,7 @@ nasty-banner-server.example.com/junk.cgi\?output=trash
             Example usage (section):
 
             
-              
+              

                 
                   
                     @@ -3230,7 +3219,7 @@ nasty-banner-server.example.com/junk.cgi\?output=trash
             Example usage:
 
             
-              
+              

                 
                   
                     @@ -3240,7 +3229,7 @@ nasty-banner-server.example.com/junk.cgi\?output=trash
                 
               or
 
-              
+              

                 
                   
                     @@ -3349,7 +3338,7 @@ nasty-banner-server.example.com/junk.cgi\?output=trash
             Example usage:
 
             
-              
+              

                 
                   
                     @@ -3359,7 +3348,7 @@ nasty-banner-server.example.com/junk.cgi\?output=trash
                 
               or
 
-              
+              

                 
                   
                     @@ -3412,7 +3401,7 @@ nasty-banner-server.example.com/junk.cgi\?output=trash
               
                 
-                    
+                    
@@ -3420,9 +3409,9 @@ nasty-banner-server.example.com/junk.cgi\?output=trash
                       This can lead to problems on web sites that depend
                       on looking at this header in order to customize their
                       content for different browsers (which, by the way, is
-                      NOT the right
-                      thing to do: good web sites work
-                      browser-independently).
+                      NOT the right thing to do: good
+                      web sites work browser-independently).

                   Warning Warning
                   
 
                   
                     
                   
                 
@@ -3431,9 +3420,9 @@ nasty-banner-server.example.com/junk.cgi\?output=trash
               Using this action in multi-user setups or wherever different
               types of browsers will access the same Privoxy is not recommended. In single-user,
-              single-browser setups, you might use it to delete your OS
-              version information from the headers, because it is an
+              "emphasis">not recommended. In
+              single-user, single-browser setups, you might use it to delete
+              your OS version information from the headers, because it is an
               invitation to exploit known bugs for your OS. It is also
               occasionally useful to forge this in order to access sites that
               won't let you in otherwise (though there may be a good reason
@@ -3449,7 +3438,7 @@ nasty-banner-server.example.com/junk.cgi\?output=trash
             
Example usage:
 
             
-              
+              

                 
                   
                     @@ -3525,7 +3514,7 @@ nasty-banner-server.example.com/junk.cgi\?output=trash
             Example usages:
 
             
-              
+              

                 
                   
                     @@ -3617,7 +3606,7 @@ nasty-banner-server.example.com/junk.cgi\?output=trash
             Example usage (sections):
 
             
-              
+              

                 
                   
                     @@ -3726,7 +3715,7 @@ nasty-banner-server.example.com/junk.cgi\?output=trash
             Example usage:
 
             
-              
+              

                 
                   
                     @@ -3803,7 +3792,7 @@ nasty-banner-server.example.com/junk.cgi\?output=trash
             Example usages:
 
             
-              
+              

                 
                   
                     @@ -3897,7 +3886,7 @@ www.privoxy.org/user-manual/
             Example usage (section):
 
             
-              
+              

                 
                   
                     @@ -3972,7 +3961,7 @@ example.org/instance-that-is-delivered-as-xml-but-is-not
             Example usage (section):
 
             
-              
+              

                 
                   
                     @@ -4000,7 +3989,7 @@ example.org/instance-that-is-delivered-as-xml-but-is-not
             
               Allow only temporary "session"
               cookies (for the current browser session only).
+              "emphasis">only).
             
 
             Effect:
@@ -4043,9 +4032,10 @@ example.org/instance-that-is-delivered-as-xml-but-is-not
               generally turned on for all sites, and is the recommended
               setting.
 
-              It makes no sense at
-              all to use session-cookies-only
-              together with It makes no sense
+              at all to use session-cookies-only together with crunch-incoming-cookies
               or crunch-outgoing-cookies.
@@ -4072,7 +4062,7 @@ example.org/instance-that-is-delivered-as-xml-but-is-not
             
Example usage:

 
             
-              
+              

                 
                   
                     @@ -4102,15 +4092,17 @@ example.org/instance-that-is-delivered-as-xml-but-is-not
 
             
               This action alone doesn't do anything noticeable. If
-              both block
-              and both
+              block and handle-as-image
-              also apply, i.e. if
-              the request is to be blocked as an image, then the parameter of this action
-              decides what will be sent as a replacement.

+              also
+              apply, i.e. if the request is to be blocked as an image,
+              then the
+              parameter of this action decides what will be sent as a
+              replacement.
             

 
             Type:
@@ -4142,9 +4134,9 @@ example.org/instance-that-is-delivered-as-xml-but-is-not
 
                 
                   "target-url" to send a redirect
-                  to target-url. You can
-                  redirect to any image anywhere, even in your local
+                  "REPLACEABLE">target-url" to send a
+                  redirect to target-url.
+                  You can redirect to any image anywhere, even in your local
                   filesystem via "file:///" URL.
                   (But note that not all browsers support redirecting to a
                   local file system).
@@ -4152,11 +4144,12 @@ example.org/instance-that-is-delivered-as-xml-but-is-not
                   A good application of redirects is to use special
                   Privoxy-built-in URLs,
                   which send the built-in images, as target-url. This has the same visual
-                  effect as specifying "blank" or
-                  "pattern" in the first place,
-                  but enables your browser to cache the replacement image,
-                  instead of requesting it over and over again.
+                  "REPLACEABLE">target-url. This has the same
+                  visual effect as specifying "blank" or "pattern" in the first place, but enables
+                  your browser to cache the replacement image, instead of
+                  requesting it over and over again.
                 
               
             
@@ -4166,14 +4159,14 @@ example.org/instance-that-is-delivered-as-xml-but-is-not
             
               The URLs for the built-in images are "http://config.privoxy.org/send-banner?type=type", where type is either type", where type is either "blank" or "pattern".
 
               There is a third (advanced) type, called "auto". It is NOT to be used in "auto". It is NOT to be used in set-image-blocker, but meant for use from
               filters. Auto will select the
               type of image that would have applied to the referring page,
@@ -4185,7 +4178,7 @@ example.org/instance-that-is-delivered-as-xml-but-is-not
             

               Built-in pattern:
 
-              
+              

                 
                   
                     @@ -4197,7 +4190,7 @@ example.org/instance-that-is-delivered-as-xml-but-is-not
 
               Redirect to the BSD daemon:
 
-              
+              

                 
                   
                     @@ -4209,7 +4202,7 @@ example.org/instance-that-is-delivered-as-xml-but-is-not
 
               Redirect to the built-in pattern for better caching:
 
-              
+              

                 
                   
                     @@ -4224,7 +4217,7 @@ example.org/instance-that-is-delivered-as-xml-but-is-not
       
 
       
-        8.5.34.
+        8.5.34.
         Summary
 
         Note that many of these actions have the potential to cause a page
@@ -4246,27 +4239,29 @@ example.org/instance-that-is-delivered-as-xml-but-is-not
       just like the built-in actions. Currently, an alias name can contain
       any character except space, tab, "=",
       "{" and "}", but
-      we strongly recommend that
-      you only use "a" to "z", "0" to "9", "+", and "-". Alias names are not case sensitive, and are not
-      required to start with a "+" or "-" sign, since they are merely textually expanded.
+      we strongly
+      recommend that you only use "a"
+      to "z", "0" to
+      "9", "+", and
+      "-". Alias names are not case sensitive, and
+      are not required to start with a "+" or
+      "-" sign, since they are merely textually
+      expanded.
 
       Aliases can be used throughout the actions file, but they
-      must be defined in a special section
-      at the top of the file! And there can only be one such section
-      per actions file. Each actions file may have its own alias section, and
-      the aliases defined in it are only visible within that file.
+      must be defined in a special
+      section at the top of the file! And there can only be one
+      such section per actions file. Each actions file may have its own alias
+      section, and the aliases defined in it are only visible within that
+      file.
 
       There are two main reasons to use aliases: One is to save typing for
       frequently used combinations of actions, the other one is a gain in
       flexibility: If you decide once how you want to handle shops by
       defining an alias called "shop", you can
-      later change your policy on shops in one place, and your changes will take
-      effect everywhere in the actions file where the one place, and your changes will take effect
+      everywhere in the actions file where the "shop" alias is used. Calling aliases by their purpose
       also makes your actions files more readable.
 
@@ -4279,7 +4274,7 @@ example.org/instance-that-is-delivered-as-xml-but-is-not
 
       Now let's define some aliases...
 
-      
+      

         
           
             @@ -4328,7 +4323,7 @@ example.org/instance-that-is-delivered-as-xml-but-is-not
       (as specified further up for the "/"
       pattern):
 
-      
+      

         
           
             @@ -4381,12 +4376,12 @@ example.org/instance-that-is-delivered-as-xml-but-is-not
       together:
 
       
-        8.7.1.
+        8.7.1.
         match-all.action
 
-        Remember all actions are
-        disabled when matching starts, so we have to explicitly enable
-        the ones we want.
+        Remember all actions
+        are disabled when matching starts, so we have to
+        explicitly enable the ones we want.
 
         While the match-all.action file only
         contains a single section, it is probably the most important one. It
@@ -4394,11 +4389,12 @@ example.org/instance-that-is-delivered-as-xml-but-is-not
         "LITERAL">/", but this pattern matches all URLs. Therefore, the
         set of actions used in this "default"
-        section will be applied to all
-        requests as a start. It can be partly or wholly overridden by
-        other actions files like default.action and
-        user.action, but it will still be largely
-        responsible for your overall browsing experience.
+        section will be applied to
+        all requests as a start. It can be partly or wholly
+        overridden by other actions files like default.action and user.action, but it will still be largely responsible
+        for your overall browsing experience.
 
         Again, at the start of matching, all actions are disabled, so
         there is no need to disable any actions here. (Remember: a
@@ -4407,7 +4403,7 @@ example.org/instance-that-is-delivered-as-xml-but-is-not
         this long line has been made more readable by splitting it into
         multiple lines with line continuation.
 
-        
+        

           
             
               @@ -4429,7 +4425,7 @@ example.org/instance-that-is-delivered-as-xml-but-is-not
       
 
       
-        8.7.2.
+        8.7.2.
         default.action
 
         If you aren't a developer, there's no need for you to edit the
@@ -4446,7 +4442,7 @@ example.org/instance-that-is-delivered-as-xml-but-is-not
         use that prevents older Privoxy
         versions from reading the file:
 
-        
+        

           
             
               @@ -4465,7 +4461,7 @@ for-privoxy-version=3.0.11
         "actions-file.html#ALIASES">chapter on aliases, that also
         explains why and how aliases are used:
 
-        
+        

           
             
               @@ -4508,7 +4504,7 @@ for-privoxy-version=3.0.11
         pre-defined fragile alias instead of stating
         the list of actions explicitly:
 
-        
+        

           
             
               @@ -4531,7 +4527,7 @@ mail.google.com
         cookies to log in, and pop-up windows for shopping carts or item
         details. Again, we'll use a pre-defined alias:
 
-        
+        

           
             
               @@ -4553,7 +4549,7 @@ mail.google.com
         "FILENAME">match-all.action, breaks some sites. So disable it
         for popular sites where we know it misbehaves:
 
-        
+        

           
             
               @@ -4571,17 +4567,17 @@ edit.*.yahoo.com
 
         It is important that Privoxy
         knows which URLs belong to images, so that if they are to be blocked, a substitute
-        image can be sent, rather than an HTML page. Contacting the remote
-        site to find out is not an option, since it would destroy the loading
-        time advantage of banner blocking, and it would feed the advertisers
-        information about you. We can mark any URL as an image with the
-        if they are to be blocked,
+        a substitute image can be sent, rather than an HTML page. Contacting
+        the remote site to find out is not an option, since it would destroy
+        the loading time advantage of banner blocking, and it would feed the
+        advertisers information about you. We can mark any URL as an image
+        with the handle-as-image action,
         and marking all URLs that end in a known image file extension is a
         good start:

 
-        
+        

           
             
               @@ -4602,9 +4598,9 @@ edit.*.yahoo.com
         And then there are known banner sources. They often use scripts to
         generate the banners, so it won't be visible from the URL that the
         request is for an image. Hence we block them and mark them as images in one go, with
-        the help of our +block-as-image alias
-        defined above. (We could of course just as well use and mark them as images in
+        one go, with the help of our +block-as-image
+        alias defined above. (We could of course just as well use +block +handle-as-image here.)
         Remember that the type of the replacement image is chosen by the
@@ -4615,7 +4611,7 @@ edit.*.yahoo.com
         "actions-file.html#SET-IMAGE-BLOCKER">set-image-blocker{pattern}
         action before, it still applies and needn't be repeated:
 
-        
+        

           
             
               @@ -4652,7 +4648,7 @@ bs*.gsanet.com
         comes a list of individual patterns for specific sites, which is
         omitted here to keep the example short:
 
-        
+        

           
             
               @@ -4679,20 +4675,20 @@ count*.
         
 
         It's quite remarkable how many advertisers actually call their
-        banner servers ads.company.com, or
-        call the directory in which the banners are stored simply
+        banner servers ads.company.com,
+        or call the directory in which the banners are stored simply
         "banners". So the above generic patterns
         are surprisingly effective.
 
         But being very generic, they necessarily also catch URLs that we
         don't want to block. The pattern .*ads. e.g.
-        catches "nasty-ads.nasty-corp.com" as intended,
-        but also "downloads.sourcefroge.net" or
-        "adsl.some-provider.net." So here
-        come some well-known exceptions to the +"nasty-ads.nasty-corp.com" as intended, but
+        also "downloads.sourcefroge.net" or "adsl.some-provider.net." So here come
+        some well-known exceptions to the +block section above.

 
         Note that these are exceptions to exceptions from the default!
@@ -4706,12 +4702,12 @@ count*.
         "LITERAL">+block applies.
         And now, it'll match .*loads., where
         -block
-        applies, so (unless it matches again further down) it ends up with no
+        applies, so (unless it matches again further down) it ends up with no
         block
         action applying.
 
-        
+        

           
             
               @@ -4746,10 +4742,10 @@ www.ugu.com/sui/ugu/adv
         exception for our friends at sourceforge.net, and all paths with
         "cvs" in them. Note that -filter
-        disables all filters in one
-        fell swoop!
+        disables all
+        filters in one fell swoop!
 
-        
+        

           
             
               @@ -4772,7 +4768,7 @@ wiki.
       
 
       
-        8.7.3.
+        8.7.3.
         user.action
 
         So far we are painting with a broad brush by setting general
@@ -4784,15 +4780,16 @@ wiki.
         is parsed after all other actions files and hence has the last word,
         over-riding any previously defined actions. user.action is also a safe place for your personal settings,
-        since default.action is actively maintained
-        by the Privoxy developers and you'll
-        probably want to install updated versions from time to time.
+        "emphasis">safe place for your
+        personal settings, since default.action is
+        actively maintained by the Privoxy
+        developers and you'll probably want to install updated versions from
+        time to time.
 
         So let's look at a few examples of things that one might typically
         do in user.action:
 
-        
+        

           
             
               @@ -4807,7 +4804,7 @@ wiki.
         from default.action, unless you repeat them
         here:
 
-        
+        

           
             
               @@ -4852,7 +4849,7 @@ handle-as-text = -filter +-
 
-        
+        

           
             
               @@ -4869,7 +4866,7 @@ handle-as-text = -filter +-Your bank is allergic to some filter, but you don't know which, so
         you disable them all:
 
-        
+        

           
             
               @@ -4883,7 +4880,7 @@ handle-as-text = -filter +-Some file types you may not want to filter for various
         reasons:
 
-        
+        

           
             
               @@ -4912,7 +4909,7 @@ stupid-server.example.com/
         in .gif will be tagged as images by the
         general rules as set in default.action anyway:
 
-        
+        

           
             
               @@ -4934,7 +4931,7 @@ stupid-server.example.com/
         as a "broken image" icon by the browser.
         Use cautiously.
 
-        
+        

           
             
               @@ -4953,14 +4950,14 @@ stupid-server.example.com/
         culprit, and you were again too lazy to give feedback, so you just used the fragile alias on the site, and -- whoa! -- it worked. The fragile aliases disables those actions that are most
-        likely to break a site. Also, good for testing purposes to see if it
-        is Privoxy that is causing the
-        problem or not. We later find other regular sites that misbehave, and
-        add those to our personalized list of troublemakers:
-
-        
+        "emphasis">whoa! -- it worked. The
+        fragile aliases disables those actions that
+        are most likely to break a site. Also, good for testing purposes to
+        see if it is Privoxy that is causing
+        the problem or not. We later find other regular sites that misbehave,
+        and add those to our personalized list of troublemakers:
+
+        

           
             
               @@ -4978,7 +4975,7 @@ stupid-server.example.com/
         distributed actions file. So you'd like to turn it on in your
         private, update-safe config, once and for all:
 
-        
+        

           
             
               @@ -5001,7 +4998,7 @@ stupid-server.example.com/
         to survive. So you might want to specifically allow banners for those
         sites that you feel provide value to you:
 
-        
+        

           
             
               @@ -5028,7 +5025,7 @@ stupid-server.example.com/
         a download type dialog. In my case, I want to look at the shell
         script, and then I can save it should I choose to.
 
-        
+        

           
             
               @@ -5044,11 +5041,11 @@ stupid-server.example.com/
         default.action. Some actions are safe to
         have their default policies set here though. So let's set a default
         policy to have a "blank" image as opposed
-        to the checkerboard pattern for ALL sites. "/" of course matches all URL paths and patterns:
+        to the checkerboard pattern for ALL sites. "/" of
+        course matches all URL paths and patterns:
 
-        
+        

           
             
               @@ -5064,7 +5061,7 @@ stupid-server.example.com/
   
 
   
-    
+    
 
     
diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html
index dfbf7014..e3bf012b 100644
--- a/doc/webserver/user-manual/appendix.html
+++ b/doc/webserver/user-manual/appendix.html
@@ -6,31 +6,20 @@
   Appendix
-  
+  
-  
 
-
+
     

   
   
   
   
   
 
   
-        
+        
@@ -42,7 +31,7 @@ body {
         
       Privoxy 3.0.20 User Manual Privoxy 3.0.19 User Manual
       
 
        
       
     
-    
+    
   
 
   
@@ -95,11 +84,11 @@ body {
       
-            
+            
         
           . - Matches any
-            single character, e.g. "a",
-            "A", "4",
-            ":", or "@". . -
+            Matches any single character, e.g. "a", "A", "4", ":", or
+            "@".
           
         
       
@@ -107,8 +96,8 @@ body {
       
-            
@@ -117,8 +106,9 @@ body {
       
         
           ? - The preceding
-            character or expression is matched ZERO or ONE times.
+            ? - The
+            preceding character or expression is matched ZERO or ONE times.
             Either/or.
           
         
-            
+            
         
           + - The preceding
-            character or expression is matched ONE or MORE times. + - The
+            preceding character or expression is matched ONE or MORE
+            times.
           
         
       
@@ -126,8 +116,9 @@ body {
       
-            
+            
         
           * - The preceding
-            character or expression is matched ZERO or MORE times. * - The
+            preceding character or expression is matched ZERO or MORE
+            times.
           
         
       
@@ -135,7 +126,7 @@ body {
       
-            
-            
         
           \ - The
+            \ - The
             "escape" character denotes that the
             following character should be taken literally. This is used where
             one of the special characters (e.g. 
         

           [ ] - Characters
-            enclosed in brackets will be matched if any of the enclosed
-            characters are encountered. For instance, [ ] -
+            Characters enclosed in brackets will be matched if any of the
+            enclosed characters are encountered. For instance, "[0-9]" matches any numeric digit (zero through
             nine). As an example, we can combine this with "+" to match any digit one of more times:
@@ -165,8 +156,8 @@ body {
       
-            
@@ -175,7 +166,7 @@ body {
       
         
           ( ) - parentheses
-            are used to group a sub-expression, or multiple
+            ( ) -
+            parentheses are used to group a sub-expression, or multiple
             sub-expressions.
           
         
-            
         
           | - The
+            | - The
             "bar" character works like an
             "or" conditional statement. A match is
             successful if the sub-expression on either side of 
 
-      /.*/banners/.* - A simple example that uses the
-      common combination of "." and "*" to denote any character, zero or more times. In
-      other words, any string at all. So we start with a literal forward
-      slash, then our regular expression pattern (/.*/banners/.* - A simple example that uses
+      the common combination of "." and
+      "*" to denote any character, zero or more
+      times. In other words, any string at all. So we start with a literal
+      forward slash, then our regular expression pattern (".*") another literal forward slash, the string
       "banners", another forward slash, and lastly
       another ".*". We are building a directory
@@ -214,16 +205,17 @@ body {
 
       
And now something a little more complex:
 
-      /.*/adv((er)?ts?|ertis(ing|ements?))?/ - We have
-      several literal forward slashes again ("/"),
-      so we are building another expression that is a file path statement. We
-      have another ".*", so we are matching
-      against any conceivable sub-path, just so it matches our expression.
-      The only true literal that must
-      match our pattern is adv,
-      together with the forward slashes. What comes after the "adv" string is the interesting part.
+      /.*/adv((er)?ts?|ertis(ing|ements?))?/ - We
+      have several literal forward slashes again ("/"), so we are building another expression that is a
+      file path statement. We have another ".*",
+      so we are matching against any conceivable sub-path, just so it matches
+      our expression. The only true literal that must match our pattern is
+      adv, together with the forward
+      slashes. What comes after the "adv" string
+      is the interesting part.
 
       Remember the "?" means the preceding
       expression (either a literal character or anything grouped with
@@ -235,15 +227,14 @@ body {
       "QUOTE">"s". The "|" means
       "or". We have two of those. For instance,
       "(ing|ements?)", can expand to match either
-      "ing" OR "ements?".
-      What is being done here, is an attempt at matching as many variations
-      of "advertisement", and similar, as
-      possible. So this would expand to match just "adv", or "advert", or
-      "adverts", or "advertising", or "advertisement", or "ing" OR "ements?". What is
+      being done here, is an attempt at matching as many variations of
+      "advertisement", and similar, as possible.
+      So this would expand to match just "adv", or
+      "advert", or "adverts", or "advertising",
+      or "advertisement", or "advertisements". You get the idea. But it would not
       match "advertizements" (with a "z"). We could fix that by changing our regular
@@ -251,8 +242,8 @@ body {
       "QUOTE">"/.*/adv((er)?ts?|erti(s|z)(ing|ements?))?/", which
       would then match either spelling.
 
-      /.*/advert[0-9]+\.(gif|jpe?g) - Again another
+      
/.*/advert[0-9]+\.(gif|jpe?g) - Again another
       path statement with forward slashes. Anything in the square brackets
       "[ ]" can be matched. This is using
       "0-9" as a shorthand expression to mean any
@@ -302,7 +293,7 @@ body {
     
 
     

-      14.2. Privoxy's
+      14.2. Privoxy's
       Internal Pages
 
       Since Privoxy proxies each
@@ -322,7 +313,7 @@ body {
 
       

         
-          Privoxy main page:

+          Privoxy main page:

 
           
             
           
Show information about the current configuration, including
-          viewing and editing of actions files:

+          viewing and editing of actions files:

 
           
             
 
         

-          Show the source code version numbers:
+          Show the source code version numbers:

 
           
             
 
         

-          Show the browser's request headers:
+          Show the browser's request headers:

 
           
             
 
         

-          Show which actions apply to a URL and why:
+          Show which actions apply to a URL and why:

 
           
             "off", "Privoxy" continues to run, but only as a
           pass-through proxy, with no actions taking place:

+          "AEN5840" id="AEN5840">
 
           
             http://config.privoxy.org/toggle
           
 
-          Short cuts. Turn off, then on:

+          Short cuts. Turn off, then on:

 
           
             http://config.privoxy.org/toggle?set=disable
-          

+          

 
           
             actions and filters to any given URL can be complex,
       and not always so easy to understand what is happening. And sometimes
-      we need to be able to see
-      just what Privoxy is doing.
-      Especially, if something Privoxy is
-      doing is causing us a problem inadvertently. It can be a little
-      daunting to look at the actions and filters files themselves, since
-      they tend to be filled with regular
-      expressions whose consequences are not always so obvious.
+      we need to be able to see just what Privoxy is doing. Especially, if something
+      Privoxy is doing is causing us a
+      problem inadvertently. It can be a little daunting to look at the
+      actions and filters files themselves, since they tend to be filled with
+      regular expressions whose
+      consequences are not always so obvious.
 
       One quick test to see if Privoxy is
       causing a problem or not, is to disable it temporarily. This should be
@@ -649,7 +641,7 @@ body {
       "_top">google.com, and look at it one section at a time in a sample
       configuration (your real configuration may vary):
 
-      
+      

         
           
             @@ -715,8 +707,8 @@ In file: user.action [ View ] "+session-cookies-only" (i.e. not persistent). So we
       will allow persistent cookies for google, at least that is how it is in
-      this example. The second turns off any off any "+fast-redirects" action, allowing this to take
       place unmolested. Note that there is a leading dot here -- [ View ] "actions" to "google.com":
 
-      
+      

         
           
             @@ -819,7 +811,7 @@ In file: user.action [ View ] Now another example, "ad.doubleclick.net":
 
-      
+      

         
           
             @@ -853,7 +845,7 @@ In file: user.action [ View ] "ad.doubleclick.net" is done here -- as both a "+block{}"
-      and an and an "+handle-as-image". The custom alias "+block-as-image" just
@@ -863,7 +855,7 @@ In file: user.action [ View ] "http://www.example.net/adsl/HOWTO/". This one is giving
       us problems. We are getting a blank page. Hmmm ...
 
-      
+      

         
           
             @@ -944,13 +936,13 @@ In file: user.action [ View ] user.action file) that explicitly un blocks ( un blocks ( "{-block}")
       paths with "adsl" in them (remember, last
       match in the configuration wins). There are various ways to handle such
       exceptions. Example:
 
-      
+      

         
           
             @@ -969,7 +961,7 @@ In file: user.action [ View ] But now what about a situation where we get no explicit matches like
       we did with:
 
-      
+      

         
           
             @@ -992,7 +984,7 @@ In file: user.action [ View ] "+filter":
 
-      
+      

         
           
             @@ -1013,7 +1005,7 @@ In file: user.action [ View ] ". Or you could do your own exception to negate
       filtering:
 
-      
+      

         
           
             @@ -1037,14 +1029,14 @@ In file: user.action [ View ] "+filter{banners-by-size}" rule, which assumes that
       images of certain sizes are ad banners (works well most of the time since these tend to be
-      standardized).
+      "emphasis">most of the time since these
+      tend to be standardized).
 
       "{ fragile }" is
       an alias that disables most actions that are the most likely to cause
       trouble. This can be used as a last resort for problem sites.
 
-      
+      

         
           
             @@ -1057,12 +1049,12 @@ In file: user.action [ View ] 
       
 
-      Remember to flush caches!
-      Note that the mail.google reference lacks the
-      TLD portion (e.g. ".com"). This will
-      effectively match any TLD with google in it,
-      such as mail.google.de., just as an
-      example.
+      Remember to flush
+      caches! Note that the mail.google
+      reference lacks the TLD portion (e.g. ".com"). This will effectively match any TLD with
+      google in it, such as mail.google.de., just as an example.
 
       If this still does not work, you will have to go through the
       remaining actions one by one to find which one(s) is causing the
@@ -1071,7 +1063,7 @@ In file: user.action [ View ] 
 
   

-    
+    
 
     
diff --git a/doc/webserver/user-manual/config.html b/doc/webserver/user-manual/config.html
index d6b513de..40465290 100644
--- a/doc/webserver/user-manual/config.html
+++ b/doc/webserver/user-manual/config.html
@@ -6,35 +6,22 @@
   The Main Configuration File
-  
+  
-  
 
-
+
     

   
   
   
   
   
   
 
   
-        
+        
@@ -47,7 +34,7 @@ body {
         "actions-file.html" accesskey="N">Next
       Privoxy 3.0.20 User Manual Privoxy 3.0.19 User Manual
       
 
       
       
     
-    
+    
   
 
   
@@ -61,7 +48,7 @@ body {
     (any number of spaces or tabs). For example:
 
       confdir /etc/privoxy
+    "emphasis">confdir /etc/privoxy
 
     Assigns the value /etc/privoxy to the option
     confdir and thus indicates that the
@@ -110,7 +97,8 @@ body {
             
Default value:
 
             
-              Unset
+              Unset
             
 
             Effect if unset:
@@ -118,8 +106,8 @@ body {
             
               http://www.privoxy.org/version/user-manual/ will be used,
-              where version is the
+              "REPLACEABLE">version/user-manual/ will be
+              used, where version is the
               Privoxy version.
             
 
@@ -138,7 +126,7 @@ body {
               local PATH to where the User Manual is located:
 
-              
+              

                 
                   
                     @@ -158,7 +146,7 @@ body {
               If the documentation is not on the local system, it can be
               accessed from a remote server, as:
 
-              
+              

                 
                   
                     @@ -171,15 +159,15 @@ body {
               
                 
-                    
+                    
                   Warning Warning
                   
 
                   
                     
                       If set, this option should be the first option in the config
-                      file, because it is used while the config file
-                      is being read on start-up.
+                      "emphasis">the first option in the
+                      config file, because it is used while the
+                      config file is being read on start-up.
                     
                   
                 
@@ -211,7 +199,8 @@ body {
             Default value:
 
             
-              Unset
+              Unset
             
 
             Effect if unset:
@@ -225,8 +214,8 @@ body {
             
               The value of this option only matters if the experimental
               trust mechanism has been activated. (See trustfile below.)
+              "config.html#TRUSTFILE">trustfile below.)
 
               If you use the trust mechanism, it is a good idea to write
               up some on-line documentation about your trust policy and to
@@ -263,7 +252,8 @@ body {
             
Default value:
 
             
-              Unset
+              Unset
             
 
             Effect if unset:
@@ -308,7 +298,8 @@ body {
             Default value:
 
             
-              Unset
+              Unset
             
 
             Effect if unset:
@@ -369,15 +360,16 @@ body {
             Default value:
 
             
-              /etc/privoxy (Unix) or /etc/privoxy (Unix) or Privoxy installation dir (Windows)
             
 
             Effect if unset:
 
             
-              Mandatory
+              Mandatory
             
 
             Notes:
@@ -458,15 +450,16 @@ body {
             Default value:
 
             
-              /var/log/privoxy (Unix) or /var/log/privoxy (Unix) or Privoxy installation dir (Windows)
             
 
             Effect if unset:
 
             
-              Mandatory
+              Mandatory
             
 
             Notes:
@@ -586,9 +579,8 @@ body {
             Default value:
 
             
-              default.filter (Unix) or default.filter.txt
-              (Windows)
+              default.filter (Unix) or default.filter.txt (Windows)
             
 
             Effect if unset:
@@ -597,8 +589,8 @@ body {
               No textual content filtering takes place, i.e. all
               +filter{name} actions in the actions files
-              are turned neutral.
+              "REPLACEABLE">name} actions in the actions
+              files are turned neutral.
             
 
             Notes:
@@ -618,9 +610,9 @@ body {
 
               The +filter{name} actions rely on the relevant
-              filter (name) to be defined in
-              a filter file!
+              "REPLACEABLE">name} actions rely on the
+              relevant filter (name) to
+              be defined in a filter file!
 
               A pre-defined filter file called default.filter that contains a number of useful
@@ -658,9 +650,10 @@ body {
             
Default value:
 
             
-              Unset (commented
-              out). When activated: logfile (Unix) or privoxy.log (Windows).
+              Unset (commented
+              out). When activated: logfile (Unix) or privoxy.log
+              (Windows).
             
 
             Effect if unset:
@@ -724,9 +717,10 @@ body {
             Default value:
 
             
-              Unset (commented
-              out). When activated: trust (Unix) or trust.txt (Windows)
+              Unset (commented
+              out). When activated: trust (Unix) or trust.txt
+              (Windows)
             
 
             Effect if unset:
@@ -740,8 +734,8 @@ body {
             
               The trust mechanism is an experimental feature for building
               white-lists and should be used with care. It is NOT recommended for the casual
-              user.
+              "emphasis">NOT recommended for
+              the casual user.
 
               If you specify a trust file, Privoxy will only allow access to sites
@@ -755,14 +749,14 @@ body {
               etc.
 
               Or, you can designate sites as trusted referrers, by prepending
-              the name with a + character. The
-              effect is that access to untrusted sites will be granted -- but
-              only if a link from this trusted referrer was used to get
-              there. The link target will then be added to the "trustfile" so that future, direct accesses will
-              be granted. Sites added via this mechanism do not become
-              trusted referrers themselves (i.e. they are added with a
+              "emphasis">trusted referrers, by
+              prepending the name with a +
+              character. The effect is that access to untrusted sites will be
+              granted -- but only if a link from this trusted referrer was
+              used to get there. The link target will then be added to the
+              "trustfile" so that future, direct
+              accesses will be granted. Sites added via this mechanism do not
+              become trusted referrers themselves (i.e. they are added with a
               ~ designation). There is a limit of
               512 such entries, after which new entries will not be made.
 
@@ -828,7 +822,7 @@ body {
             

               The available debug levels are:
 
-              
+              

                 
                   
                     @@ -858,12 +852,12 @@ body {
               use multiple debug lines.
 
               A debug level of 1 is informative because it will show you
-              each request as it happens. 1, 1024, 4096 and 8192 are
-              recommended so that you will notice when things go
-              wrong. The other levels are probably only of interest if you
-              are hunting down a specific problem. They can produce a hell of
-              an output (especially 16).
+              each request as it happens. 1, 1024, 4096 and 8192 are recommended so
+              that you will notice when things go wrong. The other levels are
+              probably only of interest if you are hunting down a specific
+              problem. They can produce a hell of an output (especially
+              16).
 
               Privoxy used to ship with
               the debug levels recommended above enabled by default, but due
@@ -875,8 +869,8 @@ body {
 
               
If you want to use pure CLF (Common Log Format), you should
               set "debug 512" ONLY and not enable anything
-              else.
+              "emphasis">ONLY and not enable
+              anything else.
 
               Privoxy has a hard-coded
               limit for the length of log messages. If it's reached, messages
@@ -907,13 +901,15 @@ body {
             
Type of value:
 
             
-              None
+              None
             
 
             Default value:
 
             
-              Unset
+              Unset
             
 
             Effect if unset:
@@ -927,8 +923,8 @@ body {
 
             
               This option is only there for debugging purposes.
-              It will drastically reduce
-              performance.
+              It will drastically
+              reduce performance.
             
           
         
@@ -955,7 +951,8 @@ body {
             Default value:
 
             
-              Unset
+              Unset
             
 
             Effect if unset:
@@ -1009,11 +1006,11 @@ body {
             Type of value:
 
             
-              [IP-Address]:Port
+              [IP-Address]:Port
 
-              [Hostname]:Port
+              [Hostname]:Port
             
 
             Default value:
@@ -1116,7 +1113,7 @@ body {
               another outside connection with a different address. You want
               it to serve requests from inside only:
 
-              
+              

                 
                   
                     @@ -1131,7 +1128,7 @@ body {
               want it to listen on the IPv6 address of the loopback
               device:
 
-              
+              

                 
                   
                     @@ -1230,15 +1227,15 @@ body {
               block ads or filter content.
 
               Access to the toggle feature can not be controlled separately by
-              "ACLs" or HTTP authentication, so
-              that everybody who can access not be controlled
+              separately by "ACLs" or HTTP
+              authentication, so that everybody who can access Privoxy (see "ACLs" and listen-address above) can toggle it for all
-              users. So this option is not
-              recommended for multi-user environments with untrusted
-              users.
+              users. So this option is not recommended for multi-user
+              environments with untrusted users.
 
               Note that malicious client side code (e.g Java) is also
               capable of using this option.
@@ -1344,8 +1341,8 @@ body {
             Notes:
 
             
-              Access to the editor can not be controlled separately by
+              
Access to the editor can not be controlled separately by
               "ACLs" or HTTP authentication, so
               that everybody who can access Privoxy (see listen-address above) can modify its
               configuration for all users.
 
-              This option is not
-              recommended for environments with untrusted users and as
-              a lot of Privoxy users don't
-              read documentation, this feature is disabled by default.
+              This option is not recommended for environments with
+              untrusted users and as a lot of Privoxy users don't read documentation,
+              this feature is disabled by default.
 
               Note that malicious client side code (e.g Java) is also
               capable of using the actions editor and you shouldn't enable
@@ -1387,13 +1385,13 @@ body {
             
Type of value:
 
             
-              0 or 1
+              0 or 1
             
 
             Default value:
 
             
-              0
+              0
             
 
             Effect if unset:
@@ -1456,43 +1454,44 @@ body {
             Type of value:
 
             
-              src_addr[:port][/src_masklen] [dst_addr[:port][/dst_masklen]]
+              src_addr[:port][/src_masklen] [dst_addr[:port][/dst_masklen]]
 
-              Where src_addr and
-              dst_addr are IPv4 addresses in
-              dotted decimal notation or valid DNS names, port is a port number, and src_masklen and dst_masklen are subnet masks in CIDR
+              
Where src_addr and
+              dst_addr are IPv4 addresses
+              in dotted decimal notation or valid DNS names, port is a port number, and src_masklen and dst_masklen are subnet masks in CIDR
               notation, i.e. integer values from 2 to 30 representing the
               length (in bits) of the network address. The masks and the
               whole destination part are optional.
 
               If your system implements RFC
-              3493, then src_addr and
-              dst_addr can be IPv6 addresses
-              delimeted by brackets, port can
-              be a number or a service name, and src_masklen and dst_masklen can be a number from 0 to
-              128.
+              3493, then src_addr and
+              dst_addr can be IPv6
+              addresses delimeted by brackets, port can be a number or a service
+              name, and src_masklen and
+              dst_masklen can be a number
+              from 0 to 128.
             
 
             Default value:
 
             
-              Unset
+              Unset
 
-              If no port is specified, any
-              port will match. If no src_masklen or src_masklen is given, the complete IP
+              
If no port is specified,
+              any port will match. If no src_masklen or src_masklen is given, the complete IP
               address has to match (i.e. 32 bits for IPv4 and 128 bits for
               IPv6).
             
@@ -1508,14 +1507,14 @@ body {
 
             
               Access controls are included at the request of ISPs and
-              systems administrators, and are not usually needed by individual
-              users. For a typical home user, it will normally suffice
-              to ensure that Privoxy only
-              listens on the localhost (127.0.0.1) or internal (home) network
-              address by means of the listen-address option.
+              systems administrators, and are not usually needed by individual
+              users. For a typical home user, it will normally
+              suffice to ensure that Privoxy
+              only listens on the localhost (127.0.0.1) or internal (home)
+              network address by means of the listen-address option.
 
               Please see the warnings in the FAQ that Privoxy is not intended to be a substitute
@@ -1533,20 +1532,20 @@ body {
               
If Privoxy is using a
               forwarder (see forward below) for a
               particular destination URL, the dst_addr that is examined is the address
-              of the forwarder and NOT the address of the ultimate
-              target. This is necessary because it may be impossible for the
-              local Privoxy to determine the
-              IP address of the ultimate target (that's often what gateways
-              are used for).
+              "REPLACEABLE">dst_addr that is examined is the
+              address of the forwarder and NOT the address of the ultimate target.
+              This is necessary because it may be impossible for the local
+              Privoxy to determine the IP
+              address of the ultimate target (that's often what gateways are
+              used for).
 
               You should prefer using IP addresses over DNS names, because
               the address lookups take time. All DNS names must resolve! You
-              can not use domain
-              patterns like "*.org" or partial
-              domain names. If a DNS name resolves to multiple IP addresses,
-              only the first one is used.
+              can not
+              use domain patterns like "*.org" or
+              partial domain names. If a DNS name resolves to multiple IP
+              addresses, only the first one is used.
 
               Some systems allow IPv4 clients to connect to IPv6 server
               sockets. Then the client's IPv4 address will be translated by
@@ -1566,11 +1565,11 @@ body {
               
Explicitly define the default behavior if no ACL and
               listen-address are set: "localhost" is OK. The absence of a dst_addr implies that all destination addresses are
-              OK:
+              "REPLACEABLE">dst_addr implies that all destination
+              addresses are OK:
 
-              
+              

                 
                   
                     @@ -1584,7 +1583,7 @@ body {
               access to nothing but www.example.com (or other domains hosted
               on the same system):
 
-              
+              

                 
                   
                     @@ -1599,7 +1598,7 @@ body {
               192.168.45.73 may not access the IP address behind
               www.dirty-stuff.example.com:
 
-              
+              

                 
                   
                     @@ -1614,7 +1613,7 @@ body {
               listening on an IPv6 wild card address (not supported on all
               platforms):
 
-              
+              

                 
                   
                     @@ -1627,7 +1626,7 @@ body {
               This is equivalent to the following line even if listening
               on an IPv4 address (not supported on all platforms):
 
-              
+              

                 
                   
                     @@ -1689,8 +1688,8 @@ body {
               document is made. Remember that there may be multiple threads
               running, which might require up to buffer-limit Kbytes each, unless you have enabled
-              "single-threaded" above.
+              "emphasis">each, unless you have
+              enabled "single-threaded" above.
             
           
         
@@ -1738,18 +1737,18 @@ body {
             Type of value:
 
             
-              target_pattern http_parent[:port]
+              target_pattern
+              http_parent[:port]
 
-              where target_pattern is a
-              URL pattern that
+              
where target_pattern is
+              a URL pattern that
               specifies to which requests (i.e. URLs) this forward rule shall
               apply. Use / to denote "all URLs". http_parent[:port] is the DNS name or IP address of
-              the parent HTTP proxy through which the requests should be
+              "REPLACEABLE">http_parent[:port] is the DNS name or IP address
+              of the parent HTTP proxy through which the requests should be
               forwarded, optionally followed by its listening port (default:
               8000). Use a single dot (.) to denote
               "no forwarding".
@@ -1758,7 +1757,8 @@ body {
             
Default value:
 
             
-              Unset
+              Unset
             
 
             Effect if unset:
@@ -1770,17 +1770,17 @@ body {
             Notes:
 
             
-              If http_parent is
+              
If http_parent is
               ".", then requests are not forwarded
               to another HTTP proxy but are made directly to the web
               servers.
 
-              http_parent can be a
+              
http_parent can be a
               numerical IPv6 address (if RFC 3493
               is implemented). To prevent clashes with the port delimiter,
               the whole IP address has to be put into brackets. On the other
-              hand a target_pattern
+              hand a target_pattern
               containing an IPv6 address has to be put into angle brackets
               (normal brackets are reserved for regular expressions
               already).
@@ -1795,7 +1795,7 @@ body {
               Everything goes to an example parent proxy, except SSL on
               port 443 (which it doesn't handle):
 
-              
+              

                 
                   
                     @@ -1809,7 +1809,7 @@ body {
               Everything goes to our example ISP's caching proxy, except
               for requests to that ISP's sites:
 
-              
+              

                 
                   
                     @@ -1822,7 +1822,7 @@ body {
 
               Parent proxy specified by an IPv6 address:
 
-              
+              

                 
                   
                     @@ -1834,7 +1834,7 @@ body {
 
               Suppose your parent proxy doesn't support IPv6:
 
-              
+              

                 
                   
                     @@ -1868,31 +1868,32 @@ body {
             Type of value:
 
             
-              target_pattern socks_proxy[:port] http_parent[:port]
+              target_pattern
+              socks_proxy[:port] http_parent[:port]
 
-              where target_pattern is a
-              URL pattern that
+              
where target_pattern is
+              a URL pattern that
               specifies to which requests (i.e. URLs) this forward rule shall
               apply. Use / to denote "all URLs". http_parent and socks_proxy are IP addresses in dotted
-              decimal notation or valid DNS names (http_parent may be http_parent and socks_proxy are IP addresses in
+              dotted decimal notation or valid DNS names (http_parent may be "." to denote "no HTTP
               forwarding"), and the optional port parameters are TCP ports, i.e.
+              "REPLACEABLE">port parameters are TCP ports, i.e.
               integer values from 1 to 65535
             
 
             Default value:
 
             
-              Unset
+              Unset
             
 
             Effect if unset:
@@ -1916,17 +1917,18 @@ body {
               With forward-socks5 the DNS
               resolution will happen on the remote server as well.
 
-              socks_proxy and http_parent can be a numerical IPv6
-              address (if RFC 3493 is implemented). To prevent clashes
-              with the port delimiter, the whole IP address has to be put
-              into brackets. On the other hand a target_pattern containing an IPv6 address
-              has to be put into angle brackets (normal brackets are reserved
-              for regular expressions already).
-
-              If http_parent is
+              
socks_proxy and
+              http_parent can be a
+              numerical IPv6 address (if RFC 3493
+              is implemented). To prevent clashes with the port delimiter,
+              the whole IP address has to be put into brackets. On the other
+              hand a target_pattern
+              containing an IPv6 address has to be put into angle brackets
+              (normal brackets are reserved for regular expressions
+              already).
+
+              If http_parent is
               ".", then requests are not forwarded
               to another HTTP proxy but are made (HTTP-wise) directly to the
               web servers, albeit through a SOCKS proxy.
@@ -1940,7 +1942,7 @@ body {
               everything outbound goes through their ISP's proxy by way of
               example.com's corporate SOCKS 4A gateway to the Internet.
 
-              
+              

                 
                   
                     @@ -1954,7 +1956,7 @@ body {
               A rule that uses a SOCKS 4 gateway for all destinations but
               no HTTP parent looks like this:
 
-              
+              

                 
                   
                     @@ -1967,7 +1969,7 @@ body {
               To chain Privoxy and Tor, both running on the same system,
               you would use something like:
 
-              
+              

                 
                   
                     @@ -1982,7 +1984,7 @@ body {
               access local servers you therefore might want to make some
               exceptions:
 
-              
+              

                 
                   
                     @@ -2005,7 +2007,7 @@ body {
               network by using their names, you will need additional
               exceptions that look like this:
 
-              
+              

                 
                   
                     @@ -2028,8 +2030,8 @@ body {
         content only to their subscribers, you can configure multiple
         Privoxies which have connections to
         the respective ISPs to act as forwarders to each other, so that
-        your users can see the
-        internal content of all ISPs.
+        your users can
+        see the internal content of all ISPs.
 
         Assume that host-a has a PPP connection to isp-a.example.net. And
         host-b has a PPP connection to isp-b.example.org. Both run
@@ -2038,7 +2040,7 @@ body {
 
         
host-a:
 
-        
+        

           
             
               @@ -2051,7 +2053,7 @@ body {
 
         host-b:
 
-        
+        

           
             
               @@ -2076,7 +2078,7 @@ body {
         squid configuration could then look
         like this:
 
-        
+        

           
             
               @@ -2106,7 +2108,7 @@ body {
         proxy, say, on antivir.example.com, port
         8010:
 
-        
+        

           
             
               @@ -2134,13 +2136,13 @@ body {
             Type of value:
 
             
-              Number of retries.
+              Number of retries.
             
 
             Default value:
 
             
-              0
+              0
             
 
             Effect if unset:
@@ -2153,8 +2155,9 @@ body {
             Notes:
 
             
-              forwarded-connect-retries is
-              mainly interesting for socks4a connections, where forwarded-connect-retries is mainly
+              interesting for socks4a connections, where Privoxy can't detect why the connections
               failed. The connection might have failed because of a DNS
               timeout in which case a retry makes sense, but it might also
@@ -2203,13 +2206,13 @@ body {
             
Type of value:
 
             
-              0 or 1
+              0 or 1
             
 
             Default value:
 
             
-              0
+              0
             
 
             Effect if unset:
@@ -2264,13 +2267,13 @@ body {
             Type of value:
 
             
-              0 or 1
+              0 or 1
             
 
             Default value:
 
             
-              0
+              0
             
 
             Effect if unset:
@@ -2319,13 +2322,13 @@ body {
             Type of value:
 
             
-              0 or 1
+              0 or 1
             
 
             Default value:
 
             
-              0
+              0
             
 
             Effect if unset:
@@ -2378,7 +2381,7 @@ body {
             Type of value:
 
             
-              Time in seconds.
+              Time in seconds.
             
 
             Default value:
@@ -2454,7 +2457,7 @@ body {
             Type of value:
 
             
-              Time in seconds.
+              Time in seconds.
             
 
             Default value:
@@ -2528,7 +2531,7 @@ body {
             Type of value:
 
             
-              0 or 1
+              0 or 1
             
 
             Default value:
@@ -2621,7 +2624,7 @@ body {
             Type of value:
 
             
-              Time in seconds.
+              Time in seconds.
             
 
             Default value:
@@ -2669,7 +2672,7 @@ body {
             Type of value:
 
             
-              Positive number.
+              Positive number.
             
 
             Default value:
@@ -2751,7 +2754,7 @@ body {
             Type of value:
 
             
-              0 or 1
+              0 or 1
             
 
             Default value:
@@ -2808,7 +2811,7 @@ body {
             Type of value:
 
             
-              0 or 1
+              0 or 1
             
 
             Default value:
@@ -2866,8 +2869,8 @@ body {
             Type of value:
 
             
-              Positive number ranging from 0 to
-              9.
+              Positive number ranging from 0 to
+              9.
             
 
             Default value:
@@ -2893,7 +2896,7 @@ body {
             Examples:
 
             
-              
+              

                 
                   
                     @@ -2932,7 +2935,7 @@ body {
       0.
 
         activity-animation 1

+      "emphasis">activity-animation 1

          

 
@@ -2941,7 +2944,7 @@ body {
       console window:
 
         log-messages 1

+      "emphasis">log-messages 1

          

 
@@ -2954,7 +2957,7 @@ body {
       infinitely and eat up all your memory!
 
         log-buffer-size 1

+      "emphasis">log-buffer-size 1

          

 
@@ -2962,7 +2965,7 @@ body {
       of lines held in the log buffer. See above.
 
         log-max-lines 200

+      "emphasis">log-max-lines 200

          

 
@@ -2971,21 +2974,22 @@ body {
       log messages with a bold-faced font:
 
         log-highlight-messages 1

+      "emphasis">log-highlight-messages 1

          

 
       The font used in the console window:
 
         log-font-name Comic Sans MS

+      "emphasis">log-font-name Comic Sans
+      MS

          

 
       Font size used in the console window:
 
         log-font-size 8

+      "emphasis">log-font-size 8

          

 
@@ -2994,7 +2998,7 @@ body {
       the Task bar when minimized:
 
         show-on-task-bar 0

+      "emphasis">show-on-task-bar 0

          

 
@@ -3004,7 +3008,7 @@ body {
       the exit option on the File menu).
 
         close-button-minimizes 1

+      "emphasis">close-button-minimizes 1

          

 
@@ -3014,13 +3018,13 @@ body {
       disconnect from and hide the command console.
 
         #hide-console

+      "emphasis">hide-console

          
     
   
 
   
-    
+    
 
     
diff --git a/doc/webserver/user-manual/configuration.html b/doc/webserver/user-manual/configuration.html
index fe28f3d6..8dd2b8fa 100644
--- a/doc/webserver/user-manual/configuration.html
+++ b/doc/webserver/user-manual/configuration.html
@@ -6,32 +6,21 @@
   Privoxy Configuration
-  
+  
-  
 
-
+
     

   
   
   
   
   
   
 
   
-        
+        
@@ -44,7 +33,7 @@ body {
         accesskey="N">Next
       Privoxy 3.0.20 User Manual Privoxy 3.0.19 User Manual
       
 
       
       
     
-    
+    
   
 
   
@@ -57,7 +46,7 @@ body {
     controlled easily with a web browser.
 
     
-      6.1. Controlling
+      6.1. Controlling
       Privoxy with Your Web Browser
 
       Privoxy's user interface can be
@@ -67,15 +56,15 @@ body {
       and works without Internet access. You will see the following
       section:
 
-      
+      
@@ -158,9 +147,7 @@ body {
       For Unix, *BSD and Linux, all configuration files are located in
       /etc/privoxy/ by default. For MS Windows,
       OS/2, and AmigaOS these are all in the same directory as the
-      Privoxy executable. The name and
-      number of configuration files has changed from previous versions, and
-      is subject to change as development progresses.
+      Privoxy executable.
The installed defaults provide a reasonable starting point, though
       some settings may be aggressive by some standards. For the time being,
@@ -247,18 +234,13 @@ body {
       requests for the change to take effect. When changing the listening
       address of Privoxy, these "wake up" requests must obviously be sent to the
-      old listening address.
-
-      While under development, the configuration content is subject to
-      change. The below documentation may not be accurate by the time you
-      read this. Also, what constitutes a "default" setting, may change, so please check all your
-      configuration files on important issues.
+      old listening
+      address.

-    
+    
 
     

         
           
              
 
 
-                Privoxy Menu
+                Privoxy Menu
              
 
@@ -115,7 +104,7 @@ body {
 
                 

                   
-                          ▪  Documentation
                 
               
 
       
     
   
 
   
diff --git a/doc/webserver/user-manual/contact.html b/doc/webserver/user-manual/contact.html
index aade7483..a1109c01 100644
--- a/doc/webserver/user-manual/contact.html
+++ b/doc/webserver/user-manual/contact.html
@@ -7,7 +7,7 @@
   Requests
-  
+  
-  
 
-
+
     

   
   
   
   
   
 
   
-        
+        
@@ -46,7 +36,7 @@ body {
         "copyright.html" accesskey="N">Next
       Privoxy 3.0.20 User Manual Privoxy 3.0.19 User Manual
       
 
       
       
     
-    
+    
   
 
   
@@ -151,8 +141,8 @@ body {
         "_top">http://sourceforge.net/tracker/?group_id=11118&atid=111118.
 
         Before doing so, please make sure that the bug has not already been submitted and observe
-        the additional hints at the top of the not already been submitted
+        and observe the additional hints at the top of the submit form. If already submitted, please feel free
         to add any info to the original report that might help to solve the
@@ -331,7 +321,7 @@ body {
   
 
   
-    
+    
 
     
diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html
index c3cb9e4a..ad62f17d 100644
--- a/doc/webserver/user-manual/copyright.html
+++ b/doc/webserver/user-manual/copyright.html
@@ -6,7 +6,7 @@
   Privoxy Copyright, License and History
-  
+  
@@ -14,25 +14,15 @@
   
-  
 
-
+
     

   
   
   
   
 
   
-        
+        
@@ -45,7 +35,7 @@ body {
         accesskey="N">Next
       Privoxy 3.0.20 User Manual Privoxy 3.0.19 User Manual
       
 
       
       
     
-    
+    
   
 
   
@@ -61,7 +51,7 @@ body {
     "CITETITLE">GNU General Public License.
 
     
-      12.1. License
+      12.1. License
 
       Privoxy is free software; you can
       redistribute it and/or modify it under the terms of the This program is distributed in the hope that it will be useful, but
       WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for details.

+      "_top">GNU General Public License for
+      details.
 
       You should have received a copy of the GNU
       GPL along with this program; if not, write to the
@@ -137,10 +127,8 @@ body {
        Fabian Keil, lead developer

        David Schmidt, developer

        Hal Burgiss

-       Ian Silvester

        Lee Rian

-       Roland Rosenfeld

-       Ian Silvester
+       Roland Rosenfeld
 
       Former Privoxy Team Members:
 
@@ -192,7 +180,6 @@ body {
        Markus Elfring

        Dean Gaudet

        Stephen Gildea

-       Lizik Grelier

        Daniel Griscom

        Felix Gröbert

        Jeff H.

@@ -204,10 +191,7 @@ body {
        Stefan Huehner

        Peter Hyman

        Derek Jennings

-       Andrew Jones

-       Julien Joubert

        Petr Kadlec

-       Steven Kolins

        David Laight

        Bert van Leeuwen

        Don Libes

@@ -227,7 +211,6 @@ body {
        Roberto Ragusa

        Félix Rauch

        Maynard Riley

-       Andreas Rutkauskas

        Chung-chieh Shan

        Spinor S.

        Bart Schelstraete

@@ -260,7 +243,7 @@ body {
   

 
   
-    
+    
 
     
diff --git a/doc/webserver/user-manual/filter-file.html b/doc/webserver/user-manual/filter-file.html
index 289d606c..5fa167cc 100644
--- a/doc/webserver/user-manual/filter-file.html
+++ b/doc/webserver/user-manual/filter-file.html
@@ -6,33 +6,21 @@
   Filter Files
-  
+  
-  
 
-
+
     

   
   
   
   
   
   
 
   
-        
+        
@@ -45,7 +33,7 @@ body {
         "templates.html" accesskey="N">Next
       Privoxy 3.0.20 User Manual Privoxy 3.0.19 User Manual
       
 
       
       
     
-    
+    
   
 
   
@@ -103,25 +91,26 @@ body {
 
     Just like the actions files, the
     filter file is organized in sections, which are called filters here. Each filter consists of a
-    heading line, that starts with one of the keywords FILTER:,
-    CLIENT-HEADER-FILTER: or SERVER-HEADER-FILTER: followed by the filter's
-    name, and a short (one line)
-    description of what it does.
-    Below that line come the jobs,
-    i.e. lines that define the actual text substitutions. By convention, the
-    name of a filter should describe what the filter eliminates. The comment is used in the
-    web-based user
+    "emphasis">filters here. Each filter
+    consists of a heading line, that starts with one of the keywords FILTER:, CLIENT-HEADER-FILTER: or
+    SERVER-HEADER-FILTER: followed by the filter's
+    name, and a short
+    (one line) description of what it does. Below that line come
+    the jobs, i.e.
+    lines that define the actual text substitutions. By convention, the name
+    of a filter should describe what the filter eliminates. The comment is used
+    in the web-based user
     interface.
 
-    Once a filter called name has been
+    
Once a filter called name has been
     defined in the filter file, it can be invoked by using an action of the
     form +filter{name} in any name} in any actions file.
 
     Filter definitions start with a header line that contains the filter
@@ -129,7 +118,7 @@ body {
     line for a filter called "foo" could look like
     this:
 
-    
+    

       
         
           @@ -162,7 +151,7 @@ FILTER: foo Replace all "foo" with "bar"
     started.
 
     
-      9.1. Filter File
+      9.1. Filter File
       Tutorial
 
       Now, let's complete our "foo" content
@@ -171,7 +160,7 @@ FILTER: foo Replace all "foo" with "bar"
       "QUOTE">"foo" with "bar", there is
       only one (trivial) job needed:
 
-      
+      

         
           
             @@ -182,13 +171,13 @@ s/foo/bar/
       
 
       But wait! Didn't the comment say that all occurrences of "foo" should be replaced? Our current job will only take
-      care of the first "foo" on each page. For
-      global substitution, we'll need to add the g
-      option:
+      "emphasis">all occurrences of
+      "foo" should be replaced? Our current job
+      will only take care of the first "foo" on
+      each page. For global substitution, we'll need to add the g option:
 
-      
+      

         
           
             @@ -200,7 +189,7 @@ s/foo/bar/g
 
       Our complete filter now looks like this:
 
-      
+      

         
           
             @@ -216,7 +205,7 @@ s/foo/bar/g
       arise from JavaScript abuse. Let's look at its jobs one after the
       other:
 
-      
+      

         
           
             @@ -241,20 +230,20 @@ s|(<script.*)document\.referrer(.*</script>)|$1"Not Your Business!"$2|U
       matches any character, and * means:
       "Match an arbitrary number of the element left of
       myself", this matches "<script",
-      followed by any text, i.e. it
-      matches the whole page, from the start of the first <script>
-      tag.
+      followed by any
+      text, i.e. it matches the whole page, from the start of the first
+      <script> tag.
 
       That's more than we want, but the pattern continues: document\.referrer matches only the exact string
       "document.referrer". The dot needed to be
-      escaped, i.e. preceded by a
-      backslash, to take away its special meaning as a joker, and make it
-      just a regular dot. So far, the meaning is: Match from the start of the
-      first <script> tag in a the page, up to, and including, the text
-      "document.referrer", if both are present in the page (and appear
-      in that order).
+      escaped, i.e.
+      preceded by a backslash, to take away its special meaning as a joker,
+      and make it just a regular dot. So far, the meaning is: Match from the
+      start of the first <script> tag in a the page, up to, and
+      including, the text "document.referrer", if
+      both are present
+      in the page (and appear in that order).
 
       But there's still more pattern to go. The next element, again
       enclosed in parentheses, is .*</script>.
@@ -272,14 +261,14 @@ s|(<script.*)document\.referrer(.*</script>)|$1"Not Your Business!"$2|U
       matching, which means that the first .* in the
       pattern will only "eat up" all text in
       between "<script" and the first occurrence of "document.referrer", and that the second .* will only span the text up to the first "</script>" tag. Furthermore, the s option says that the match may span multiple lines in
-      the page, and the g option again means that
-      the substitution is global.
+      "emphasis">first occurrence of
+      "document.referrer", and that the second
+      .* will only span the text up to the
+      first
+      "</script>" tag. Furthermore, the
+      s option says that the match may span multiple
+      lines in the page, and the g option again
+      means that the substitution is global.
 
       So, to summarize, the pattern means: Match all scripts that contain
       the text "document.referrer". Remember the
@@ -292,10 +281,10 @@ s|(<script.*)document\.referrer(.*</script>)|$1"Not Your Business!"$2|U
       things? So lets look at the substitute: $1"Not Your
       Business!"$2 is easy to read: The text remembered as $1, followed by "Not Your
-      Business!" (including
-      the quotation marks!), followed by the text remembered as $2. This produces an exact copy of the original string,
-      with the middle part (the  (including the quotation marks!), followed by the
+      text remembered as $2. This produces an exact
+      copy of the original string, with the middle part (the "document.referrer") replaced by "Not Your Business!".
 
@@ -309,7 +298,7 @@ s|(<script.*)document\.referrer(.*</script>)|$1"Not Your Business!"$2|U
       We'll show you two other jobs from the JavaScript taming department,
       but this time only point out the constructs of special interest:
 
-      
+      

         
           
             @@ -328,13 +317,14 @@ s/window\.status\s*=\s*(['"]).*?\1/dUmMy=1/ig
       "LITERAL">.*? makes this matching of arbitrary text ungreedy.
       (Note that the U option is not set). The
       ['"] construct means: "a
-      single or a double
-      quote". Finally, \1 is a back-reference
-      to the first parenthesis just like $1 above,
-      with the difference that in the pattern, a backslash indicates a
-      back-reference, whereas in the substitute, it's the dollar.
+      single or a
+      double quote". Finally, \1 is a
+      back-reference to the first parenthesis just like $1 above, with the difference that in the pattern, a backslash
+      indicates a back-reference, whereas in the substitute, it's the
+      dollar.
 
       So what does this job do? It replaces assignments of single- or
       double-quoted strings to the "window.status"
@@ -344,7 +334,7 @@ s/window\.status\s*=\s*(['"]).*?\1/dUmMy=1/ig
       the status bar instead of the link target when you move your mouse over
       links.
 
-      
+      

         
           
             @@ -359,21 +349,22 @@ s/(<body [^>]*)onunload(.*>)/$1never$2/iU
       Including the OnUnload event binding in the HTML DOM was a
-      CRIME. When I close a browser
-      window, I want it to close and die. Basta. This job replaces the
-      "onunload" attribute in "<body>" tags with the dummy word never. Note that the i option
-      makes the pattern matching case-insensitive. Also note that ungreedy
-      matching alone doesn't always guarantee a minimal match: In the first
-      parenthesis, we had to use [^>]* instead of
-      .* to prevent the match from exceeding the
-      <body> tag if it doesn't contain "OnUnload", but the page's content does.
+      CRIME. When I
+      close a browser window, I want it to close and die. Basta. This job
+      replaces the "onunload" attribute in
+      "<body>" tags with the dummy word
+      never. Note that the i option makes the pattern matching case-insensitive.
+      Also note that ungreedy matching alone doesn't always guarantee a
+      minimal match: In the first parenthesis, we had to use [^>]* instead of .* to
+      prevent the match from exceeding the <body> tag if it doesn't
+      contain "OnUnload", but the page's content
+      does.
 
       The last example is from the fun department:
 
-      
+      

         
           
             @@ -394,7 +385,7 @@ s/microsoft(?!\.com)/MicroSuck/ig
       to microsoft.com from being trashed, while still replacing the word
       everywhere else.
 
-      
+      

         
           
             @@ -433,7 +424,8 @@ s* industry[ -]leading \
 
       
         
-          js-annoyances
+          js-annoyances
 
           
             The purpose of this filter is to get rid of particularly
@@ -468,7 +460,8 @@ s* industry[ -]leading \
             sites that rely heavily on JavaScript.
           
 
-          js-events
+          js-events
 
           
             This is a very radical measure. It removes virtually all
@@ -476,13 +469,14 @@ s* industry[ -]leading \
             to user actions such as mouse movements or clicks, window
             resizing etc, anymore. Use with caution!
 
-            We strongly
-            discourage using this filter as a default since it breaks
-            many legitimate scripts. It is meant for use only on extra-nasty
-            sites (should you really need to go there).
+            We strongly
+            discourage using this filter as a default since it
+            breaks many legitimate scripts. It is meant for use only on
+            extra-nasty sites (should you really need to go there).
           
 
-          html-annoyances
+          html-annoyances
 
           
             This filter will undo many common instances of HTML based
@@ -495,7 +489,8 @@ s* industry[ -]leading \
             if specified otherwise.
           
 
-          content-cookies
+          content-cookies
 
           
             Most cookies are set in the HTTP dialog, where they can be
@@ -513,7 +508,8 @@ s* industry[ -]leading \
             wherever you would also use the cookie crunch actions.
           
 
-          refresh tags
+          refresh
+          tags
 
           
             Disable any refresh tags if the interval is greater than nine
@@ -522,8 +518,8 @@ s* industry[ -]leading \
             those who find this HTML feature annoying.
           
 
-          unsolicited-popups
+          unsolicited-popups
 
           
             This filter attempts to prevent only 
           
 
-          all-popups
+          all-popups
 
           
-            Attempt to prevent all pop-up windows from opening.
-            Note this should be used with even more discretion than the
-            above, since it is more likely to break some sites that require
-            pop-ups for normal usage. Use with caution.
+            Attempt to prevent all pop-up windows from opening. Note this
+            should be used with even more discretion than the above, since it
+            is more likely to break some sites that require pop-ups for
+            normal usage. Use with caution.
           
 
-          img-reorder
+          img-reorder
 
           
             This is a helper filter that has no value if used alone. It
@@ -563,7 +561,8 @@ s* industry[ -]leading \
             and should be enabled together with them.
           
 
-          banners-by-size
+          banners-by-size
 
           
             This filter removes image tags purely based on what size they
@@ -577,10 +576,12 @@ s* industry[ -]leading \
 
             
Recommended only for those who require extreme ad blocking.
             The default block rules should catch 95+% of all ads without this filter enabled.
+            "emphasis">without this filter
+            enabled.
           
 
-          banners-by-link
+          banners-by-link
 
           
             This is an experimental filter that attempts to kill any
@@ -589,7 +590,8 @@ s* industry[ -]leading \
             recommended for use by default.
           
 
-          webbugs
+          webbugs
 
           
             Webbugs are small, invisible images (technically 1X1 GIF
@@ -606,7 +608,8 @@ s* industry[ -]leading \
             "QUOTE">"webbugs".
           
 
-          tiny-textforms
+          tiny-textforms
 
           
             A rather special-purpose filter that can be used to enlarge
@@ -618,7 +621,8 @@ s* industry[ -]leading \
             
It is not recommended to use this filter as a default.
           
 
-          jumping-windows
+          jumping-windows
 
           
             Many consider windows that move, or resize themselves to be
@@ -627,7 +631,8 @@ s* industry[ -]leading \
             using this filter. Use with caution.
           
 
-          frameset-borders
+          frameset-borders
 
           
             Some web designers seem to assume that everyone in the world
@@ -641,7 +646,8 @@ s* industry[ -]leading \
             applied to sites which need it.
           
 
-          demoronizer
+          demoronizer
 
           
             Many Microsoft products that generate HTML use non-standard
@@ -658,7 +664,8 @@ s* industry[ -]leading \
             fly.
           
 
-          shockwave-flash
+          shockwave-flash
 
           
             A filter for shockwave haters. As the name suggests, this
@@ -666,22 +673,23 @@ s* industry[ -]leading \
             shockwave flash objects.
           
 
-          quicktime-kioskmode
+          quicktime-kioskmode
 
           
             Change HTML code that embeds Quicktime objects so that
             kioskmode, which prevents saving, is disabled.
           
 
-          fun
+          fun
 
           
             Text replacements for subversive browsing fun. Make fun of
             your favorite Monopolist or play buzzword bingo.
           
 
-          crude-parental
+          crude-parental
 
           
             A demonstration-only filter that shows how 
           
 
-          ie-exploits
+          ie-exploits
 
           
             An experimental collection of text replacements to disable
@@ -701,7 +710,8 @@ s* industry[ -]leading \
             substantial protection.
           
 
-          site-specifics
+          site-specifics
 
           
             Some web sites have very specific problems, the cure for which
@@ -715,28 +725,31 @@ s* industry[ -]leading \
             filter.
           
 
-          google
+          google
 
           
             A CSS based block for Google text ads. Also removes a width
             limitation and the toolbar advertisement.
           
 
-          yahoo
+          yahoo
 
           
             Another CSS based block, this time for Yahoo text ads. And
             removes a width limitation as well.
           
 
-          msn
+          msn
 
           
             Another CSS based block, this time for MSN text ads. And
             removes tracking URLs, as well as a width limitation.
           
 
-          blogspot
+          blogspot
 
           
             Cleans up some Blogspot blogs. Read the fine print before
@@ -749,29 +762,32 @@ s* industry[ -]leading \
             understands background-size (CSS3), they are removed instead.
           
 
-          xml-to-html
+          xml-to-html
 
           
             Server-header filter to change the Content-Type from xml to
             html.
           
 
-          html-to-xml
+          html-to-xml
 
           
             Server-header filter to change the Content-Type from html to
             xml.
           
 
-          no-ping
+          no-ping
 
           
             Removes the non-standard ping
             attribute from anchor and area HTML tags.
           
 
-          hide-tor-exit-notation
+          hide-tor-exit-notation
 
           
             Client-header filter to remove the Tor
@@ -812,7 +828,7 @@ s* industry[ -]leading \
   
 
   
-    
+    
 
     
diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html
index 066c4d33..88f67986 100644
--- a/doc/webserver/user-manual/index.html
+++ b/doc/webserver/user-manual/index.html
@@ -3,87 +3,80 @@
 
 
-  Privoxy 3.0.20 User Manual
+  Privoxy 3.0.19 User Manual
-  
 
-
+
     
-      Privoxy 3.0.20 User
+      Privoxy 3.0.19 User
       Manual
 
       _{Copyright ©
       2001-2011 by Privoxy
       Developers}

 
-      $Id: user-manual.sgml,v 2.147 2012/03/11 19:03:42
-      diem Exp $

-
-      
-        
-
-        The Privoxy User Manual gives users
-        information on how to install, configure and use Privoxy.
-
-        Privoxy is a non-caching web proxy with advanced filtering
-        capabilities for enhancing privacy, modifying web page data and HTTP
-        headers, controlling access, and removing ads and other obnoxious
-        Internet junk. Privoxy has a flexible configuration and can be
-        customized to suit individual needs and tastes. It has application
-        for both stand-alone systems and multi-user networks.
-
-        Privoxy is Free Software and licensed under the GNU GPLv2.
-
-        Privoxy is an associated project of Software in the Public
-        Interest (SPI).
-
-        Helping hands and donations are welcome:
-
-        
-          
-            http://www.privoxy.org/faq/general.html#PARTICIPATE
-          
-
-          
-            http://www.privoxy.org/faq/general.html#DONATE
-          
-        
-
-        You can find the latest version of the Privoxy User Manual at http://www.privoxy.org/user-manual/. Please see the
-        Contact section on how to contact the
-        developers.
+      $Id: user-manual.sgml,v 2.146 2011/12/26 17:05:40
+      fabiankeil Exp $

+
+      
+        
+          
+
+          The Privoxy User Manual gives users
+          information on how to install, configure and use Privoxy.
+
+          Privoxy is a non-caching web proxy with advanced filtering
+          capabilities for enhancing privacy, modifying web page data and
+          HTTP headers, controlling access, and removing ads and other
+          obnoxious Internet junk. Privoxy has a flexible configuration and
+          can be customized to suit individual needs and tastes. It has
+          application for both stand-alone systems and multi-user
+          networks.
+
+          Privoxy is Free Software and licensed under the GNU GPLv2.
+
+          Privoxy is an associated project of Software in the Public
+          Interest (SPI).
+
+          Helping hands and donations are welcome:
+
+          
+            
+              http://www.privoxy.org/faq/general.html#PARTICIPATE
+            
+
+            
+              http://www.privoxy.org/faq/general.html#DONATE
+            
+          
+
+          You can find the latest version of the Privoxy User Manual at http://www.privoxy.org/user-manual/. Please see the
+          Contact section on how to contact the
+          developers.
+        
       
       
     
 
     
       
-        Table of Contents
+        Table of Contents
 
         1. Introduction
 
@@ -123,20 +116,12 @@ body {
                 OS X
 
                 2.1.7. Installation
-                from ready-built package
-
-                2.1.8. Installation
-                from source
-
-                2.1.9. AmigaOS
 
-                2.1.10. 2.1.8. FreeBSD
 
-                2.1.11. 2.1.9. Gentoo
               
             
@@ -200,7 +185,7 @@ body {
 
         
           
-            6.1. Controlling Privoxy
+            
6.1. Controlling Privoxy
             with Your Web Browser
 
             6.2. Configuration
@@ -363,10 +348,10 @@ body {
 
         

           
-            8.1. Finding the Right
+            
8.1. Finding the Right
             Mix
 
-            8.2. How to Edit
+            8.2. How to Edit
 
             8.3. How Actions
             are Applied to Requests
@@ -376,10 +361,10 @@ body {
 
             
               
-                8.4.1. The Domain
+                
8.4.1. The Domain
                 Pattern
 
-                8.4.2. The Path
+                
8.4.2. The Path
                 Pattern
 
                 8.4.3. The Tag
@@ -490,7 +475,7 @@ body {
                 "actions-file.html#SET-IMAGE-BLOCKER">set-image-blocker
 
                 8.5.34. Summary
+                "actions-file.html#AEN4706">Summary
               
             
 
@@ -502,13 +487,13 @@ body {
             
               
                 8.7.1. match-all.action
+                "actions-file.html#AEN4770">match-all.action
 
                 8.7.2. default.action
+                "actions-file.html#AEN4792">default.action
 
                 8.7.3. user.action
+                "actions-file.html#AEN4905">user.action
               
             
           
@@ -518,7 +503,7 @@ body {
 
         

           
-            9.1. Filter File
+            
9.1. Filter File
             Tutorial
 
             9.2. The
@@ -562,7 +547,7 @@ body {
 
         

           
-            12.1. License
+            12.1. License
 
             12.2. History
 
@@ -579,7 +564,7 @@ body {
             14.1. Regular
             Expressions
 
-            14.2. Privoxy's Internal
+            
14.2. Privoxy's Internal
             Pages
 
             
@@ -600,7 +585,7 @@ body {
   
 
   
-    
+    
 
     

 
   
   
   
   
   
 
   
diff --git a/doc/webserver/user-manual/installation.html b/doc/webserver/user-manual/installation.html
index 80b2712e..ad3e77dc 100644
--- a/doc/webserver/user-manual/installation.html
+++ b/doc/webserver/user-manual/installation.html
@@ -6,33 +6,21 @@
   Installation
-  
+  
-  
 
-
+
     

   
   
   
   
   
   
 
   
-        
+        
@@ -45,7 +33,7 @@ body {
         accesskey="N">Next
       Privoxy 3.0.20 User Manual Privoxy 3.0.19 User Manual
       
 
       
       
     
-    
+    
   
 
   
@@ -61,8 +49,8 @@ body {
 
     Note: On some platforms, the installer may remove previously installed
     versions, if found. (See below for your platform). In any case
-    be sure to backup your old
-    configuration if it is valuable to you. See the be sure to backup your old
+    configuration if it is valuable to you. See the note to upgraders section below.
 
     
@@ -77,19 +65,19 @@ body {
         "INSTALLATION-PACK-RPM">2.1.1. Red Hat and Fedora RPMs
 
         RPMs can be installed with rpm -Uvh
-        privoxy-3.0.20-1.rpm, and will use , and will use /etc/privoxy for the location of configuration
         files.

 
         Note that on Red Hat, Privoxy
-        will not be automatically
-        started on system boot. You will need to enable that using chkconfig, ntsysv, or similar
-        methods.
+        will not be
+        automatically started on system boot. You will need to enable that
+        using chkconfig, ntsysv, or similar methods.
 
         If you have problems with failed dependencies, try rebuilding the
         SRC RPM: rpm --rebuild
-        privoxy-3.0.20-1.src.rpm. This will use your locally installed
+        privoxy-3.0.19-1.src.rpm. This will use your locally installed
         libraries and RPM version.
 
         Also note that if you have a Windows service functionality. On Windows only,
         the Privoxy program has two new
         command line arguments to install and uninstall Privoxy as a service.
+        "APPLICATION">Privoxy as a service.
 
         
           
             Arguments:
 
             
-              --install[:service_name]
+              --install[:service_name]
 
-              --uninstall[:service_name]
+              --uninstall[:service_name]
             
           
         
@@ -187,83 +175,26 @@ body {
         2.1.6. Mac OS X
 
-        Installation instructions for the OS X platform depend upon
-        whether you downloaded a ready-built installation package (.pkg or
-        .mpkg) or have downloaded the source code.
-      
-
-      
-        2.1.7. Installation from ready-built
-        package
-
-        The downloaded file will either be a .pkg (for OS X 10.5 upwards)
-        or a bzipped .mpkg file (for OS X 10.4). The former can be
-        double-clicked as is and the installation will start; double-clicking
-        the latter will unzip the .mpkg file which can then be double-clicked
-        to commence the installation.
-
-        The privoxy service will automatically start after a successful
-        installation (and thereafter every time your computer starts up)
-        however you will need to configure your web browser(s) to use it. To
-        do so, configure them to use a proxy for HTTP and HTTPS at the
-        address 127.0.0.1:8118.
-
-        To prevent the privoxy service from automatically starting when
-        your computer starts up, remove or rename the file /Library/LaunchDaemons/org.ijbswa.privoxy.plist (on OS
-        X 10.5 and higher) or the folder named /Library/StartupItems/Privoxy (on OS X 10.4
-        'Tiger').
-
-        To manually start or stop the privoxy service, use the scripts
-        startPrivoxy.sh and stopPrivoxy.sh supplied in /Applications/Privoxy.
-        They must be run from an administrator account, using sudo.
-
-        To uninstall, run /Applications/Privoxy/uninstall.command as sudo
-        from an administrator account.
-      
-
-      
-        2.1.8. Installation from source
-
-        To build and install the Privoxy source code on OS X you will need
-        to obtain the macsetup module from the Privoxy Sourceforge CVS
-        repository (refer to Sourceforge help for details of how to set up a
-        CVS client to have read-only access to the repository). This module
-        contains scripts that leverage the usual open-source tools (available
-        as part of Apple's free of charge Xcode distribution or via the usual
-        open-source software package managers for OS X (MacPorts, Homebrew,
-        Fink etc.) to build and then install the privoxy binary and
-        associated files. The macsetup module's README file contains complete
-        instructions for its use.
+        Unzip the downloaded file (you can either double-click on the zip
+        file icon from the Finder, or from the desktop if you downloaded it
+        there). Then, double-click on the package installer icon and follow
+        the installation process.
 
         The privoxy service will automatically start after a successful
-        installation (and thereafter every time your computer starts up)
-        however you will need to configure your web browser(s) to use it. To
-        do so, configure them to use a proxy for HTTP and HTTPS at the
-        address 127.0.0.1:8118.
-
-        To prevent the privoxy service from automatically starting when
-        your computer starts up, remove or rename the file /Library/LaunchDaemons/org.ijbswa.privoxy.plist (on OS
-        X 10.5 and higher) or the folder named /Library/StartupItems/Privoxy (on OS X 10.4
-        'Tiger').
+        installation (in addition to every time your computer starts up). To
+        prevent the privoxy service from automatically starting when your
+        computer starts up, remove or rename the folder named /Library/StartupItems/Privoxy.
 
         To manually start or stop the privoxy service, use the Privoxy
-        Utility for Mac OS X (also part of the macsetup module). This
-        application can start and stop the privoxy service and display its
-        log and configuration files.
-
-        To uninstall, run the macsetup module's uninstall.sh as sudo from
-        an administrator account.
+        Utility for Mac OS X. This application controls the privoxy service
+        (e.g. starting and stopping the service as well as uninstalling the
+        software).
       
 
       
         2.1.9. AmigaOS
+        "INSTALLATION-AMIGA">2.1.7. AmigaOS
 
         Copy and then unpack the lha archive to
         a suitable location. All necessary files will be installed into
@@ -274,7 +205,7 @@ body {
 
       

         2.1.10. FreeBSD
+        "INSTALLATION-TBZ">2.1.8. FreeBSD
 
         Privoxy is part of FreeBSD's Ports Collection, you can build and
         install it with cd /usr/ports/www/privoxy; make
@@ -293,7 +224,7 @@ body {
 
       

         2.1.11. Gentoo
+        "INSTALLATTION-GENTOO">2.1.9. Gentoo
 
         Gentoo source packages (Ebuilds) for Privoxy are contained in the Gentoo Portage Tree
@@ -308,7 +239,7 @@ body {
 
         Configuration files are in /etc/privoxy,
         the documentation is in /usr/share/doc/privoxy-3.0.20 and the Log directory
+        "FILENAME">/usr/share/doc/privoxy-3.0.19 and the Log directory
         is in /var/log/privoxy.
       
     
@@ -339,12 +270,12 @@ body {
 
       When building from a source tarball, first unpack the source:
 
-      
+      
@@ -356,7 +287,7 @@ body {
       check the Sourceforge documentation, which might give commands
       like:
 
-      
         
           
             - tar xzvf privoxy-3.0.20-beta-src.tar.gz
- cd privoxy-3.0.20-beta
+ tar xzvf privoxy-3.0.19-stable-src.tar.gz
+ cd privoxy-3.0.19-stable
 
           
         
+      

         
           
             @@ -387,7 +318,7 @@ body {
 
       /etc/passwd might then look like:
 
-      
+      

         
           
             @@ -399,7 +330,7 @@ body {
 
       And then /etc/group, like:
 
-      
+      

         
           
             @@ -413,7 +344,7 @@ body {
 
       Then, to build from either unpacked tarball or CVS source:
 
-      
+      

         
           
             @@ -432,7 +363,7 @@ body {
       Using GNU make, you can have the first four
       steps automatically done for you by just typing:
 
-      
+      

         
           
             @@ -449,7 +380,7 @@ body {
       Anyway"), or alter their own configurations, configure like this:
 
-      
+      

         
           
             @@ -462,28 +393,29 @@ body {
       Then build as above. In Privoxy 3.0.7 and later, all of these
       options can also be disabled through the configuration file.
 
-      WARNING: If installing as
-      root, the install will fail unless a non-root user or group is
-      specified, or a privoxy user and group already
-      exist on the system. If a non-root user is specified, and no group,
-      then the installation will try to also use a group of the same name as
-      "user". If a group is specified (and no
-      user), then the support files will be installed as writable by that
-      group, and owned by the user running the installation.
+      WARNING: If
+      installing as root, the install will fail unless a non-root user or
+      group is specified, or a privoxy user and
+      group already exist on the system. If a non-root user is specified, and
+      no group, then the installation will try to also use a group of the
+      same name as "user". If a group is specified
+      (and no user), then the support files will be installed as writable by
+      that group, and owned by the user running the installation.
 
       configure accepts --with-user and --with-group
       options for setting user and group ownership of the configuration files
       (which need to be writable by the daemon). The specified user must already exist. When starting
-      Privoxy, it must be run as this same
-      user to insure write access to configuration and log files!
+      "emphasis">user must already exist. When
+      starting Privoxy, it must be run as
+      this same user to insure write access to configuration and log
+      files!
 
       Alternately, you can specify user and
       group on the make
       command line, but be sure both already exist:
 
-      
+      

         
           
             @@ -538,16 +470,16 @@ body {
       If install finds previous versions of local configuration files,
       most of these will not be overwritten, and the new ones will be
       installed with a "new" extension.
-      default.action and default.filter will be overwritten. You will then need
-      to manually update the other installed configuration files as needed.
-      The default template files will be overwritten. If you have
-      customized, local templates, these should be stored safely in a
-      separate directory and defined in config by
-      the "templdir" directive. It is of course
-      wise to always back-up any important configuration files "just in case". If a previous version of will be overwritten. You will then need to
+      manually update the other installed configuration files as needed. The
+      default template files will be overwritten. If you have customized,
+      local templates, these should be stored safely in a separate directory
+      and defined in config by the "templdir" directive. It is of course wise to always
+      back-up any important configuration files "just in
+      case". If a previous version of Privoxy is already running, you will have to
       restart it manually.
 
@@ -579,16 +511,16 @@ body {
 
       In order not to lose your personal changes and adjustments when
       updating to the latest default.action file we
-      strongly recommend that you
-      use user.action and user.filter for your local customizations of
-      Privoxy. See the strongly
+      recommend that you use user.action
+      and user.filter for your local customizations
+      of Privoxy. See the Chapter on actions files for details.
     
   
 
   
-    
+    
 
     
diff --git a/doc/webserver/user-manual/introduction.html b/doc/webserver/user-manual/introduction.html
index 5378e515..342f04e5 100644
--- a/doc/webserver/user-manual/introduction.html
+++ b/doc/webserver/user-manual/introduction.html
@@ -6,31 +6,21 @@
   Introduction
-  
-  
+  
+  
-  
 
-
+
     

   
   
   
   
   
 
   
-        
+        
@@ -43,25 +33,15 @@ body {
         "installation.html" accesskey="N">Next
       Privoxy 3.0.20 User Manual Privoxy 3.0.19 User Manual
       
 
       
       
     
-    
+    
   
 
   
     1.
     Introduction
 
-    This documentation is included with the current UNRELEASED version of
-    Privoxy, v.3.0.20, and is mostly
-    complete at this point. The most up to date reference for the time being
-    is still the comments in the source files and in the individual
-    configuration files. Development of a new version is currently nearing
-    completion, and includes significant changes and enhancements over
-    earlier versions.
-
-    Since this is a UNRELEASED version, not all new features are well
-    tested. This documentation may be slightly out of sync as a result
-    (especially with CVS sources). And there may be bugs, though hopefully not many!
+    This documentation is included with the current stable version of
+    Privoxy, v.3.0.19.
 
     
       1.1.
@@ -70,8 +50,8 @@ body {
       In addition to the core features of ad blocking and cookie
       management, Privoxy provides many
-      supplemental features, some of them currently under development, that
-      give the end-user more control, more privacy and more freedom:
+      supplemental features, that give the end-user more control, more
+      privacy and more freedom:
 
       
         
@@ -161,7 +141,7 @@ body {
   
 
   
-    
+    
 
     
@@ -177,7 +157,7 @@ body {
       
-        
diff --git a/doc/webserver/user-manual/quickstart.html b/doc/webserver/user-manual/quickstart.html
index f988f165..da782cb6 100644
--- a/doc/webserver/user-manual/quickstart.html
+++ b/doc/webserver/user-manual/quickstart.html
@@ -6,33 +6,22 @@
   Quickstart to Using Privoxy
-  
+  
-  
 
-
+
     

 
       Privoxy 3.0.20 User
+        Privoxy 3.0.19 User
         Manual
 
          
   
   
   
   
   
   
 
   
-        
+        
@@ -45,7 +34,7 @@ body {
         accesskey="N">Next
       Privoxy 3.0.20 User Manual Privoxy 3.0.19 User Manual
       
 
       
       
     
-    
+    
   
 
   
@@ -81,10 +70,10 @@ body {
         "http://en.wikipedia.org/wiki/Proxy_server" target="_top">proxy
         by setting the proxy configuration for address of 127.0.0.1 and port 8118.
-        DO NOT activate proxying
-        for FTP or any protocols besides HTTP and
-        HTTPS (SSL) unless you intend to prevent your browser from using
-        these protocols.
+        DO NOT activate
+        proxying for FTP or any protocols besides
+        HTTP and HTTPS (SSL) unless you intend to prevent your browser from
+        using these protocols.
       
 
       
@@ -158,10 +147,11 @@ body {
       "problem" sites, and to spend more time
       adjusting the configuration to solve these unintended consequences. In
       short, there is not an easy way to eliminate all ads. Either take the easy way and
-      settle for most ads blocked
-      with the default configuration, or jump in and tweak it for your
-      personal surfing habits and preferences.
+      "emphasis">all ads. Either take the easy
+      way and settle for most ads blocked with the default configuration,
+      or jump in and tweak it for your personal surfing habits and
+      preferences.
 
       Secondly, a brief explanation of Privoxy's "actions".
@@ -253,8 +243,9 @@ body {
           place of an ad image that has hit a block rule. For this to come
           into play, the URL must match a block action somewhere in the
-          configuration, and, it
-          must also match an and, it must also match an handle-as-image
           action.

 
@@ -264,10 +255,9 @@ body {
           
-                
+                
             
                  pattern - a checkerboard
-                pattern, so that an ad replacement is obvious. This is the
-                default.    pattern - a checkerboard pattern, so
+                that an ad replacement is obvious. This is the default.
               
             
           
@@ -275,9 +265,9 @@ body {
           
-                
@@ -286,10 +276,9 @@ body {
           
             
                  blank - A very small empty GIF
-                image is displayed. This is the so-called    blank - A very small empty GIF image is
+                displayed. This is the so-called "invisible" configuration option.
               
             
-                
+                
             
                  http://<URL> - A redirect
-                to any image anywhere of the user's choosing (advanced
-                usage).    http://<URL> - A redirect to any
+                image anywhere of the user's choosing (advanced usage).
               
             
           
@@ -354,9 +343,9 @@ body {
           "GUIBUTTON">Edit":
 
           
-            
+            
 
-            Figure 1. Actions Files in Use
+            Figure 1. Actions Files in Use
 
             
               
@@ -419,7 +408,7 @@ body {
   
 
   
-    
+    
 
     
diff --git a/doc/webserver/user-manual/seealso.html b/doc/webserver/user-manual/seealso.html
index 5593114a..cb5db4c1 100644
--- a/doc/webserver/user-manual/seealso.html
+++ b/doc/webserver/user-manual/seealso.html
@@ -6,31 +6,22 @@
   See Also
-  
+  
-  
 
-
+
     

   
   
   
   
   
   
 
   
-        
+        
@@ -43,7 +34,7 @@ body {
         accesskey="N">Next
       Privoxy 3.0.20 User Manual Privoxy 3.0.19 User Manual
       
 
       
       
     
-    
+    
   
 
   
@@ -176,7 +167,7 @@ body {
   
 
   
-    
+    
 
     
diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html
index f2325a2a..8d14e4c0 100644
--- a/doc/webserver/user-manual/startup.html
+++ b/doc/webserver/user-manual/startup.html
@@ -6,34 +6,22 @@
   Starting Privoxy
-  
+  
-  
 
-
+
     

   
   
   
   
   
   
 
   
-        
+        
@@ -46,7 +34,7 @@ body {
         "configuration.html" accesskey="N">Next
       Privoxy 3.0.20 User Manual Privoxy 3.0.19 User Manual
       
 
       
       
     
-    
+    
   
 
   
@@ -59,18 +47,18 @@ body {
     proxy. The default is 127.0.0.1 (or localhost) for the proxy
     address, and port 8118 (earlier versions used port 8000). This is the one
-    configuration step that must be
-    done!
+    configuration step that must
+    be done!
 
     Please note that Privoxy can only
     proxy HTTP and HTTPS traffic. It will not work with FTP or other
     protocols.
 
     
-      
+      
 
-      Figure 2. Proxy Configuration Showing Mozilla/Netscape
-      HTTP and HTTPS (SSL) Settings
+      Figure 2. Proxy Configuration Showing Mozilla/Netscape HTTP and
+      HTTPS (SSL) Settings
 
       
         
@@ -120,14 +108,14 @@ body {
     if you want HTTPS proxy support too (sometimes labeled "Secure"). Make sure any checkboxes like "Use the same proxy server for all protocols" is
-    UNCHECKED. You want only HTTP
-    and HTTPS (SSL)!
+    UNCHECKED. You want
+    only HTTP and HTTPS (SSL)!
 
     
-      
+      
 
-      Figure 3. Proxy Configuration Showing Internet Explorer
-      HTTP and HTTPS (Secure) Settings
+      Figure 3. Proxy Configuration Showing Internet Explorer HTTP and
+      HTTPS (Secure) Settings
 
       
         
@@ -156,7 +144,7 @@ body {
       "APPLICATION">Privoxy upon boot. It will use the file /etc/privoxy/config as its main configuration file.
 
-      
+      

         
           
             @@ -168,7 +156,7 @@ body {
 
       Or ...
 
-      
+      

         
           
             @@ -188,7 +176,7 @@ body {
       file /etc/privoxy/config as its main
       configuration file.
 
-      
+      

         
           
             @@ -226,7 +214,7 @@ body {
 
       Example Unix startup command:
 
-      
+      

         
           
             @@ -296,7 +284,7 @@ body {
       A script is again used. It will use the file /etc/privoxy/config as its main configuration file.
 
-      
+      

         
           
             @@ -311,7 +299,7 @@ body {
       automatically started at boot time by default. You can change this with
       the rc-update command.
 
-      
+      

         
           
             @@ -332,60 +320,66 @@ body {
 
       
         
-          --version
+          --version
 
           Print version info and exit. Unix only.
         
 
         
-          --help
+          --help
 
           Print short usage info and exit. Unix only.
         
 
         
-          --no-daemon
+          --no-daemon
 
           Don't become a daemon, i.e. don't fork and become process group
           leader, and don't detach from controlling tty. Unix only.
         
 
         
-          --pidfile FILE
+          --pidfile
+          FILE
 
           On startup, write the process ID to FILE. Delete the FILE on exit. Failure to create or
-          delete the FILE is
-          non-fatal. If no FILE
-          option is given, no PID file will be used. Unix only.
+          "emphasis">FILE. Delete the
+          FILE on exit.
+          Failure to create or delete the FILE is non-fatal. If no FILE option is given, no
+          PID file will be used. Unix only.
         
 
         
-          --user
-          USER[.GROUP]
+          --user
+          USER[.GROUP]
 
           After (optionally) writing the PID file, assume the user ID of
-          USER, and if included the
-          GID of GROUP. Exit if the privileges are not sufficient to do so.
-          Unix only.
+          USER, and if
+          included the GID of GROUP. Exit if the privileges are not
+          sufficient to do so. Unix only.
         
 
         
-          --chroot
+          --chroot
 
           Before changing to the user ID given in the --user option, chroot to that user's
-          home directory, i.e. make the kernel pretend to the Privoxy process that the directory tree starts
-          there. If set up carefully, this can limit the impact of possible
-          vulnerabilities in Privoxy to the
-          files contained in that hierarchy. Unix only.
+          "emphasis">--user option, chroot to
+          that user's home directory, i.e. make the kernel pretend to the
+          Privoxy process that the directory
+          tree starts there. If set up carefully, this can limit the impact
+          of possible vulnerabilities in Privoxy to the files contained in that
+          hierarchy. Unix only.
         
 
         
-          --pre-chroot-nslookup
-          hostname
+          --pre-chroot-nslookup
+          hostname
 
           Specifies a hostname to look up before doing a chroot. On some
           systems, initializing the resolver library involves reading config
@@ -403,11 +397,12 @@ body {
         
 
         
-          configfile
+          configfile
 
-          If no configfile is
-          included on the command line, Privoxy will look for a file named
+          
If no configfile is included on the command line,
+          Privoxy will look for a file named
           "config" in the current directory
           (except on Win32 where it will look for "config.txt" instead). Specify full path to avoid
@@ -419,14 +414,14 @@ body {
       
On MS Windows only there are two
       additional command-line options to allow Privoxy to install and run as a service. See the service. See the Window Installation
       section for details.
     
   
 
   
-    
+    
 
     
diff --git a/doc/webserver/user-manual/templates.html b/doc/webserver/user-manual/templates.html
index 8a7b4c9c..6aab5529 100644
--- a/doc/webserver/user-manual/templates.html
+++ b/doc/webserver/user-manual/templates.html
@@ -6,7 +6,7 @@
   Privoxy's Template Files
-  
+  
-  
 
-
+
     

   
   
   
   
   
 
   
-        
+        
@@ -46,7 +35,7 @@ body {
         accesskey="N">Next
       Privoxy 3.0.20 User Manual Privoxy 3.0.19 User Manual
       
 
       
       
     
-    
+    
   
 
   
@@ -59,8 +48,8 @@ body {
     the "BLOCKED" page and all pages
     of its web-based user
-    interface, are generated from templates. (, are generated from templates. (Privoxy must be running for the above links to work
     as intended.)
 
@@ -74,9 +63,9 @@ body {
     (called symbols or exports), which Privoxy fills at run time. It is possible to edit
     the templates with a normal text editor, should you want to customize
-    them. (Not recommended for the casual
-    user). Should you create your own custom templates, you should use
-    the config setting Not recommended for the
+    casual user). Should you create your own custom templates, you
+    should use the config setting templdir to specify an alternate location, so
     your templates do not get overwritten during upgrades.
 
@@ -98,7 +87,7 @@ body {
     "APPLICATION">Privoxy is in an alpha or beta development
     stage:
 
-    
+    

       
         
           @@ -117,7 +106,7 @@ body {
     "LITERAL">if-unstable-end@ will disappear, leaving nothing but an
     empty comment:
 
-    
+    

       
         
           @@ -140,7 +129,7 @@ body {
   
 
   
-    
+    
 
     
diff --git a/doc/webserver/user-manual/whatsnew.html b/doc/webserver/user-manual/whatsnew.html
index ef96d8c9..d12d16be 100644
--- a/doc/webserver/user-manual/whatsnew.html
+++ b/doc/webserver/user-manual/whatsnew.html
@@ -6,31 +6,22 @@
   What's New in this Release
-  
+  
-  
 
-
+
     

   
   
   
   
   
   
 
   
-        
+        
@@ -43,7 +34,7 @@ body {
         "quickstart.html" accesskey="N">Next
       Privoxy 3.0.20 User Manual Privoxy 3.0.19 User Manual
       
 
       
       
     
-    
+    
   
 
   
@@ -1028,7 +1019,7 @@ body {
   
 
   
-    
+
Project Index Page v3.0.20

Project Index Page v3.0.19

8.1. Finding the Right + 8.1. Finding the Right Mix Note that some actions, like @@ -352,7 +339,7 @@ body {

Privoxy Menu

Privoxy Menu

8.1. Finding the Right +
8.1. Finding the Right Mix

Note that some actions, like @@ -352,7 +339,7 @@ body {
