rebuild docs
authorLee <ler762@users.sourceforge.net>
Sat, 27 Oct 2018 23:30:52 +0000 (19:30 -0400)
committerLee <ler762@users.sourceforge.net>
Sat, 27 Oct 2018 23:30:52 +0000 (19:30 -0400)
33 files changed:
doc/webserver/developer-manual/coding.html
doc/webserver/developer-manual/documentation.html
doc/webserver/developer-manual/git.html
doc/webserver/developer-manual/index.html
doc/webserver/developer-manual/introduction.html
doc/webserver/developer-manual/newrelease.html
doc/webserver/developer-manual/testing.html
doc/webserver/developer-manual/webserver-update.html
doc/webserver/faq/configuration.html
doc/webserver/faq/contact.html
doc/webserver/faq/copyright.html
doc/webserver/faq/general.html
doc/webserver/faq/index.html
doc/webserver/faq/installation.html
doc/webserver/faq/misc.html
doc/webserver/faq/trouble.html
doc/webserver/index.html
doc/webserver/privoxy-index.html
doc/webserver/user-manual/actions-file.html
doc/webserver/user-manual/appendix.html
doc/webserver/user-manual/config.html
doc/webserver/user-manual/configuration.html
doc/webserver/user-manual/contact.html
doc/webserver/user-manual/copyright.html
doc/webserver/user-manual/filter-file.html
doc/webserver/user-manual/index.html
doc/webserver/user-manual/installation.html
doc/webserver/user-manual/introduction.html
doc/webserver/user-manual/quickstart.html
doc/webserver/user-manual/seealso.html
doc/webserver/user-manual/startup.html
doc/webserver/user-manual/templates.html
doc/webserver/user-manual/whatsnew.html

index 3e2753e..42fa1ca 100644 (file)
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->Coding Guidelines</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="Privoxy Developer Manual"
-HREF="index.html"><LINK
-REL="PREVIOUS"
-TITLE="Documentation Guidelines"
-HREF="documentation.html"><LINK
-REL="NEXT"
-TITLE="Testing Guidelines"
-HREF="testing.html"><LINK
-REL="STYLESHEET"
-TYPE="text/css"
-HREF="../p_doc.css"><META
-HTTP-EQUIV="Content-Type"
-CONTENT="text/html;
-charset=ISO-8859-1"></HEAD
-><BODY
-CLASS="SECT1"
-BGCOLOR="#EEEEEE"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->Privoxy Developer Manual</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="documentation.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="testing.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="CODING"
->4. Coding Guidelines</A
-></H1
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="S1"
->4.1. Introduction</A
-></H2
-><P
->This set of standards is designed to make our lives easier.  It is
-    developed with the simple goal of helping us keep the "new and improved
-    <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
->" consistent and reliable. Thus making
-    maintenance easier and increasing chances of success of the
-    project.</P
-><P
->And that of course comes back to us as individuals. If we can
-    increase our development and product efficiencies then we can solve more
-    of the request for changes/improvements and in general feel good about
-    ourselves. ;-&#62;</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="S2"
->4.2. Using Comments</A
-></H2
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S3"
->4.2.1. Comment, Comment, Comment</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->Comment as much as possible without commenting the obvious.
-    For example do not comment "variable_a is equal to variable_b".
-    Instead explain why variable_a should be equal to the variable_b.
-    Just because a person can read code does not mean they will
-    understand why or what is being done. A reader may spend a lot
-    more time figuring out what is going on when a simple comment
-    or explanation would have prevented the extra research. Please
-    help your fellow Privoxy developers out!</P
-><P
->The comments will also help justify the intent of the code.
-    If the comment describes something different than what the code
-    is doing then maybe a programming error is occurring.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->/* if page size greater than 1k ... */
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>Coding Guidelines</title>
+  <meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
+  <link rel="HOME" title="Privoxy Developer Manual" href="index.html">
+  <link rel="PREVIOUS" title="Documentation Guidelines" href="documentation.html">
+  <link rel="NEXT" title="Testing Guidelines" href="testing.html">
+  <link rel="STYLESHEET" type="text/css" href="../p_doc.css">
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+<body class="SECT1" bgcolor="#EEEEEE" text="#000000" link="#0000FF" vlink="#840084" alink="#0000FF">
+  <div class="NAVHEADER">
+    <table summary="Header navigation table" width="100%" border="0" cellpadding="0" cellspacing="0">
+      <tr>
+        <th colspan="3" align="center">Privoxy Developer Manual</th>
+      </tr>
+      <tr>
+        <td width="10%" align="left" valign="bottom"><a href="documentation.html" accesskey="P">Prev</a></td>
+        <td width="80%" align="center" valign="bottom"></td>
+        <td width="10%" align="right" valign="bottom"><a href="testing.html" accesskey="N">Next</a></td>
+      </tr>
+    </table>
+    <hr align="left" width="100%">
+  </div>
+  <div class="SECT1">
+    <h1 class="SECT1"><a name="CODING" id="CODING">4. Coding Guidelines</a></h1>
+    <div class="SECT2">
+      <h2 class="SECT2"><a name="S1" id="S1">4.1. Introduction</a></h2>
+      <p>This set of standards is designed to make our lives easier. It is developed with the simple goal of helping us
+      keep the "new and improved <span class="APPLICATION">Privoxy</span>" consistent and reliable. Thus making
+      maintenance easier and increasing chances of success of the project.</p>
+      <p>And that of course comes back to us as individuals. If we can increase our development and product
+      efficiencies then we can solve more of the request for changes/improvements and in general feel good about
+      ourselves. ;-&#62;</p>
+    </div>
+    <div class="SECT2">
+      <h2 class="SECT2"><a name="S2" id="S2">4.2. Using Comments</a></h2>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S3" id="S3">4.2.1. Comment, Comment, Comment</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>Comment as much as possible without commenting the obvious. For example do not comment "variable_a is equal
+        to variable_b". Instead explain why variable_a should be equal to the variable_b. Just because a person can
+        read code does not mean they will understand why or what is being done. A reader may spend a lot more time
+        figuring out what is going on when a simple comment or explanation would have prevented the extra research.
+        Please help your fellow Privoxy developers out!</p>
+        <p>The comments will also help justify the intent of the code. If the comment describes something different
+        than what the code is doing then maybe a programming error is occurring.</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Example:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">/* if page size greater than 1k ... */
 if (page_length() &#62; 1024)
 {
     ... "block" the page up ...
@@ -169,50 +65,22 @@ if (page_length() &#62; 1024)
 
 This demonstrates 2 cases of "what not to do".  The first is a
 "syntax comment".  The second is a comment that does not fit what
-is actually being done.</PRE
-></TD
-></TR
-></TABLE
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S4"
->4.2.2. Use blocks for comments</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->Comments can help or they can clutter. They help when they
-    are differentiated from the code they describe. One line
-    comments do not offer effective separation between the comment
-    and the code. Block identifiers do, by surrounding the code
-    with a clear, definable pattern.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->/*********************************************************************
+is actually being done.</pre>
+            </td>
+          </tr>
+        </table>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S4" id="S4">4.2.2. Use blocks for comments</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>Comments can help or they can clutter. They help when they are differentiated from the code they describe.
+        One line comments do not offer effective separation between the comment and the code. Block identifiers do, by
+        surrounding the code with a clear, definable pattern.</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Example:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">/*********************************************************************
  * This will stand out clearly in your code!
  *********************************************************************/
 if (this_variable == that_variable)
@@ -231,65 +99,26 @@ if (this_variable == that_variable)
 if (this_variable == that_variable) /* this may not either */
 {
    do_something_very_important();
-}</PRE
-></TD
-></TR
-></TABLE
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Exception:</I
-></SPAN
-></P
-><P
->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 which is NOT on the same line as the code.</P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S5"
->4.2.3. Keep Comments on their own line</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->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 that is on its own line.</P
-><P
->There are three exceptions to this rule, which should be
-    violated freely and often: during the definition of variables,
-    at the end of closing braces, when used to comment
-    parameters.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->/*********************************************************************
+}</pre>
+            </td>
+          </tr>
+        </table>
+        <p><span class="emphasis"><i class="EMPHASIS">Exception:</i></span></p>
+        <p>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 which is NOT on the same line as the code.</p>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S5" id="S5">4.2.3. Keep Comments on their own line</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>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 that is on its own line.</p>
+        <p>There are three exceptions to this rule, which should be violated freely and often: during the definition of
+        variables, at the end of closing braces, when used to comment parameters.</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Example:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">/*********************************************************************
  * This will stand out clearly in your code,
  * But the second example won't.
  *********************************************************************/
@@ -322,116 +151,46 @@ short do_something_very_important(
 {
    ...code here...
 
-}   /* -END- do_something_very_important */</PRE
-></TD
-></TR
-></TABLE
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S6"
->4.2.4. Comment each logical step</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->Logical steps should be commented to help others follow the
-    intent of the written code and comments will make the code more
-    readable.</P
-><P
->If you have 25 lines of code without a comment, you should
-    probably go back into it to see where you forgot to put
-    one.</P
-><P
->Most "for", "while", "do", etc... loops _probably_ need a
-    comment. After all, these are usually major logic
-    containers.</P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S7"
->4.2.5. Comment All Functions Thoroughly</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->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 existence and the consequences of using it. The
-    reader should not have to read through the code to determine if
-    a given function is safe for a desired use. The proper
-    information thoroughly presented at the introduction of a
-    function not only saves time for subsequent maintenance or
-    debugging, it more importantly aids in code reuse by allowing a
-    user to determine the safety and applicability of any function
-    for the problem at hand. As a result of such benefits, all
-    functions should contain the information presented in the
-    addendum section of this document.</P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S8"
->4.2.6. Comment at the end of braces if the
-    content is more than one screen length</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->Each closing brace should be followed on the same line by a
-    comment that describes the origination of the brace if the
-    original brace is off of the screen, or otherwise far away from
-    the closing brace. This will simplify the debugging,
-    maintenance, and readability of the code.</P
-><P
->As a suggestion , use the following flags to make the
-    comment and its brace more readable:</P
-><P
->use following a closing brace: } /* -END- if() or while ()
-    or etc... */</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->if (1 == X)
+}   /* -END- do_something_very_important */</pre>
+            </td>
+          </tr>
+        </table>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S6" id="S6">4.2.4. Comment each logical step</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>Logical steps should be commented to help others follow the intent of the written code and comments will
+        make the code more readable.</p>
+        <p>If you have 25 lines of code without a comment, you should probably go back into it to see where you forgot
+        to put one.</p>
+        <p>Most "for", "while", "do", etc... loops _probably_ need a comment. After all, these are usually major logic
+        containers.</p>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S7" id="S7">4.2.5. Comment All Functions Thoroughly</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>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 existence and the consequences of using it. The reader should not have to read
+        through the code to determine if a given function is safe for a desired use. The proper information thoroughly
+        presented at the introduction of a function not only saves time for subsequent maintenance or debugging, it
+        more importantly aids in code reuse by allowing a user to determine the safety and applicability of any
+        function for the problem at hand. As a result of such benefits, all functions should contain the information
+        presented in the addendum section of this document.</p>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S8" id="S8">4.2.6. Comment at the end of braces if the content is more than one
+        screen length</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>Each closing brace should be followed on the same line by a comment that describes the origination of the
+        brace if the original brace is off of the screen, or otherwise far away from the closing brace. This will
+        simplify the debugging, maintenance, and readability of the code.</p>
+        <p>As a suggestion , use the following flags to make the comment and its brace more readable:</p>
+        <p>use following a closing brace: } /* -END- if() or while () or etc... */</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Example:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">if (1 == X)
 {
    do_something_very_important();
    ...some long list of commands...
@@ -443,724 +202,272 @@ if (1 == X)
 {
    do_something_very_important();
    ...some long list of commands...
-} /* -END- if (1 == X) */</PRE
-></TD
-></TR
-></TABLE
-></DIV
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="S9"
->4.3. Naming Conventions</A
-></H2
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S10"
->4.3.1. Variable Names</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->Use all lowercase, and separate words via an underscore
-    ('_'). Do not start an identifier with an underscore. (ANSI C
-    reserves these for use by the compiler and system headers.) Do
-    not use identifiers which are reserved in ANSI C++. (E.g.
-    template, class, true, false, ...). This is in case we ever
-    decide to port Privoxy to C++.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int ms_iis5_hack = 0;</PRE
-></TD
-></TR
-></TABLE
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Instead of:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int msiis5hack = 0; int msIis5Hack = 0;</PRE
-></TD
-></TR
-></TABLE
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S11"
->4.3.2. Function Names</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->Use all lowercase, and separate words via an underscore
-    ('_'). Do not start an identifier with an underscore. (ANSI C
-    reserves these for use by the compiler and system headers.) Do
-    not use identifiers which are reserved in ANSI C++. (E.g.
-    template, class, true, false, ...). This is in case we ever
-    decide to port Privoxy to C++.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int load_some_file(struct client_state *csp)</PRE
-></TD
-></TR
-></TABLE
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Instead of:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int loadsomefile(struct client_state *csp)
-int loadSomeFile(struct client_state *csp)</PRE
-></TD
-></TR
-></TABLE
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S12"
->4.3.3. Header file prototypes</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->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.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->(.h) extern int load_aclfile(struct client_state *csp);
-(.c) int load_aclfile(struct client_state *csp)</PRE
-></TD
-></TR
-></TABLE
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Instead of:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->(.h) extern int load_aclfile(struct client_state *); or
+} /* -END- if (1 == X) */</pre>
+            </td>
+          </tr>
+        </table>
+      </div>
+    </div>
+    <div class="SECT2">
+      <h2 class="SECT2"><a name="S9" id="S9">4.3. Naming Conventions</a></h2>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S10" id="S10">4.3.1. Variable Names</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>Use all lowercase, and separate words via an underscore ('_'). Do not start an identifier with an
+        underscore. (ANSI C reserves these for use by the compiler and system headers.) Do not use identifiers which
+        are reserved in ANSI C++. (E.g. template, class, true, false, ...). This is in case we ever decide to port
+        Privoxy to C++.</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Example:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">int ms_iis5_hack = 0;</pre>
+            </td>
+          </tr>
+        </table>
+        <p><span class="emphasis"><i class="EMPHASIS">Instead of:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">int msiis5hack = 0; int msIis5Hack = 0;</pre>
+            </td>
+          </tr>
+        </table>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S11" id="S11">4.3.2. Function Names</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>Use all lowercase, and separate words via an underscore ('_'). Do not start an identifier with an
+        underscore. (ANSI C reserves these for use by the compiler and system headers.) Do not use identifiers which
+        are reserved in ANSI C++. (E.g. template, class, true, false, ...). This is in case we ever decide to port
+        Privoxy to C++.</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Example:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">int load_some_file(struct client_state *csp)</pre>
+            </td>
+          </tr>
+        </table>
+        <p><span class="emphasis"><i class="EMPHASIS">Instead of:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">int loadsomefile(struct client_state *csp)
+int loadSomeFile(struct client_state *csp)</pre>
+            </td>
+          </tr>
+        </table>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S12" id="S12">4.3.3. Header file prototypes</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>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.</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Example:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">(.h) extern int load_aclfile(struct client_state *csp);
+(.c) int load_aclfile(struct client_state *csp)</pre>
+            </td>
+          </tr>
+        </table>
+        <p><span class="emphasis"><i class="EMPHASIS">Instead of:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">(.h) extern int load_aclfile(struct client_state *); or
 (.h) extern int load_aclfile();
-(.c) int load_aclfile(struct client_state *csp)</PRE
-></TD
-></TR
-></TABLE
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S13"
->4.3.4. Enumerations, and #defines</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->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.)</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->(enumeration) : enum Boolean {FALSE, TRUE};
-(#define) : #define DEFAULT_SIZE 100;</PRE
-></TD
-></TR
-></TABLE
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Note:</I
-></SPAN
-> We have a standard naming scheme for #defines
-    that toggle a feature in the preprocessor: FEATURE_&#62;, where
-    &#62; is a short (preferably 1 or 2 word) description.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->#define FEATURE_FORCE 1
+(.c) int load_aclfile(struct client_state *csp)</pre>
+            </td>
+          </tr>
+        </table>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S13" id="S13">4.3.4. Enumerations, and #defines</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>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.)</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Example:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">(enumeration) : enum Boolean {FALSE, TRUE};
+(#define) : #define DEFAULT_SIZE 100;</pre>
+            </td>
+          </tr>
+        </table>
+        <p><span class="emphasis"><i class="EMPHASIS">Note:</i></span> We have a standard naming scheme for #defines
+        that toggle a feature in the preprocessor: FEATURE_&#62;, where &#62; is a short (preferably 1 or 2 word)
+        description.</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Example:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">#define FEATURE_FORCE 1
 
 #ifdef FEATURE_FORCE
 #define FORCE_PREFIX blah
-#endif /* def FEATURE_FORCE */</PRE
-></TD
-></TR
-></TABLE
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S14"
->4.3.5. Constants</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->Spell common words out entirely (do not remove vowels).</P
-><P
->Use only widely-known domain acronyms and abbreviations.
-    Capitalize all letters of an acronym.</P
-><P
->Use underscore (_) to separate adjacent acronyms and
-    abbreviations. Never terminate a name with an underscore.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->#define USE_IMAGE_LIST 1</PRE
-></TD
-></TR
-></TABLE
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Instead of:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->#define USE_IMG_LST 1 or
+#endif /* def FEATURE_FORCE */</pre>
+            </td>
+          </tr>
+        </table>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S14" id="S14">4.3.5. Constants</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>Spell common words out entirely (do not remove vowels).</p>
+        <p>Use only widely-known domain acronyms and abbreviations. Capitalize all letters of an acronym.</p>
+        <p>Use underscore (_) to separate adjacent acronyms and abbreviations. Never terminate a name with an
+        underscore.</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Example:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">#define USE_IMAGE_LIST 1</pre>
+            </td>
+          </tr>
+        </table>
+        <p><span class="emphasis"><i class="EMPHASIS">Instead of:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">#define USE_IMG_LST 1 or
 #define _USE_IMAGE_LIST 1 or
 #define USE_IMAGE_LIST_ 1 or
 #define use_image_list 1 or
-#define UseImageList 1</PRE
-></TD
-></TR
-></TABLE
-></DIV
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="S15"
->4.4. Using Space</A
-></H2
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S16"
->4.4.1. Put braces on a line by themselves.</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->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.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->if (this == that)
+#define UseImageList 1</pre>
+            </td>
+          </tr>
+        </table>
+      </div>
+    </div>
+    <div class="SECT2">
+      <h2 class="SECT2"><a name="S15" id="S15">4.4. Using Space</a></h2>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S16" id="S16">4.4.1. Put braces on a line by themselves.</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>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.</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Example:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">if (this == that)
 {
    ...
-}</PRE
-></TD
-></TR
-></TABLE
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Instead of:</I
-></SPAN
-></P
-><P
->if (this == that) { ... }</P
-><P
->or</P
-><P
->if (this == that) { ... }</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Note:</I
-></SPAN
-> 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.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Status:</I
-></SPAN
-> developer-discretion.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example exception:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->while (more lines are read)
+}</pre>
+            </td>
+          </tr>
+        </table>
+        <p><span class="emphasis"><i class="EMPHASIS">Instead of:</i></span></p>
+        <p>if (this == that) { ... }</p>
+        <p>or</p>
+        <p>if (this == that) { ... }</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Note:</i></span> 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.</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Status:</i></span> developer-discretion.</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Example exception:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">while (more lines are read)
 {
    /* Please document what is/is not a comment line here */
    if (it's a comment) continue;
 
    do_something(line);
-}</PRE
-></TD
-></TR
-></TABLE
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S17"
->4.4.2. ALL control statements should have a
-    block</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->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.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->if (this == that)
+}</pre>
+            </td>
+          </tr>
+        </table>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S17" id="S17">4.4.2. ALL control statements should have a block</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>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.</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Example:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">if (this == that)
 {
    do_something();
    do_something_else();
-}</PRE
-></TD
-></TR
-></TABLE
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Instead of:</I
-></SPAN
-></P
-><P
->if (this == that) do_something(); do_something_else();</P
-><P
->or</P
-><P
->if (this == that) do_something();</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Note:</I
-></SPAN
-> 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.</P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S18"
->4.4.3. Do not belabor/blow-up boolean
-    expressions</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->structure-&#62;flag = (condition);</PRE
-></TD
-></TR
-></TABLE
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Instead of:</I
-></SPAN
-></P
-><P
->if (condition) { structure-&#62;flag = 1; } else {
-    structure-&#62;flag = 0; }</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Note:</I
-></SPAN
-> 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-)</P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S19"
->4.4.4. Use white space freely because it is
-    free</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->Make it readable. The notable exception to using white space
-    freely is listed in the next guideline.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int first_value   = 0;
+}</pre>
+            </td>
+          </tr>
+        </table>
+        <p><span class="emphasis"><i class="EMPHASIS">Instead of:</i></span></p>
+        <p>if (this == that) do_something(); do_something_else();</p>
+        <p>or</p>
+        <p>if (this == that) do_something();</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Note:</i></span> 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.</p>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S18" id="S18">4.4.3. Do not belabor/blow-up boolean expressions</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Example:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">structure-&#62;flag = (condition);</pre>
+            </td>
+          </tr>
+        </table>
+        <p><span class="emphasis"><i class="EMPHASIS">Instead of:</i></span></p>
+        <p>if (condition) { structure-&#62;flag = 1; } else { structure-&#62;flag = 0; }</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Note:</i></span> 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-)</p>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S19" id="S19">4.4.4. Use white space freely because it is free</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>Make it readable. The notable exception to using white space freely is listed in the next guideline.</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Example:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">int first_value   = 0;
 int some_value    = 0;
 int another_value = 0;
-int this_variable = 0;</PRE
-></TD
-></TR
-></TABLE
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S20"
->4.4.5. Don't use white space around structure
-    operators</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->- structure pointer operator ( "-&#62;" ) - member operator (
-    "." ) - functions and parentheses</P
-><P
->It is a general coding practice to put pointers, references,
-    and function parentheses next to names. With spaces, the
-    connection between the object and variable/function name is not
-    as clear.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->a_struct-&#62;a_member;
+int this_variable = 0;</pre>
+            </td>
+          </tr>
+        </table>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S20" id="S20">4.4.5. Don't use white space around structure operators</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>- structure pointer operator ( "-&#62;" ) - member operator ( "." ) - functions and parentheses</p>
+        <p>It is a general coding practice to put pointers, references, and function parentheses next to names. With
+        spaces, the connection between the object and variable/function name is not as clear.</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Example:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">a_struct-&#62;a_member;
 a_struct.a_member;
-function_name();</PRE
-></TD
-></TR
-></TABLE
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Instead of:</I
-></SPAN
-> a_struct -&#62; a_member; a_struct . a_member;
-    function_name ();</P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S21"
->4.4.6. Make the last brace of a function stand
-    out</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int function1( ... )
+function_name();</pre>
+            </td>
+          </tr>
+        </table>
+        <p><span class="emphasis"><i class="EMPHASIS">Instead of:</i></span> a_struct -&#62; a_member; a_struct .
+        a_member; function_name ();</p>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S21" id="S21">4.4.6. Make the last brace of a function stand out</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Example:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">int function1( ... )
 {
    ...code...
    return(ret_code);
@@ -1170,83 +477,30 @@ CLASS="PROGRAMLISTING"
 
 int function2( ... )
 {
-} /* -END- function2 */</PRE
-></TD
-></TR
-></TABLE
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Instead of:</I
-></SPAN
-></P
-><P
->int function1( ... ) { ...code... return(ret_code); } int
-    function2( ... ) { }</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Note:</I
-></SPAN
-> 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!</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Status:</I
-></SPAN
-> developer-discretion on the number of blank
-    lines. Enforced is the end of function comments.</P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S22"
->4.4.7. Use 3 character indentions</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->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.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->static const char * const url_code_map[256] =
+} /* -END- function2 */</pre>
+            </td>
+          </tr>
+        </table>
+        <p><span class="emphasis"><i class="EMPHASIS">Instead of:</i></span></p>
+        <p>int function1( ... ) { ...code... return(ret_code); } int function2( ... ) { }</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Note:</i></span> 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!</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Status:</i></span> developer-discretion on the number of blank
+        lines. Enforced is the end of function comments.</p>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S22" id="S22">4.4.7. Use 3 character indentions</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>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.</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Example:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">static const char * const url_code_map[256] =
 {
    NULL, ...
 };
@@ -1265,475 +519,174 @@ int function1( ... )
 
    return NEVER_GETS_HERE;
 
-}</PRE
-></TD
-></TR
-></TABLE
-></DIV
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="S23"
->4.5. Initializing</A
-></H2
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S24"
->4.5.1. Initialize all variables</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->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.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->short a_short = 0;
+}</pre>
+            </td>
+          </tr>
+        </table>
+      </div>
+    </div>
+    <div class="SECT2">
+      <h2 class="SECT2"><a name="S23" id="S23">4.5. Initializing</a></h2>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S24" id="S24">4.5.1. Initialize all variables</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>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.</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Example:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">short a_short = 0;
 float a_float  = 0;
-struct *ptr = NULL;</PRE
-></TD
-></TR
-></TABLE
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Note:</I
-></SPAN
-> 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].</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Status:</I
-></SPAN
-> developer-discretion if and only if the
-    variable is assigned a value "shortly after" declaration.</P
-></DIV
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="S25"
->4.6. Functions</A
-></H2
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S26"
->4.6.1. Name functions that return a boolean as a
-    question.</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->Value should be phrased as a question that would logically
-    be answered as a true or false statement</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->should_we_block_this();
+struct *ptr = NULL;</pre>
+            </td>
+          </tr>
+        </table>
+        <p><span class="emphasis"><i class="EMPHASIS">Note:</i></span> 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].</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Status:</i></span> developer-discretion if and only if the
+        variable is assigned a value "shortly after" declaration.</p>
+      </div>
+    </div>
+    <div class="SECT2">
+      <h2 class="SECT2"><a name="S25" id="S25">4.6. Functions</a></h2>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S26" id="S26">4.6.1. Name functions that return a boolean as a question.</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>Value should be phrased as a question that would logically be answered as a true or false statement</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Example:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">should_we_block_this();
 contains_an_image();
-is_web_page_blank();</PRE
-></TD
-></TR
-></TABLE
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S27"
->4.6.2. Always specify a return type for a
-    function.</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->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 create a void return type if the function does not
-    need to return anything.</P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S28"
->4.6.3. Minimize function calls when iterating by
-    using variables</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->It is easy to write the following code, and a clear argument
-    can be made that the code is easy to understand:</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->for (size_t cnt = 0; cnt &#60; block_list_length(); cnt++)
+is_web_page_blank();</pre>
+            </td>
+          </tr>
+        </table>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S27" id="S27">4.6.2. Always specify a return type for a function.</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>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 create a void return type if the function does not need to return anything.</p>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S28" id="S28">4.6.3. Minimize function calls when iterating by using
+        variables</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>It is easy to write the following code, and a clear argument can be made that the code is easy to
+        understand:</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Example:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">for (size_t cnt = 0; cnt &lt; block_list_length(); cnt++)
 {
    ....
-}</PRE
-></TD
-></TR
-></TABLE
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Note:</I
-></SPAN
-> 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.</P
-><P
->Instead of using a function call during the iterations,
-    assign the value to a variable, and evaluate using the
-    variable.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->size_t len = block_list_length();
+}</pre>
+            </td>
+          </tr>
+        </table>
+        <p><span class="emphasis"><i class="EMPHASIS">Note:</i></span> 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.</p>
+        <p>Instead of using a function call during the iterations, assign the value to a variable, and evaluate using
+        the variable.</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Example:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">size_t len = block_list_length();
 
-for (size_t cnt = 0; cnt &#60; len; cnt++)
+for (size_t cnt = 0; cnt &lt; len; cnt++)
 {
    ....
-}</PRE
-></TD
-></TR
-></TABLE
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Exceptions:</I
-></SPAN
-> 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.</P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S29"
->4.6.4. Pass and Return by Const Reference</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->This allows a developer to define a const pointer and call
-    your function. If your function does not have the const
-    keyword, we may not be able to use your function. Consider
-    strcmp, if it were defined as: extern int strcmp(char *s1,
-    char *s2);</P
-><P
->I could then not use it to compare argv's in main: int
-    main(int argc, const char *argv[]) { strcmp(argv[0], "privoxy");
-     }</P
-><P
->Both these pointers are *const*! If the c runtime library
-    maintainers do it, we should too.</P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S30"
->4.6.5. Pass and Return by Value</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->Most structures cannot fit onto a normal stack entry (i.e.
-    they are not 4 bytes or less). Aka, a function declaration
-    like: int load_aclfile(struct client_state csp)</P
-><P
->would not work. So, to be consistent, we should declare all
-    prototypes with "pass by value": int load_aclfile(struct
-    client_state *csp)</P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S31"
->4.6.6. Names of include files</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->Your include statements should contain the file name without
-    a path. The path should be listed in the Makefile, using -I as
-    processor directive to search the indicated paths. An exception
-    to this would be for some proprietary software that utilizes a
-    partial path to distinguish their header files from system or
-    other header files.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->#include &#60;iostream.h&#62;     /* This is not a local include */
-#include "config.h"       /* This IS a local include */</PRE
-></TD
-></TR
-></TABLE
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Exception:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->/* This is not a local include, but requires a path element. */
-#include &#60;sys/fileName.h&#62;</PRE
-></TD
-></TR
-></TABLE
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Note:</I
-></SPAN
-> Please! do not add "-I." to the Makefile
-    without a _very_ good reason. This duplicates the #include
-    "file.h" behavior.</P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S32"
->4.6.7. Provide multiple inclusion
-    protection</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->Prevents compiler and linker errors resulting from
-    redefinition of items.</P
-><P
->Wrap each header file with the following syntax to prevent
-    multiple inclusions of the file. Of course, replace PROJECT_H
-    with your file name, with "." Changed to "_", and make it
-    uppercase.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->#ifndef PROJECT_H_INCLUDED
+}</pre>
+            </td>
+          </tr>
+        </table>
+        <p><span class="emphasis"><i class="EMPHASIS">Exceptions:</i></span> 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.</p>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S29" id="S29">4.6.4. Pass and Return by Const Reference</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>This allows a developer to define a const pointer and call your function. If your function does not have the
+        const keyword, we may not be able to use your function. Consider strcmp, if it were defined as: extern int
+        strcmp(char *s1, char *s2);</p>
+        <p>I could then not use it to compare argv's in main: int main(int argc, const char *argv[]) { strcmp(argv[0],
+        "privoxy"); }</p>
+        <p>Both these pointers are *const*! If the c runtime library maintainers do it, we should too.</p>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S30" id="S30">4.6.5. Pass and Return by Value</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>Most structures cannot fit onto a normal stack entry (i.e. they are not 4 bytes or less). Aka, a function
+        declaration like: int load_aclfile(struct client_state csp)</p>
+        <p>would not work. So, to be consistent, we should declare all prototypes with "pass by value": int
+        load_aclfile(struct client_state *csp)</p>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S31" id="S31">4.6.6. Names of include files</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>Your include statements should contain the file name without a path. The path should be listed in the
+        Makefile, using -I as processor directive to search the indicated paths. An exception to this would be for some
+        proprietary software that utilizes a partial path to distinguish their header files from system or other header
+        files.</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Example:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">#include &lt;iostream.h&gt;     /* This is not a local include */
+#include "config.h"       /* This IS a local include */</pre>
+            </td>
+          </tr>
+        </table>
+        <p><span class="emphasis"><i class="EMPHASIS">Exception:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">/* This is not a local include, but requires a path element. */
+#include &lt;sys/fileName.h&gt;</pre>
+            </td>
+          </tr>
+        </table>
+        <p><span class="emphasis"><i class="EMPHASIS">Note:</i></span> Please! do not add "-I." to the Makefile without
+        a _very_ good reason. This duplicates the #include "file.h" behavior.</p>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S32" id="S32">4.6.7. Provide multiple inclusion protection</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>Prevents compiler and linker errors resulting from redefinition of items.</p>
+        <p>Wrap each header file with the following syntax to prevent multiple inclusions of the file. Of course,
+        replace PROJECT_H with your file name, with "." Changed to "_", and make it uppercase.</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Example:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">#ifndef PROJECT_H_INCLUDED
 #define PROJECT_H_INCLUDED
  ...
-#endif /* ndef PROJECT_H_INCLUDED */</PRE
-></TD
-></TR
-></TABLE
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S33"
->4.6.8. Use `extern "C"` when appropriate</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->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.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->#ifdef __cplusplus
+#endif /* ndef PROJECT_H_INCLUDED */</pre>
+            </td>
+          </tr>
+        </table>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S33" id="S33">4.6.8. Use `extern "C"` when appropriate</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>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.</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Example:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">#ifdef __cplusplus
 extern "C"
 {
 #endif /* def __cplusplus */
@@ -1742,145 +695,54 @@ extern "C"
 
 #ifdef __cplusplus
 }
-#endif /* def __cplusplus */</PRE
-></TD
-></TR
-></TABLE
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S34"
->4.6.9. Where Possible, Use Forward Struct
-    Declaration Instead of Includes</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->Useful in headers that include pointers to other struct's.
-    Modifications to excess header files may cause needless
-    compiles.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->/*********************************************************************
+#endif /* def __cplusplus */</pre>
+            </td>
+          </tr>
+        </table>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S34" id="S34">4.6.9. Where Possible, Use Forward Struct Declaration Instead of
+        Includes</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>Useful in headers that include pointers to other struct's. Modifications to excess header files may cause
+        needless compiles.</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Example:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">/*********************************************************************
  * We're avoiding an include statement here!
  *********************************************************************/
 struct file_list;
-extern file_list *xyz;</PRE
-></TD
-></TR
-></TABLE
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Note:</I
-></SPAN
-> 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.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Status:</I
-></SPAN
-> Use with discretion.</P
-></DIV
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="S35"
->4.7. General Coding Practices</A
-></H2
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S36"
->4.7.1. Turn on warnings</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation</I
-></SPAN
-></P
-><P
->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 as many warnings as possible.</P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S37"
->4.7.2. Provide a default case for all switch
-    statements</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->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.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->switch (hash_string(cmd))
+extern file_list *xyz;</pre>
+            </td>
+          </tr>
+        </table>
+        <p><span class="emphasis"><i class="EMPHASIS">Note:</i></span> 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.</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Status:</i></span> Use with discretion.</p>
+      </div>
+    </div>
+    <div class="SECT2">
+      <h2 class="SECT2"><a name="S35" id="S35">4.7. General Coding Practices</a></h2>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S36" id="S36">4.7.1. Turn on warnings</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation</i></span></p>
+        <p>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 as many warnings as possible.</p>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S37" id="S37">4.7.2. Provide a default case for all switch statements</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>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.</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Example:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">switch (hash_string(cmd))
 {
    case hash_actions_file:
       ... code ...
@@ -1895,402 +757,135 @@ CLASS="PROGRAMLISTING"
       ... anomaly code goes here ...
       continue; / break; / exit( 1 ); / etc ...
 
-} /* end switch (hash_string(cmd)) */</PRE
-></TD
-></TR
-></TABLE
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Note:</I
-></SPAN
-> 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.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Another Note:</I
-></SPAN
-> 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.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Status:</I
-></SPAN
-> Programmer discretion is advised.</P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S38"
->4.7.3. Try to avoid falling through cases in a
-    switch statement.</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->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 readable and understandable, and furthermore can
-    prevent unwanted surprises if someone else later gets creative
-    and moves the code around.</P
-><P
->The language allows you to plan the fall through from one
-    case statement to another simply by omitting the break
-    statement within the case statement. This feature does have
-    benefits, but should only be used in rare cases. In general,
-    use a break statement for each case statement.</P
-><P
->If you choose to allow fall through, you should comment both
-    the fact of the fall through and reason why you felt it was
-    necessary.</P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S40"
->4.7.4. Don't mix size_t and other types</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->The type of size_t varies across platforms. Do not make
-    assumptions about whether it is signed or unsigned, or about
-    how long it is. Do not compare a size_t against another
-    variable of a different type (or even against a constant)
-    without casting one of the values.</P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S41"
->4.7.5. Declare each variable and struct on its
-    own line.</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->It can be tempting to declare a series of variables all on
-    one line. Don't.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->long a = 0;
+} /* end switch (hash_string(cmd)) */</pre>
+            </td>
+          </tr>
+        </table>
+        <p><span class="emphasis"><i class="EMPHASIS">Note:</i></span> 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.</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Another Note:</i></span> 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.</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Status:</i></span> Programmer discretion is advised.</p>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S38" id="S38">4.7.3. Try to avoid falling through cases in a switch
+        statement.</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>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 readable and understandable, and furthermore can prevent unwanted surprises if someone
+        else later gets creative and moves the code around.</p>
+        <p>The language allows you to plan the fall through from one case statement to another simply by omitting the
+        break statement within the case statement. This feature does have benefits, but should only be used in rare
+        cases. In general, use a break statement for each case statement.</p>
+        <p>If you choose to allow fall through, you should comment both the fact of the fall through and reason why you
+        felt it was necessary.</p>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S40" id="S40">4.7.4. Don't mix size_t and other types</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>The type of size_t varies across platforms. Do not make assumptions about whether it is signed or unsigned,
+        or about how long it is. Do not compare a size_t against another variable of a different type (or even against
+        a constant) without casting one of the values.</p>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S41" id="S41">4.7.5. Declare each variable and struct on its own line.</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>It can be tempting to declare a series of variables all on one line. Don't.</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Example:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">long a = 0;
 long b = 0;
-long c = 0;</PRE
-></TD
-></TR
-></TABLE
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Instead of:</I
-></SPAN
-></P
-><P
->long a, b, c;</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-> - 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</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Exceptions:</I
-></SPAN
-> 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.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Status:</I
-></SPAN
-> developer-discretion.</P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S42"
->4.7.6. Use malloc/zalloc sparingly</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->Create a local struct (on the stack) if the variable will
-    live and die within the context of one function call.</P
-><P
->Only "malloc" a struct (on the heap) if the variable's life
-    will extend beyond the context of one function call.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->If a function creates a struct and stores a pointer to it in a
-list, then it should definitely be allocated via `malloc'.</PRE
-></TD
-></TR
-></TABLE
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S43"
->4.7.7. The Programmer Who Uses 'malloc' is
-    Responsible for Ensuring 'free'</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->If you have to "malloc" an instance, you are responsible for
-    insuring that the instance is `free'd, even if the deallocation
-    event falls within some other programmer's code. You are also
-    responsible for ensuring that deletion is timely (i.e. not too
-    soon, not too late). This is known as "low-coupling" and is a
-    "good thing (tm)". You may need to offer a
-    free/unload/destructor type function to accommodate this.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int load_re_filterfile(struct client_state *csp) { ... }
-static void unload_re_filterfile(void *f) { ... }</PRE
-></TD
-></TR
-></TABLE
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Exceptions:</I
-></SPAN
-></P
-><P
->The developer cannot be expected to provide `free'ing
-    functions for C run-time library functions ... such as
-    `strdup'.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Status:</I
-></SPAN
-> developer-discretion. The "main" use of this
-    standard is for allocating and freeing data structures (complex
-    or nested).</P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S44"
->4.7.8. Add loaders to the `file_list' structure
-    and in order</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->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.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Note:</I
-></SPAN
-> 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.</P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="S45"
->4.7.9. "Uncertain" new code and/or changes to
-    existing code, use XXX</A
-></H3
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Explanation:</I
-></SPAN
-></P
-><P
->If you have enough confidence in new code or confidence in
-    your changes, but are not *quite* sure of the repercussions,
-    add this:</P
-><P
->/* XXX: this code has a logic error on platform XYZ, *
-    attempting to fix */ #ifdef PLATFORM ...changed code here...
-    #endif</P
-><P
->or:</P
-><P
->/* XXX: I think the original author really meant this...
-    */ ...changed code here...</P
-><P
->or:</P
-><P
->/* XXX: new code that *may* break something else... */
-    ...new code here...</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Note:</I
-></SPAN
-> 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).</P
-></DIV
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="S46"
->4.8. Addendum: Template for files and function
-    comment blocks:</A
-></H2
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example for file comments:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->/*********************************************************************
+long c = 0;</pre>
+            </td>
+          </tr>
+        </table>
+        <p><span class="emphasis"><i class="EMPHASIS">Instead of:</i></span></p>
+        <p>long a, b, c;</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span> - 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</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Exceptions:</i></span> 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.</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Status:</i></span> developer-discretion.</p>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S42" id="S42">4.7.6. Use malloc/zalloc sparingly</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>Create a local struct (on the stack) if the variable will live and die within the context of one function
+        call.</p>
+        <p>Only "malloc" a struct (on the heap) if the variable's life will extend beyond the context of one function
+        call.</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Example:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">If a function creates a struct and stores a pointer to it in a
+list, then it should definitely be allocated via `malloc'.</pre>
+            </td>
+          </tr>
+        </table>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S43" id="S43">4.7.7. The Programmer Who Uses 'malloc' is Responsible for Ensuring
+        'free'</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>If you have to "malloc" an instance, you are responsible for insuring that the instance is `free'd, even if
+        the deallocation event falls within some other programmer's code. You are also responsible for ensuring that
+        deletion is timely (i.e. not too soon, not too late). This is known as "low-coupling" and is a "good thing
+        (tm)". You may need to offer a free/unload/destructor type function to accommodate this.</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Example:</i></span></p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">int load_re_filterfile(struct client_state *csp) { ... }
+static void unload_re_filterfile(void *f) { ... }</pre>
+            </td>
+          </tr>
+        </table>
+        <p><span class="emphasis"><i class="EMPHASIS">Exceptions:</i></span></p>
+        <p>The developer cannot be expected to provide `free'ing functions for C run-time library functions ... such as
+        `strdup'.</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Status:</i></span> developer-discretion. The "main" use of this
+        standard is for allocating and freeing data structures (complex or nested).</p>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S44" id="S44">4.7.8. Add loaders to the `file_list' structure and in order</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>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.</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Note:</i></span> 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.</p>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="S45" id="S45">4.7.9. "Uncertain" new code and/or changes to existing code, use
+        XXX</a></h3>
+        <p><span class="emphasis"><i class="EMPHASIS">Explanation:</i></span></p>
+        <p>If you have enough confidence in new code or confidence in your changes, but are not *quite* sure of the
+        repercussions, add this:</p>
+        <p>/* XXX: this code has a logic error on platform XYZ, * attempting to fix */ #ifdef PLATFORM ...changed code
+        here... #endif</p>
+        <p>or:</p>
+        <p>/* XXX: I think the original author really meant this... */ ...changed code here...</p>
+        <p>or:</p>
+        <p>/* XXX: new code that *may* break something else... */ ...new code here...</p>
+        <p><span class="emphasis"><i class="EMPHASIS">Note:</i></span> 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).</p>
+      </div>
+    </div>
+    <div class="SECT2">
+      <h2 class="SECT2"><a name="S46" id="S46">4.8. Addendum: Template for files and function comment blocks:</a></h2>
+      <p><span class="emphasis"><i class="EMPHASIS">Example for file comments:</i></span></p>
+      <table border="0" bgcolor="#E0E0E0" width="100%">
+        <tr>
+          <td>
+            <pre class="PROGRAMLISTING">/*********************************************************************
  *
  * File        :  $Source
  *
@@ -2325,50 +920,21 @@ CLASS="PROGRAMLISTING"
 
    ...necessary include files for us to do our work...
 
-const char FILENAME_h_rcs[] = FILENAME_H_VERSION;</PRE
-></TD
-></TR
-></TABLE
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Note:</I
-></SPAN
-> This declares the rcs variables that should be
-    added to the "show-version" 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.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Note:</I
-></SPAN
-> 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.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example for file header comments:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->#ifndef _FILENAME_H
+const char FILENAME_h_rcs[] = FILENAME_H_VERSION;</pre>
+          </td>
+        </tr>
+      </table>
+      <p><span class="emphasis"><i class="EMPHASIS">Note:</i></span> This declares the rcs variables that should be
+      added to the "show-version" 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.</p>
+      <p><span class="emphasis"><i class="EMPHASIS">Note:</i></span> 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.</p>
+      <p><span class="emphasis"><i class="EMPHASIS">Example for file header comments:</i></span></p>
+      <table border="0" bgcolor="#E0E0E0" width="100%">
+        <tr>
+          <td>
+            <pre class="PROGRAMLISTING">#ifndef _FILENAME_H
 #define _FILENAME_H
 /*********************************************************************
  *
@@ -2425,27 +991,15 @@ extern const char FILENAME_h_rcs[];
   Local Variables:
   tab-width: 3
   end:
-*/</PRE
-></TD
-></TR
-></TABLE
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Example for function comments:</I
-></SPAN
-></P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->/*********************************************************************
+*/</pre>
+          </td>
+        </tr>
+      </table>
+      <p><span class="emphasis"><i class="EMPHASIS">Example for function comments:</i></span></p>
+      <table border="0" bgcolor="#E0E0E0" width="100%">
+        <tr>
+          <td>
+            <pre class="PROGRAMLISTING">/*********************************************************************
  *
  * Function    :  FUNCTION_NAME
  *
@@ -2463,80 +1017,28 @@ int FUNCTION_NAME(void *param1, const char *x)
    ...
    return 0;
 
-}</PRE
-></TD
-></TR
-></TABLE
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Note:</I
-></SPAN
-> If we all follow this practice, we should be
-    able to parse our code to create a "self-documenting" web
-    page.</P
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="documentation.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="testing.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Documentation Guidelines</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Testing Guidelines</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
+}</pre>
+          </td>
+        </tr>
+      </table>
+      <p><span class="emphasis"><i class="EMPHASIS">Note:</i></span> If we all follow this practice, we should be able
+      to parse our code to create a "self-documenting" web page.</p>
+    </div>
+  </div>
+  <div class="NAVFOOTER">
+    <hr align="left" width="100%">
+    <table summary="Footer navigation table" width="100%" border="0" cellpadding="0" cellspacing="0">
+      <tr>
+        <td width="33%" align="left" valign="top"><a href="documentation.html" accesskey="P">Prev</a></td>
+        <td width="34%" align="center" valign="top"><a href="index.html" accesskey="H">Home</a></td>
+        <td width="33%" align="right" valign="top"><a href="testing.html" accesskey="N">Next</a></td>
+      </tr>
+      <tr>
+        <td width="33%" align="left" valign="top">Documentation Guidelines</td>
+        <td width="34%" align="center" valign="top">&nbsp;</td>
+        <td width="33%" align="right" valign="top">Testing Guidelines</td>
+      </tr>
+    </table>
+  </div>
+</body>
+</html>
index cb3e797..5e7c7fc 100644 (file)
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->Documentation Guidelines</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="Privoxy Developer Manual"
-HREF="index.html"><LINK
-REL="PREVIOUS"
-TITLE="The Git Repository"
-HREF="git.html"><LINK
-REL="NEXT"
-TITLE="Coding Guidelines"
-HREF="coding.html"><LINK
-REL="STYLESHEET"
-TYPE="text/css"
-HREF="../p_doc.css"><META
-HTTP-EQUIV="Content-Type"
-CONTENT="text/html;
-charset=ISO-8859-1"></HEAD
-><BODY
-CLASS="SECT1"
-BGCOLOR="#EEEEEE"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->Privoxy Developer Manual</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="git.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="coding.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="DOCUMENTATION"
->3. Documentation Guidelines</A
-></H1
-><P
->    All formal documents are maintained in Docbook SGML and located in the
-    <SAMP
-CLASS="COMPUTEROUTPUT"
->doc/source/*</SAMP
-> directory. You will need
-    <A
-HREF="http://www.docbook.org"
-TARGET="_top"
->Docbook</A
->, the Docbook
-    DTD's and the Docbook modular stylesheets (or comparable alternatives),
-    and either <SPAN
-CLASS="APPLICATION"
->jade</SPAN
-> or
-    <SPAN
-CLASS="APPLICATION"
->openjade</SPAN
-> (recommended) installed in order to
-    build docs from source. Currently there is <A
-HREF="../user-manual/index.html"
-TARGET="_top"
-><I
-CLASS="CITETITLE"
->user-manual</I
-></A
->,
-    <A
-HREF="../faq/index.html"
-TARGET="_top"
-><I
-CLASS="CITETITLE"
->FAQ</I
-></A
->, and, of
-    course this, the <I
-CLASS="CITETITLE"
->developer-manual</I
-> in this format.
-    The <I
-CLASS="CITETITLE"
->README</I
->, <I
-CLASS="CITETITLE"
->AUTHORS</I
->,
-    <I
-CLASS="CITETITLE"
->INSTALL</I
->,
-    <I
-CLASS="CITETITLE"
->privoxy.1</I
-> (man page), and
-    <I
-CLASS="CITETITLE"
->config</I
-> files are also now maintained as Docbook
-    SGML. These files, when built, in the top-level source directory are
-    generated files! Also, the <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> <TT
-CLASS="FILENAME"
->index.html</TT
-> (and a
-    variation on this file, <TT
-CLASS="FILENAME"
->privoxy-index.html</TT
->,
-    meant for inclusion with doc packages), are maintained as SGML as well.
-    <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->DO NOT edit these directly</I
-></SPAN
->. Edit the SGML source, or
-    contact someone involved in the documentation.
-    </P
-><P
->     <TT
-CLASS="FILENAME"
->config</TT
-> requires some special handling. The reason it
-     is maintained this way is so that the extensive comments in the file
-     mirror those in <I
-CLASS="CITETITLE"
->user-manual</I
->. But the conversion
-     process requires going from SGML to HTML to text to special formatting
-     required for the embedded comments. Some of this does not survive so
-     well. Especially some of the examples that are longer than 80 characters.
-     The build process for this file outputs to <TT
-CLASS="FILENAME"
->config.new</TT
->,
-     which should be reviewed for errors and mis-formatting. Once satisfied
-     that it is correct, then it should be hand copied to
-     <TT
-CLASS="FILENAME"
->config</TT
->.
-    </P
-><P
->     Other, less formal documents (e.g. <TT
-CLASS="FILENAME"
->LICENSE</TT
->) are
-     maintained as plain text files in the top-level source directory.
-    </P
-><P
->     Packagers are encouraged to include this documentation. For those without
-     the ability to build the docs locally, text versions of each are kept in
-     Git. HTML versions are also being kept in Git under
-     <TT
-CLASS="FILENAME"
->doc/webserver/*</TT
->.
-    </P
-><P
->     Formal documents are built with the Makefile targets of
-     <SAMP
-CLASS="COMPUTEROUTPUT"
->make dok</SAMP
->.
-     The build process uses the document SGML sources in
-     <SAMP
-CLASS="COMPUTEROUTPUT"
->doc/source/*/*</SAMP
-> to update all text files in
-     <SAMP
-CLASS="COMPUTEROUTPUT"
->doc/text/</SAMP
-> and to update all HTML
-     documents in <SAMP
-CLASS="COMPUTEROUTPUT"
->doc/webserver/</SAMP
->.
-    </P
-><P
->     Documentation writers should please make sure documents build
-     successfully before committing to Git, if possible.
-    </P
-><P
->     How do you update the webserver (i.e. the pages on privoxy.org)?
-    </P
-><P
-></P
-><OL
-TYPE="1"
-><LI
-><P
->        First, build the docs by running <SAMP
-CLASS="COMPUTEROUTPUT"
->make
-        dok</SAMP
->.
-      </P
-></LI
-><LI
-><P
->        Run <SAMP
-CLASS="COMPUTEROUTPUT"
->make webserver</SAMP
-> which copies all
-        files from <SAMP
-CLASS="COMPUTEROUTPUT"
->doc/webserver</SAMP
-> to the
-        sourceforge webserver via scp.
-      </P
-></LI
-></OL
-><P
->   Finished docs should be occasionally submitted to Git
-   (<TT
-CLASS="FILENAME"
->doc/webserver/*/*.html</TT
->) 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 <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->after</I
-></SPAN
-> the <TT
-CLASS="LITERAL"
->$VERSION</TT
-> and
-   other release specific data in <TT
-CLASS="FILENAME"
->configure.in</TT
-> has been
-   updated (this is done just prior to a new release).
-  </P
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="SGML"
->3.1. Quickstart to Docbook and SGML</A
-></H2
-><P
-> If you are not familiar with SGML, it is a markup language similar to HTML.
- Actually, not a mark up language per se, but a language used to define
- markup languages. In fact, HTML is an SGML application. Both will use
- <SPAN
-CLASS="QUOTE"
->"tags"</SPAN
-> to format text and other content. SGML tags can be much
- more varied, and flexible, but do much of the same kinds of things. The tags,
- or <SPAN
-CLASS="QUOTE"
->"elements"</SPAN
->, are definable in SGML. There is no set
- <SPAN
-CLASS="QUOTE"
->"standards"</SPAN
->. Since we are using
- <SPAN
-CLASS="APPLICATION"
->Docbook</SPAN
->, our tags are those that are defined by
- <SPAN
-CLASS="APPLICATION"
->Docbook</SPAN
->. Much of how the finish document is
- rendered is determined by the <SPAN
-CLASS="QUOTE"
->"stylesheets"</SPAN
->.
- The stylesheets determine how each tag gets translated to HTML, or other
- formats.</P
-><P
-> Tags in Docbook SGML need to be always <SPAN
-CLASS="QUOTE"
->"closed"</SPAN
->. If not, you
- will likely generate errors. Example: <TT
-CLASS="LITERAL"
->&#60;title&#62;My
- Title&#60;/title&#62;</TT
->. They are also case-insensitive, but we
- strongly suggest using all lower case. This keeps compatibility with
- [Docbook] <SPAN
-CLASS="APPLICATION"
->XML</SPAN
->.</P
-><P
-> Our documents use <SPAN
-CLASS="QUOTE"
->"sections"</SPAN
-> for the most part. Sections
- will be processed into HTML headers (e.g. <TT
-CLASS="LITERAL"
->h1</TT
-> for
- <TT
-CLASS="LITERAL"
->sect1</TT
->). The <SPAN
-CLASS="APPLICATION"
->Docbook</SPAN
-> stylesheets
- will use these to also generate the Table of Contents for each doc. Our
- TOC's are set to a depth of three. Meaning <TT
-CLASS="LITERAL"
->sect1</TT
->,
- <TT
-CLASS="LITERAL"
->sect2</TT
->, and <TT
-CLASS="LITERAL"
->sect3</TT
-> will have TOC
- entries, but <TT
-CLASS="LITERAL"
->sect4</TT
-> will not. Each section requires
- a <TT
-CLASS="LITERAL"
->&#60;title&#62;</TT
-> element, and at least one
- <TT
-CLASS="LITERAL"
->&#60;para&#62;</TT
->. There is a limit of five section
- levels in Docbook, but generally three should be sufficient for our
- purposes.</P
-><P
-> Some common elements that you likely will use:</P
-><P
-></P
-><TABLE
-BORDER="0"
-><TBODY
-><TR
-><TD
->      <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->&#60;para&#62;&#60;/para&#62;</I
-></SPAN
->, paragraph delimiter. Most
-      text needs to be within paragraph elements (there are some exceptions).
-    </TD
-></TR
-><TR
-><TD
->      <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->&#60;emphasis&#62;&#60;/emphasis&#62;</I
-></SPAN
->, the stylesheets
-      make this italics.
-    </TD
-></TR
-><TR
-><TD
->      <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->&#60;filename&#62;&#60;/filename&#62;</I
-></SPAN
->, files and directories.
-    </TD
-></TR
-><TR
-><TD
->      <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->&#60;command&#62;&#60;/command&#62;</I
-></SPAN
->, command examples.
-    </TD
-></TR
-><TR
-><TD
->      <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->&#60;literallayout&#62;&#60;/literallayout&#62;</I
-></SPAN
->, like
-      <TT
-CLASS="LITERAL"
->&#60;pre&#62;</TT
->, more or less.
-    </TD
-></TR
-><TR
-><TD
->      <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->&#60;itemizedlist&#62;&#60;/itemizedlist&#62;</I
-></SPAN
->, list with bullets.
-    </TD
-></TR
-><TR
-><TD
->      <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->&#60;listitem&#62;&#60;/listitem&#62;</I
-></SPAN
->, member of the above.
-    </TD
-></TR
-><TR
-><TD
->      <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->&#60;screen&#62;&#60;/screen&#62;</I
-></SPAN
->, screen output, implies
-      <TT
-CLASS="LITERAL"
->&#60;literallayout&#62;</TT
->.
-    </TD
-></TR
-><TR
-><TD
->      <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->&#60;ulink url="example.com"&#62;&#60;/ulink&#62;</I
-></SPAN
->, like
-      HTML <TT
-CLASS="LITERAL"
->&#60;a&#62;</TT
-> tag.
-    </TD
-></TR
-><TR
-><TD
->      <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->&#60;quote&#62;&#60;/quote&#62;</I
-></SPAN
->, for, doh, quoting text.
-    </TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-><P
-> Look at any of the existing docs for examples of all these and more.</P
-><P
-> You might also find
- <SPAN
-CLASS="QUOTE"
->"<A
-HREF="https://web.archive.org/web/20160315230758/http://opensource.bureau-cornavin.com/crash-course/index.html"
-TARGET="_top"
-> Writing Documentation Using DocBook - A Crash Course</A
->"</SPAN
-> useful.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="DOCSTYLE"
->3.2. <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> Documentation Style</A
-></H2
-><P
->    It will be easier if everyone follows a similar writing style. This
-    just makes it easier to read what someone else has written if it
-    is all done in a similar fashion.
-   </P
-><P
->    Here it is:
-   </P
-><P
-></P
-><UL
-><LI
-><P
->       All tags should be lower case.
-      </P
-></LI
-><LI
-><P
->       Tags delimiting a <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->block</I
-></SPAN
-> of text (even small
-       blocks) should be on their own line. Like:
-     </P
-><P
-CLASS="LITERALLAYOUT"
->&nbsp;&#60;para&#62;<br>
-&nbsp;&nbsp;Some&nbsp;text&nbsp;goes&nbsp;here.<br>
-&nbsp;&#60;/para&#62;</P
-><P
->       Tags marking individual words, or few words, should be in-line:
-     </P
-><P
-CLASS="LITERALLAYOUT"
->&nbsp;&nbsp;Just&nbsp;to&nbsp;&#60;emphasis&#62;emphasize&#60;/emphasis&#62;,&nbsp;some&nbsp;text&nbsp;goes&nbsp;here.</P
-></LI
-><LI
-><P
->      Tags should be nested and step indented for block text like: (except
-      in-line tags)
-    </P
-><P
-CLASS="LITERALLAYOUT"
->&nbsp;&#60;para&#62;<br>
-&nbsp;&nbsp;&#60;itemizedlist&#62;<br>
-&nbsp;&nbsp;&nbsp;&#60;para&#62;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&#60;listitem&#62;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Some&nbsp;text&nbsp;goes&nbsp;here&nbsp;in&nbsp;our&nbsp;list&nbsp;example.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#60;/listitem&#62;<br>
-&nbsp;&nbsp;&nbsp;&#60;/para&#62;<br>
-&nbsp;&nbsp;&#60;/itemizedlist&#62;<br>
-&nbsp;&#60;/para&#62;</P
-><P
->      This makes it easier to find the text amongst the tags ;-)
-    </P
-></LI
-><LI
-><P
->     Use white space to separate logical divisions within a document,
-     like between sections. Running everything together consistently
-     makes it harder to read and work on.
-    </P
-></LI
-><LI
-><P
->     Do not hesitate to make comments. Comments can either use the
-     &#60;comment&#62; element, or the &#60;!--  --&#62; style comment
-     familiar from HTML. (Note in Docbook v4.x &#60;comment&#62; is
-     replaced by &#60;remark&#62;.)
-    </P
-></LI
-><LI
-><P
->     We have an international audience. Refrain from slang, or English
-     idiosyncrasies (too many to list :). Humor also does not translate
-     well sometimes.
-   </P
-></LI
-><LI
-><P
->    Try to keep overall line lengths in source files to 80 characters or less
-    for obvious reasons. This is not always possible, with lengthy URLs for
-    instance.
-   </P
-></LI
-><LI
-><P
->    Our documents are available in differing formats. Right now, they
-    are just plain text and/or HTML, but others are always a
-    future possibility. Be careful with URLs (&#60;ulink&#62;), and avoid
-    this mistake:
-   </P
-><P
->     My favorite site is &#60;ulink url="http://example.com"&#62;here&#60;/ulink&#62;.
-   </P
-><P
->     This will render as <SPAN
-CLASS="QUOTE"
->"My favorite site is here"</SPAN
->, which is
-     not real helpful in a text doc. Better like this:
-   </P
-><P
->     My favorite site is &#60;ulink url="http://example.com"&#62;example.com&#60;/ulink&#62;.
-   </P
-></LI
-><LI
-><P
->    All documents should be spell checked occasionally.
-    <SPAN
-CLASS="APPLICATION"
->aspell</SPAN
-> can check SGML with the
-    <TT
-CLASS="LITERAL"
->-H</TT
-> option. (<SPAN
-CLASS="APPLICATION"
->ispell</SPAN
-> I think
-    too.)
-   </P
-></LI
-></UL
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN203"
->3.3. Privoxy Custom Entities</A
-></H2
-><P
->  <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> documentation is using
-  a number of customized <SPAN
-CLASS="QUOTE"
->"entities"</SPAN
-> to facilitate
-  documentation maintenance.
- </P
-><P
->  We are using a set of <SPAN
-CLASS="QUOTE"
->"boilerplate"</SPAN
-> files 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
-  <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->generic</I
-></SPAN
->. That is the purpose; so it can be used in varying
-  contexts without additional modifications.
- </P
-><P
->  We are also using what <SPAN
-CLASS="APPLICATION"
->Docbook</SPAN
-> calls
-  <SPAN
-CLASS="QUOTE"
->"internal entities"</SPAN
->. These are like variables in
-  programming. Well, sort of. For instance, we have the
-  <TT
-CLASS="LITERAL"
->p-version</TT
-> entity that contains the current
-  <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> version string. You are strongly
-  encouraged to use these where possible. Some of these obviously
-  require re-setting with each release (done by the Makefile). A sampling of
-  custom entities are listed below. See any of the main docs for examples.
- </P
-><P
-></P
-><UL
-><LI
-><P
->    Re- <SPAN
-CLASS="QUOTE"
->"boilerplate"</SPAN
-> text entities are defined like:
-   </P
-><P
->    <TT
-CLASS="LITERAL"
->&#60;!entity supported SYSTEM "supported.sgml"&#62;</TT
->
-   </P
-><P
->     In this example, the contents of the file,
-     <TT
-CLASS="FILENAME"
->supported.sgml</TT
-> is available for inclusion anywhere
-     in the doc. To make this happen, just reference the now defined
-     entity: <TT
-CLASS="LITERAL"
->&#38;supported;</TT
-> (starts with an ampersand
-     and ends with a semi-colon), and the contents will be dumped into
-     the finished doc at that point.
-   </P
-></LI
-><LI
-><P
->    Commonly used <SPAN
-CLASS="QUOTE"
->"internal entities"</SPAN
->:
-  </P
-><P
-></P
-><TABLE
-BORDER="0"
-><TBODY
-><TR
-><TD
->    <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->p-version</I
-></SPAN
->: the <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
->
-    version string, e.g. <SPAN
-CLASS="QUOTE"
->"3.0.27"</SPAN
->.
-   </TD
-></TR
-><TR
-><TD
->    <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->p-status</I
-></SPAN
->: the project status, either
-    <SPAN
-CLASS="QUOTE"
->"alpha"</SPAN
->, <SPAN
-CLASS="QUOTE"
->"beta"</SPAN
->, or <SPAN
-CLASS="QUOTE"
->"stable"</SPAN
->.
-   </TD
-></TR
-><TR
-><TD
->    <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->p-not-stable</I
-></SPAN
->: use to conditionally include
-    text in <SPAN
-CLASS="QUOTE"
->"not stable"</SPAN
-> releases (e.g. <SPAN
-CLASS="QUOTE"
->"beta"</SPAN
->).
-   </TD
-></TR
-><TR
-><TD
->    <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->p-stable</I
-></SPAN
->: just the opposite.
-   </TD
-></TR
-><TR
-><TD
->    <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->p-text</I
-></SPAN
->: this doc is only generated as text.
-   </TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></LI
-></UL
-><P
->  There are others in various places that are defined for a specific
-  purpose. Read the source!
- </P
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="git.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="coding.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->The Git Repository</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Coding Guidelines</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>Documentation Guidelines</title>
+  <meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
+  <link rel="HOME" title="Privoxy Developer Manual" href="index.html">
+  <link rel="PREVIOUS" title="The Git Repository" href="git.html">
+  <link rel="NEXT" title="Coding Guidelines" href="coding.html">
+  <link rel="STYLESHEET" type="text/css" href="../p_doc.css">
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+<body class="SECT1" bgcolor="#EEEEEE" text="#000000" link="#0000FF" vlink="#840084" alink="#0000FF">
+  <div class="NAVHEADER">
+    <table summary="Header navigation table" width="100%" border="0" cellpadding="0" cellspacing="0">
+      <tr>
+        <th colspan="3" align="center">Privoxy Developer Manual</th>
+      </tr>
+      <tr>
+        <td width="10%" align="left" valign="bottom"><a href="git.html" accesskey="P">Prev</a></td>
+        <td width="80%" align="center" valign="bottom"></td>
+        <td width="10%" align="right" valign="bottom"><a href="coding.html" accesskey="N">Next</a></td>
+      </tr>
+    </table>
+    <hr align="left" width="100%">
+  </div>
+  <div class="SECT1">
+    <h1 class="SECT1"><a name="DOCUMENTATION" id="DOCUMENTATION">3. Documentation Guidelines</a></h1>
+    <p>All formal documents are maintained in Docbook SGML and located in the <samp class=
+    "COMPUTEROUTPUT">doc/source/*</samp> directory. You will need <a href="http://www.docbook.org" target=
+    "_top">Docbook</a>, the Docbook DTD's and the Docbook modular stylesheets (or comparable alternatives), and either
+    <span class="APPLICATION">jade</span> or <span class="APPLICATION">openjade</span> (recommended) installed in order
+    to build docs from source. Currently there is <a href="../user-manual/index.html" target="_top"><i class=
+    "CITETITLE">user-manual</i></a>, <a href="../faq/index.html" target="_top"><i class="CITETITLE">FAQ</i></a>, and,
+    of course this, the <i class="CITETITLE">developer-manual</i> in this format. The <i class="CITETITLE">README</i>,
+    <i class="CITETITLE">AUTHORS</i>, <i class="CITETITLE">INSTALL</i>, <i class="CITETITLE">privoxy.1</i> (man page),
+    and <i class="CITETITLE">config</i> files are also now maintained as Docbook SGML. These files, when built, in the
+    top-level source directory are generated files! Also, the <span class="APPLICATION">Privoxy</span> <tt class=
+    "FILENAME">index.html</tt> (and a variation on this file, <tt class="FILENAME">privoxy-index.html</tt>, meant for
+    inclusion with doc packages), are maintained as SGML as well. <span class="emphasis"><i class="EMPHASIS">DO NOT
+    edit these directly</i></span>. Edit the SGML source, or contact someone involved in the documentation.</p>
+    <p><tt class="FILENAME">config</tt> requires some special handling. The reason it is maintained this way is so that
+    the extensive comments in the file mirror those in <i class="CITETITLE">user-manual</i>. But the conversion process
+    requires going from SGML to HTML to text to special formatting required for the embedded comments. Some of this
+    does not survive so well. Especially some of the examples that are longer than 80 characters. The build process for
+    this file outputs to <tt class="FILENAME">config.new</tt>, which should be reviewed for errors and mis-formatting.
+    Once satisfied that it is correct, then it should be hand copied to <tt class="FILENAME">config</tt>.</p>
+    <p>Other, less formal documents (e.g. <tt class="FILENAME">LICENSE</tt>) are maintained as plain text files in the
+    top-level source directory.</p>
+    <p>Packagers are encouraged to include this documentation. For those without the ability to build the docs locally,
+    text versions of each are kept in Git. HTML versions are also being kept in Git under <tt class=
+    "FILENAME">doc/webserver/*</tt>.</p>
+    <p>Formal documents are built with the Makefile targets of <samp class="COMPUTEROUTPUT">make dok</samp>. The build
+    process uses the document SGML sources in <samp class="COMPUTEROUTPUT">doc/source/*/*</samp> to update all text
+    files in <samp class="COMPUTEROUTPUT">doc/text/</samp> and to update all HTML documents in <samp class=
+    "COMPUTEROUTPUT">doc/webserver/</samp>.</p>
+    <p>Documentation writers should please make sure documents build successfully before committing to Git, if
+    possible.</p>
+    <p>How do you update the webserver (i.e. the pages on privoxy.org)?</p>
+    <ol type="1">
+      <li>
+        <p>First, build the docs by running <samp class="COMPUTEROUTPUT">make dok</samp>.</p>
+      </li>
+      <li>
+        <p>Run <samp class="COMPUTEROUTPUT">make webserver</samp> which copies all files from <samp class=
+        "COMPUTEROUTPUT">doc/webserver</samp> to the sourceforge webserver via scp.</p>
+      </li>
+    </ol>
+    <p>Finished docs should be occasionally submitted to Git (<tt class="FILENAME">doc/webserver/*/*.html</tt>) 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 <span class="emphasis"><i class="EMPHASIS">after</i></span> the <tt class=
+    "LITERAL">$VERSION</tt> and other release specific data in <tt class="FILENAME">configure.in</tt> has been updated
+    (this is done just prior to a new release).</p>
+    <div class="SECT2">
+      <h2 class="SECT2"><a name="SGML" id="SGML">3.1. Quickstart to Docbook and SGML</a></h2>
+      <p>If you are not familiar with SGML, it is a markup language similar to HTML. Actually, not a mark up language
+      per se, but a language used to define markup languages. In fact, HTML is an SGML application. Both will use
+      <span class="QUOTE">"tags"</span> to format text and other content. SGML tags can be much more varied, and
+      flexible, but do much of the same kinds of things. The tags, or <span class="QUOTE">"elements"</span>, are
+      definable in SGML. There is no set <span class="QUOTE">"standards"</span>. Since we are using <span class=
+      "APPLICATION">Docbook</span>, our tags are those that are defined by <span class="APPLICATION">Docbook</span>.
+      Much of how the finish document is rendered is determined by the <span class="QUOTE">"stylesheets"</span>. The
+      stylesheets determine how each tag gets translated to HTML, or other formats.</p>
+      <p>Tags in Docbook SGML need to be always <span class="QUOTE">"closed"</span>. If not, you will likely generate
+      errors. Example: <tt class="LITERAL">&lt;title&gt;My Title&lt;/title&gt;</tt>. They are also case-insensitive,
+      but we strongly suggest using all lower case. This keeps compatibility with [Docbook] <span class=
+      "APPLICATION">XML</span>.</p>
+      <p>Our documents use <span class="QUOTE">"sections"</span> for the most part. Sections will be processed into
+      HTML headers (e.g. <tt class="LITERAL">h1</tt> for <tt class="LITERAL">sect1</tt>). The <span class=
+      "APPLICATION">Docbook</span> stylesheets will use these to also generate the Table of Contents for each doc. Our
+      TOC's are set to a depth of three. Meaning <tt class="LITERAL">sect1</tt>, <tt class="LITERAL">sect2</tt>, and
+      <tt class="LITERAL">sect3</tt> will have TOC entries, but <tt class="LITERAL">sect4</tt> will not. Each section
+      requires a <tt class="LITERAL">&lt;title&gt;</tt> element, and at least one <tt class=
+      "LITERAL">&lt;para&gt;</tt>. There is a limit of five section levels in Docbook, but generally three should be
+      sufficient for our purposes.</p>
+      <p>Some common elements that you likely will use:</p>
+      <table border="0">
+        <tbody>
+          <tr>
+            <td><span class="emphasis"><i class="EMPHASIS">&lt;para&gt;&lt;/para&gt;</i></span>, paragraph delimiter.
+            Most text needs to be within paragraph elements (there are some exceptions).</td>
+          </tr>
+          <tr>
+            <td><span class="emphasis"><i class="EMPHASIS">&lt;emphasis&gt;&lt;/emphasis&gt;</i></span>, the
+            stylesheets make this italics.</td>
+          </tr>
+          <tr>
+            <td><span class="emphasis"><i class="EMPHASIS">&lt;filename&gt;&lt;/filename&gt;</i></span>, files and
+            directories.</td>
+          </tr>
+          <tr>
+            <td><span class="emphasis"><i class="EMPHASIS">&lt;command&gt;&lt;/command&gt;</i></span>, command
+            examples.</td>
+          </tr>
+          <tr>
+            <td><span class="emphasis"><i class="EMPHASIS">&lt;literallayout&gt;&lt;/literallayout&gt;</i></span>, like
+            <tt class="LITERAL">&lt;pre&gt;</tt>, more or less.</td>
+          </tr>
+          <tr>
+            <td><span class="emphasis"><i class="EMPHASIS">&lt;itemizedlist&gt;&lt;/itemizedlist&gt;</i></span>, list
+            with bullets.</td>
+          </tr>
+          <tr>
+            <td><span class="emphasis"><i class="EMPHASIS">&lt;listitem&gt;&lt;/listitem&gt;</i></span>, member of the
+            above.</td>
+          </tr>
+          <tr>
+            <td><span class="emphasis"><i class="EMPHASIS">&lt;screen&gt;&lt;/screen&gt;</i></span>, screen output,
+            implies <tt class="LITERAL">&lt;literallayout&gt;</tt>.</td>
+          </tr>
+          <tr>
+            <td><span class="emphasis"><i class="EMPHASIS">&lt;ulink url="example.com"&gt;&lt;/ulink&gt;</i></span>,
+            like HTML <tt class="LITERAL">&lt;a&gt;</tt> tag.</td>
+          </tr>
+          <tr>
+            <td><span class="emphasis"><i class="EMPHASIS">&lt;quote&gt;&lt;/quote&gt;</i></span>, for, doh, quoting
+            text.</td>
+          </tr>
+        </tbody>
+      </table>
+      <p>Look at any of the existing docs for examples of all these and more.</p>
+      <p>You might also find <span class="QUOTE">" <a href=
+      "https://web.archive.org/web/20160315230758/http://opensource.bureau-cornavin.com/crash-course/index.html"
+      target="_top">Writing Documentation Using DocBook - A Crash Course</a>"</span> useful.</p>
+    </div>
+    <div class="SECT2">
+      <h2 class="SECT2"><a name="DOCSTYLE" id="DOCSTYLE">3.2. <span class="APPLICATION">Privoxy</span> Documentation
+      Style</a></h2>
+      <p>It will be easier if everyone follows a similar writing style. This just makes it easier to read what someone
+      else has written if it is all done in a similar fashion.</p>
+      <p>Here it is:</p>
+      <ul>
+        <li>
+          <p>All tags should be lower case.</p>
+        </li>
+        <li>
+          <p>Tags delimiting a <span class="emphasis"><i class="EMPHASIS">block</i></span> of text (even small blocks)
+          should be on their own line. Like:</p>
+          <p class="LITERALLAYOUT">&nbsp;&lt;para&gt;<br>
+          &nbsp;&nbsp;Some&nbsp;text&nbsp;goes&nbsp;here.<br>
+          &nbsp;&lt;/para&gt;</p>
+          <p>Tags marking individual words, or few words, should be in-line:</p>
+          <p class="LITERALLAYOUT">
+          &nbsp;&nbsp;Just&nbsp;to&nbsp;&lt;emphasis&gt;emphasize&lt;/emphasis&gt;,&nbsp;some&nbsp;text&nbsp;goes&nbsp;here.</p>
+        </li>
+        <li>
+          <p>Tags should be nested and step indented for block text like: (except in-line tags)</p>
+          <p class="LITERALLAYOUT">&nbsp;&lt;para&gt;<br>
+          &nbsp;&nbsp;&lt;itemizedlist&gt;<br>
+          &nbsp;&nbsp;&nbsp;&lt;para&gt;<br>
+          &nbsp;&nbsp;&nbsp;&nbsp;&lt;listitem&gt;<br>
+          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Some&nbsp;text&nbsp;goes&nbsp;here&nbsp;in&nbsp;our&nbsp;list&nbsp;example.<br>
+
+          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;/listitem&gt;<br>
+          &nbsp;&nbsp;&nbsp;&lt;/para&gt;<br>
+          &nbsp;&nbsp;&lt;/itemizedlist&gt;<br>
+          &nbsp;&lt;/para&gt;</p>
+          <p>This makes it easier to find the text amongst the tags ;-)</p>
+        </li>
+        <li>
+          <p>Use white space to separate logical divisions within a document, like between sections. Running everything
+          together consistently makes it harder to read and work on.</p>
+        </li>
+        <li>
+          <p>Do not hesitate to make comments. Comments can either use the &lt;comment&gt; element, or the &lt;!--
+          --&gt; style comment familiar from HTML. (Note in Docbook v4.x &lt;comment&gt; is replaced by
+          &lt;remark&gt;.)</p>
+        </li>
+        <li>
+          <p>We have an international audience. Refrain from slang, or English idiosyncrasies (too many to list :).
+          Humor also does not translate well sometimes.</p>
+        </li>
+        <li>
+          <p>Try to keep overall line lengths in source files to 80 characters or less for obvious reasons. This is not
+          always possible, with lengthy URLs for instance.</p>
+        </li>
+        <li>
+          <p>Our documents are available in differing formats. Right now, they are just plain text and/or HTML, but
+          others are always a future possibility. Be careful with URLs (&lt;ulink&gt;), and avoid this mistake:</p>
+          <p>My favorite site is &lt;ulink url="http://example.com"&gt;here&lt;/ulink&gt;.</p>
+          <p>This will render as <span class="QUOTE">"My favorite site is here"</span>, which is not real helpful in a
+          text doc. Better like this:</p>
+          <p>My favorite site is &lt;ulink url="http://example.com"&gt;example.com&lt;/ulink&gt;.</p>
+        </li>
+        <li>
+          <p>All documents should be spell checked occasionally. <span class="APPLICATION">aspell</span> can check SGML
+          with the <tt class="LITERAL">-H</tt> option. (<span class="APPLICATION">ispell</span> I think too.)</p>
+        </li>
+      </ul>
+    </div>
+    <div class="SECT2">
+      <h2 class="SECT2"><a name="AEN203" id="AEN203">3.3. Privoxy Custom Entities</a></h2>
+      <p><span class="APPLICATION">Privoxy</span> documentation is using a number of customized <span class=
+      "QUOTE">"entities"</span> to facilitate documentation maintenance.</p>
+      <p>We are using a set of <span class="QUOTE">"boilerplate"</span> files 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 <span class=
+      "emphasis"><i class="EMPHASIS">generic</i></span>. That is the purpose; so it can be used in varying contexts
+      without additional modifications.</p>
+      <p>We are also using what <span class="APPLICATION">Docbook</span> calls <span class="QUOTE">"internal
+      entities"</span>. These are like variables in programming. Well, sort of. For instance, we have the <tt class=
+      "LITERAL">p-version</tt> entity that contains the current <span class="APPLICATION">Privoxy</span> version
+      string. You are strongly encouraged to use these where possible. Some of these obviously require re-setting with
+      each release (done by the Makefile). A sampling of custom entities are listed below. See any of the main docs for
+      examples.</p>
+      <ul>
+        <li>
+          <p>Re- <span class="QUOTE">"boilerplate"</span> text entities are defined like:</p>
+          <p><tt class="LITERAL">&lt;!entity supported SYSTEM "supported.sgml"&gt;</tt></p>
+          <p>In this example, the contents of the file, <tt class="FILENAME">supported.sgml</tt> is available for
+          inclusion anywhere in the doc. To make this happen, just reference the now defined entity: <tt class=
+          "LITERAL">&#38;supported;</tt> (starts with an ampersand and ends with a semi-colon), and the contents will
+          be dumped into the finished doc at that point.</p>
+        </li>
+        <li>
+          <p>Commonly used <span class="QUOTE">"internal entities"</span>:</p>
+          <table border="0">
+            <tbody>
+              <tr>
+                <td><span class="emphasis"><i class="EMPHASIS">p-version</i></span>: the <span class=
+                "APPLICATION">Privoxy</span> version string, e.g. <span class="QUOTE">"3.0.27"</span>.</td>
+              </tr>
+              <tr>
+                <td><span class="emphasis"><i class="EMPHASIS">p-status</i></span>: the project status, either
+                <span class="QUOTE">"alpha"</span>, <span class="QUOTE">"beta"</span>, or <span class=
+                "QUOTE">"stable"</span>.</td>
+              </tr>
+              <tr>
+                <td><span class="emphasis"><i class="EMPHASIS">p-not-stable</i></span>: use to conditionally include
+                text in <span class="QUOTE">"not stable"</span> releases (e.g. <span class="QUOTE">"beta"</span>).</td>
+              </tr>
+              <tr>
+                <td><span class="emphasis"><i class="EMPHASIS">p-stable</i></span>: just the opposite.</td>
+              </tr>
+              <tr>
+                <td><span class="emphasis"><i class="EMPHASIS">p-text</i></span>: this doc is only generated as
+                text.</td>
+              </tr>
+            </tbody>
+          </table>
+        </li>
+      </ul>
+      <p>There are others in various places that are defined for a specific purpose. Read the source!</p>
+    </div>
+  </div>
+  <div class="NAVFOOTER">
+    <hr align="left" width="100%">
+    <table summary="Footer navigation table" width="100%" border="0" cellpadding="0" cellspacing="0">
+      <tr>
+        <td width="33%" align="left" valign="top"><a href="git.html" accesskey="P">Prev</a></td>
+        <td width="34%" align="center" valign="top"><a href="index.html" accesskey="H">Home</a></td>
+        <td width="33%" align="right" valign="top"><a href="coding.html" accesskey="N">Next</a></td>
+      </tr>
+      <tr>
+        <td width="33%" align="left" valign="top">The Git Repository</td>
+        <td width="34%" align="center" valign="top">&nbsp;</td>
+        <td width="33%" align="right" valign="top">Coding Guidelines</td>
+      </tr>
+    </table>
+  </div>
+</body>
+</html>
index 0e64e1f..9efdbdc 100644 (file)
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->The Git Repository</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="Privoxy Developer Manual"
-HREF="index.html"><LINK
-REL="PREVIOUS"
-TITLE="Introduction"
-HREF="introduction.html"><LINK
-REL="NEXT"
-TITLE="Documentation Guidelines"
-HREF="documentation.html"><LINK
-REL="STYLESHEET"
-TYPE="text/css"
-HREF="../p_doc.css"><META
-HTTP-EQUIV="Content-Type"
-CONTENT="text/html;
-charset=ISO-8859-1"></HEAD
-><BODY
-CLASS="SECT1"
-BGCOLOR="#EEEEEE"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->Privoxy Developer Manual</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="introduction.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="documentation.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="GIT"
->2. The Git Repository</A
-></H1
-><P
->      If you become part of the active development team, you will eventually
-      need write access to our holy grail, the Git repository. One of the
-      team members will need to set this up for you. Please read
-      this chapter completely before accessing via Git.
-    </P
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="GITACCESS"
->2.1. Access to Git</A
-></H2
-><P
->        The project's Git repository is hosted at the
-        <A
-HREF="https://privoxy.org/"
-TARGET="_top"
->Privoxy site.</A
->
-        The Git repository URL is
-        <TT
-CLASS="LITERAL"
->ssh://git@git.privoxy.org:23/git/privoxy.git</TT
->,
-        the central repository is called <TT
-CLASS="LITERAL"
->privoxy</TT
->, and the
-        source branch is called <TT
-CLASS="LITERAL"
->master</TT
->. Subfolders exist
-        within the project for target-dependent build and  packaging tools, each
-        including the name of the target operating system in their name (e.g.
-        Windows, OSXPackageBuilder, debian). There is a webview of the Git
-        hierarchy at
-        <A
-HREF="https://www.privoxy.org/gitweb/?p=privoxy.git;a=tree"
-TARGET="_top"
->                    https://www.privoxy.org/gitweb/?p=privoxy.git;a=tree</A
->,
-        which might help with visualizing how these pieces fit together.
-      </P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="GITBRANCHES"
->2.2. Branches</A
-></H2
-><P
->       Whilst the central repository contains only the master branch, developers
-       are of course free to create branches in their local repositories as they
-       develop features, fixes, or update the target-dependent tools. Only once
-       such changes are fully tested ought they be pushed back to the central
-       repository master branch.
-     </P
-><P
->      At one time there were two distinct branches: stable and unstable. The
-      more drastic changes were to be in the unstable branch. These branches
-      have now been merged to minimize time and effort of maintaining two
-      branches.
-     </P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="GITCOMMIT"
->2.3. Git Commit Guidelines</A
-></H2
-><P
->        The source tree is the heart of every software project. Every effort must
-        be made to ensure that it is readable, compilable and consistent at all
-        times.  We expect anyone with Git access to strictly
-        adhere to the following guidelines:
-      </P
-><P
->       Basic Guidelines, for all branches:
-      </P
-><P
-></P
-><UL
-><LI
-><P
->            Please don't commit even
-            a small change without testing it thoroughly first. When we're
-            close to a public release, ask a fellow developer to review your
-            changes.
-          </P
-></LI
-><LI
-><P
->            Your commit message should give a concise overview of <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->what you
-            changed</I
-></SPAN
-> (no big details) and <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->why you changed it</I
-></SPAN
->
-            Just check previous messages for good examples.
-          </P
-></LI
-><LI
-><P
->            Don't use the same message on multiple files, unless it equally applies to
-            all those files.
-          </P
-></LI
-><LI
-><P
->            If your changes span multiple files, and the code won't recompile unless
-            all changes are committed (e.g. when changing the signature of a function),
-            then commit all files one after another, without long delays in between.
-            If necessary, prepare the commit messages in advance.
-          </P
-></LI
-><LI
-><P
->            Before changing things on Git, make sure that your changes are in line
-            with the team's general consensus on what should be done.
-          </P
-></LI
-><LI
-><P
->            Note that near a major public release, we get more cautious.
-            There is always the possibility to submit a patch to the <A
-HREF="https://sourceforge.net/tracker/?atid=311118&#38;group_id=11118&#38;func=browse"
-TARGET="_top"
->patch
-            tracker</A
-> instead.
-          </P
-></LI
-></UL
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="introduction.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="documentation.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Introduction</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Documentation Guidelines</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>The Git Repository</title>
+  <meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
+  <link rel="HOME" title="Privoxy Developer Manual" href="index.html">
+  <link rel="PREVIOUS" title="Introduction" href="introduction.html">
+  <link rel="NEXT" title="Documentation Guidelines" href="documentation.html">
+  <link rel="STYLESHEET" type="text/css" href="../p_doc.css">
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+<body class="SECT1" bgcolor="#EEEEEE" text="#000000" link="#0000FF" vlink="#840084" alink="#0000FF">
+  <div class="NAVHEADER">
+    <table summary="Header navigation table" width="100%" border="0" cellpadding="0" cellspacing="0">
+      <tr>
+        <th colspan="3" align="center">Privoxy Developer Manual</th>
+      </tr>
+      <tr>
+        <td width="10%" align="left" valign="bottom"><a href="introduction.html" accesskey="P">Prev</a></td>
+        <td width="80%" align="center" valign="bottom"></td>
+        <td width="10%" align="right" valign="bottom"><a href="documentation.html" accesskey="N">Next</a></td>
+      </tr>
+    </table>
+    <hr align="left" width="100%">
+  </div>
+  <div class="SECT1">
+    <h1 class="SECT1"><a name="GIT" id="GIT">2. The Git Repository</a></h1>
+    <p>If you become part of the active development team, you will eventually need write access to our holy grail, the
+    Git repository. One of the team members will need to set this up for you. Please read this chapter completely
+    before accessing via Git.</p>
+    <div class="SECT2">
+      <h2 class="SECT2"><a name="GITACCESS" id="GITACCESS">2.1. Access to Git</a></h2>
+      <p>The project's Git repository is hosted at the <a href="https://privoxy.org/" target="_top">Privoxy site.</a>
+      The Git repository URL is <tt class="LITERAL">ssh://git@git.privoxy.org:23/git/privoxy.git</tt>, the central
+      repository is called <tt class="LITERAL">privoxy</tt>, and the source branch is called <tt class=
+      "LITERAL">master</tt>. Subfolders exist within the project for target-dependent build and packaging tools, each
+      including the name of the target operating system in their name (e.g. Windows, OSXPackageBuilder, debian). There
+      is a webview of the Git hierarchy at <a href="https://www.privoxy.org/gitweb/?p=privoxy.git;a=tree" target=
+      "_top">https://www.privoxy.org/gitweb/?p=privoxy.git;a=tree</a>, which might help with visualizing how these
+      pieces fit together.</p>
+    </div>
+    <div class="SECT2">
+      <h2 class="SECT2"><a name="GITBRANCHES" id="GITBRANCHES">2.2. Branches</a></h2>
+      <p>Whilst the central repository contains only the master branch, developers are of course free to create
+      branches in their local repositories as they develop features, fixes, or update the target-dependent tools. Only
+      once such changes are fully tested ought they be pushed back to the central repository master branch.</p>
+      <p>At one time there were two distinct branches: stable and unstable. The more drastic changes were to be in the
+      unstable branch. These branches have now been merged to minimize time and effort of maintaining two branches.</p>
+    </div>
+    <div class="SECT2">
+      <h2 class="SECT2"><a name="GITCOMMIT" id="GITCOMMIT">2.3. Git Commit Guidelines</a></h2>
+      <p>The source tree is the heart of every software project. Every effort must be made to ensure that it is
+      readable, compilable and consistent at all times. We expect anyone with Git access to strictly adhere to the
+      following guidelines:</p>
+      <p>Basic Guidelines, for all branches:</p>
+      <ul>
+        <li>
+          <p>Please don't commit even a small change without testing it thoroughly first. When we're close to a public
+          release, ask a fellow developer to review your changes.</p>
+        </li>
+        <li>
+          <p>Your commit message should give a concise overview of <span class="emphasis"><i class="EMPHASIS">what you
+          changed</i></span> (no big details) and <span class="emphasis"><i class="EMPHASIS">why you changed
+          it</i></span> Just check previous messages for good examples.</p>
+        </li>
+        <li>
+          <p>Don't use the same message on multiple files, unless it equally applies to all those files.</p>
+        </li>
+        <li>
+          <p>If your changes span multiple files, and the code won't recompile unless all changes are committed (e.g.
+          when changing the signature of a function), then commit all files one after another, without long delays in
+          between. If necessary, prepare the commit messages in advance.</p>
+        </li>
+        <li>
+          <p>Before changing things on Git, make sure that your changes are in line with the team's general consensus
+          on what should be done.</p>
+        </li>
+        <li>
+          <p>Note that near a major public release, we get more cautious. There is always the possibility to submit a
+          patch to the <a href="https://sourceforge.net/tracker/?atid=311118&#38;group_id=11118&#38;func=browse"
+          target="_top">patch tracker</a> instead.</p>
+        </li>
+      </ul>
+    </div>
+  </div>
+  <div class="NAVFOOTER">
+    <hr align="left" width="100%">
+    <table summary="Footer navigation table" width="100%" border="0" cellpadding="0" cellspacing="0">
+      <tr>
+        <td width="33%" align="left" valign="top"><a href="introduction.html" accesskey="P">Prev</a></td>
+        <td width="34%" align="center" valign="top"><a href="index.html" accesskey="H">Home</a></td>
+        <td width="33%" align="right" valign="top"><a href="documentation.html" accesskey="N">Next</a></td>
+      </tr>
+      <tr>
+        <td width="33%" align="left" valign="top">Introduction</td>
+        <td width="34%" align="center" valign="top">&nbsp;</td>
+        <td width="33%" align="right" valign="top">Documentation Guidelines</td>
+      </tr>
+    </table>
+  </div>
+</body>
+</html>
index 81fd85a..4d584ac 100644 (file)
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->Privoxy Developer Manual</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="NEXT"
-TITLE="Introduction"
-HREF="introduction.html"><LINK
-REL="STYLESHEET"
-TYPE="text/css"
-HREF="../p_doc.css"><META
-HTTP-EQUIV="Content-Type"
-CONTENT="text/html;
-charset=ISO-8859-1"></HEAD
-><BODY
-CLASS="ARTICLE"
-BGCOLOR="#EEEEEE"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
-><DIV
-CLASS="ARTICLE"
-><DIV
-CLASS="TITLEPAGE"
-><H1
-CLASS="TITLE"
-><A
-NAME="AEN2"
->Privoxy Developer Manual</A
-></H1
-><P
-CLASS="PUBDATE"
->     <SUB
->    
-    
-      <A
-HREF="https://www.privoxy.org/user-manual/copyright.html"
-TARGET="_top"
->Copyright</A
->
-      © 2001-2018 by
-      <A
-HREF="https://www.privoxy.org/"
-TARGET="_top"
->Privoxy Developers</A
->
-     </SUB
->
-    <BR></P
-><DIV
-><DIV
-CLASS="ABSTRACT"
-><P
-></P
-><A
-NAME="AEN8"
-></A
-><P
-> The developer manual provides guidance on coding, testing, packaging, documentation
- and other issues of importance to those involved with
- <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> 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.</P
-><P
-> Please note that this document is constantly evolving. This copy represents
- the state at the release of version 3.0.27.
- You can find the latest version of the this manual at <A
-HREF="https://www.privoxy.org/developer-manual/"
-TARGET="_top"
->https://www.privoxy.org/developer-manual/</A
->.
- Please have a look at the
- <A
-HREF="https://www.privoxy.org/user-manual/contact.html"
-TARGET="_top"
->contact section in the user manual</A
->
- if you are interested in contacting the developers.</P
-><P
-></P
-></DIV
-></DIV
-><HR></DIV
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
->1. <A
-HREF="introduction.html"
->Introduction</A
-></DT
-><DD
-><DL
-><DT
->1.1. <A
-HREF="introduction.html#QUICKSTART"
->Quickstart to Privoxy Development</A
-></DT
-></DL
-></DD
-><DT
->2. <A
-HREF="git.html"
->The Git Repository</A
-></DT
-><DD
-><DL
-><DT
->2.1. <A
-HREF="git.html#GITACCESS"
->Access to Git</A
-></DT
-><DT
->2.2. <A
-HREF="git.html#GITBRANCHES"
->Branches</A
-></DT
-><DT
->2.3. <A
-HREF="git.html#GITCOMMIT"
->Git Commit Guidelines</A
-></DT
-></DL
-></DD
-><DT
->3. <A
-HREF="documentation.html"
->Documentation Guidelines</A
-></DT
-><DD
-><DL
-><DT
->3.1. <A
-HREF="documentation.html#SGML"
->Quickstart to Docbook and SGML</A
-></DT
-><DT
->3.2. <A
-HREF="documentation.html#DOCSTYLE"
-><SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> Documentation Style</A
-></DT
-><DT
->3.3. <A
-HREF="documentation.html#AEN203"
->Privoxy Custom Entities</A
-></DT
-></DL
-></DD
-><DT
->4. <A
-HREF="coding.html"
->Coding Guidelines</A
-></DT
-><DD
-><DL
-><DT
->4.1. <A
-HREF="coding.html#S1"
->Introduction</A
-></DT
-><DT
->4.2. <A
-HREF="coding.html#S2"
->Using Comments</A
-></DT
-><DD
-><DL
-><DT
->4.2.1. <A
-HREF="coding.html#S3"
->Comment, Comment, Comment</A
-></DT
-><DT
->4.2.2. <A
-HREF="coding.html#S4"
->Use blocks for comments</A
-></DT
-><DT
->4.2.3. <A
-HREF="coding.html#S5"
->Keep Comments on their own line</A
-></DT
-><DT
->4.2.4. <A
-HREF="coding.html#S6"
->Comment each logical step</A
-></DT
-><DT
->4.2.5. <A
-HREF="coding.html#S7"
->Comment All Functions Thoroughly</A
-></DT
-><DT
->4.2.6. <A
-HREF="coding.html#S8"
->Comment at the end of braces if the
-    content is more than one screen length</A
-></DT
-></DL
-></DD
-><DT
->4.3. <A
-HREF="coding.html#S9"
->Naming Conventions</A
-></DT
-><DD
-><DL
-><DT
->4.3.1. <A
-HREF="coding.html#S10"
->Variable Names</A
-></DT
-><DT
->4.3.2. <A
-HREF="coding.html#S11"
->Function Names</A
-></DT
-><DT
->4.3.3. <A
-HREF="coding.html#S12"
->Header file prototypes</A
-></DT
-><DT
->4.3.4. <A
-HREF="coding.html#S13"
->Enumerations, and #defines</A
-></DT
-><DT
->4.3.5. <A
-HREF="coding.html#S14"
->Constants</A
-></DT
-></DL
-></DD
-><DT
->4.4. <A
-HREF="coding.html#S15"
->Using Space</A
-></DT
-><DD
-><DL
-><DT
->4.4.1. <A
-HREF="coding.html#S16"
->Put braces on a line by themselves.</A
-></DT
-><DT
->4.4.2. <A
-HREF="coding.html#S17"
->ALL control statements should have a
-    block</A
-></DT
-><DT
->4.4.3. <A
-HREF="coding.html#S18"
->Do not belabor/blow-up boolean
-    expressions</A
-></DT
-><DT
->4.4.4. <A
-HREF="coding.html#S19"
->Use white space freely because it is
-    free</A
-></DT
-><DT
->4.4.5. <A
-HREF="coding.html#S20"
->Don't use white space around structure
-    operators</A
-></DT
-><DT
->4.4.6. <A
-HREF="coding.html#S21"
->Make the last brace of a function stand
-    out</A
-></DT
-><DT
->4.4.7. <A
-HREF="coding.html#S22"
->Use 3 character indentions</A
-></DT
-></DL
-></DD
-><DT
->4.5. <A
-HREF="coding.html#S23"
->Initializing</A
-></DT
-><DD
-><DL
-><DT
->4.5.1. <A
-HREF="coding.html#S24"
->Initialize all variables</A
-></DT
-></DL
-></DD
-><DT
->4.6. <A
-HREF="coding.html#S25"
->Functions</A
-></DT
-><DD
-><DL
-><DT
->4.6.1. <A
-HREF="coding.html#S26"
->Name functions that return a boolean as a
-    question.</A
-></DT
-><DT
->4.6.2. <A
-HREF="coding.html#S27"
->Always specify a return type for a
-    function.</A
-></DT
-><DT
->4.6.3. <A
-HREF="coding.html#S28"
->Minimize function calls when iterating by
-    using variables</A
-></DT
-><DT
->4.6.4. <A
-HREF="coding.html#S29"
->Pass and Return by Const Reference</A
-></DT
-><DT
->4.6.5. <A
-HREF="coding.html#S30"
->Pass and Return by Value</A
-></DT
-><DT
->4.6.6. <A
-HREF="coding.html#S31"
->Names of include files</A
-></DT
-><DT
->4.6.7. <A
-HREF="coding.html#S32"
->Provide multiple inclusion
-    protection</A
-></DT
-><DT
->4.6.8. <A
-HREF="coding.html#S33"
->Use `extern "C"` when appropriate</A
-></DT
-><DT
->4.6.9. <A
-HREF="coding.html#S34"
->Where Possible, Use Forward Struct
-    Declaration Instead of Includes</A
-></DT
-></DL
-></DD
-><DT
->4.7. <A
-HREF="coding.html#S35"
->General Coding Practices</A
-></DT
-><DD
-><DL
-><DT
->4.7.1. <A
-HREF="coding.html#S36"
->Turn on warnings</A
-></DT
-><DT
->4.7.2. <A
-HREF="coding.html#S37"
->Provide a default case for all switch
-    statements</A
-></DT
-><DT
->4.7.3. <A
-HREF="coding.html#S38"
->Try to avoid falling through cases in a
-    switch statement.</A
-></DT
-><DT
->4.7.4. <A
-HREF="coding.html#S40"
->Don't mix size_t and other types</A
-></DT
-><DT
->4.7.5. <A
-HREF="coding.html#S41"
->Declare each variable and struct on its
-    own line.</A
-></DT
-><DT
->4.7.6. <A
-HREF="coding.html#S42"
->Use malloc/zalloc sparingly</A
-></DT
-><DT
->4.7.7. <A
-HREF="coding.html#S43"
->The Programmer Who Uses 'malloc' is
-    Responsible for Ensuring 'free'</A
-></DT
-><DT
->4.7.8. <A
-HREF="coding.html#S44"
->Add loaders to the `file_list' structure
-    and in order</A
-></DT
-><DT
->4.7.9. <A
-HREF="coding.html#S45"
->"Uncertain" new code and/or changes to
-    existing code, use XXX</A
-></DT
-></DL
-></DD
-><DT
->4.8. <A
-HREF="coding.html#S46"
->Addendum: Template for files and function
-    comment blocks:</A
-></DT
-></DL
-></DD
-><DT
->5. <A
-HREF="testing.html"
->Testing Guidelines</A
-></DT
-><DD
-><DL
-><DT
->5.1. <A
-HREF="testing.html#TESTING-PLAN"
->Testplan for releases</A
-></DT
-><DT
->5.2. <A
-HREF="testing.html#FUZZING"
->Fuzzing Privoxy</A
-></DT
-></DL
-></DD
-><DT
->6. <A
-HREF="newrelease.html"
->Releasing a New Version</A
-></DT
-><DD
-><DL
-><DT
->6.1. <A
-HREF="newrelease.html#VERSIONNUMBERS"
->Version numbers</A
-></DT
-><DT
->6.2. <A
-HREF="newrelease.html#BEFORERELEASE"
->Before the Release: Freeze</A
-></DT
-><DT
->6.3. <A
-HREF="newrelease.html#THERELEASE"
->Building and Releasing the Packages</A
-></DT
-><DD
-><DL
-><DT
->6.3.1. <A
-HREF="newrelease.html#PACK-GUIDELINES"
->Note on Privoxy Packaging</A
-></DT
-><DT
->6.3.2. <A
-HREF="newrelease.html#NEWRELEASE-TARBALL"
->Source Tarball</A
-></DT
-><DT
->6.3.3. <A
-HREF="newrelease.html#NEWRELEASE-RPM"
->SuSE, Conectiva or Red Hat RPM</A
-></DT
-><DT
->6.3.4. <A
-HREF="newrelease.html#NEWRELEASE-OS2"
->OS/2</A
-></DT
-><DT
->6.3.5. <A
-HREF="newrelease.html#NEWRELEASE-SOLARIS"
->Solaris</A
-></DT
-><DT
->6.3.6. <A
-HREF="newrelease.html#NEWRELEASE-WINDOWS"
->Windows</A
-></DT
-><DT
->6.3.7. <A
-HREF="newrelease.html#NEWRELEASE-DEBIAN"
->Debian</A
-></DT
-><DT
->6.3.8. <A
-HREF="newrelease.html#NEWRELEASE-MACOSX"
->Mac OS X</A
-></DT
-><DT
->6.3.9. <A
-HREF="newrelease.html#NEWRELEASE-FREEBSD"
->FreeBSD</A
-></DT
-></DL
-></DD
-><DT
->6.4. <A
-HREF="newrelease.html#RELEASING"
->Uploading and Releasing Your Package</A
-></DT
-><DT
->6.5. <A
-HREF="newrelease.html#AFTERRELEASE"
->After the Release</A
-></DT
-></DL
-></DD
-><DT
->7. <A
-HREF="webserver-update.html"
->Update the Webserver</A
-></DT
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="introduction.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Introduction</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>Privoxy Developer Manual</title>
+  <meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
+  <link rel="NEXT" title="Introduction" href="introduction.html">
+  <link rel="STYLESHEET" type="text/css" href="../p_doc.css">
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+<body class="ARTICLE" bgcolor="#EEEEEE" text="#000000" link="#0000FF" vlink="#840084" alink="#0000FF">
+  <div class="ARTICLE">
+    <div class="TITLEPAGE">
+      <h1 class="TITLE"><a name="AEN2" id="AEN2">Privoxy Developer Manual</a></h1>
+      <p class="PUBDATE"><sub><a href="https://www.privoxy.org/user-manual/copyright.html" target="_top">Copyright</a>
+      &copy; 2001-2018 by <a href="https://www.privoxy.org/" target="_top">Privoxy Developers</a></sub><br></p>
+      <div>
+        <div class="ABSTRACT">
+          <a name="AEN8" id="AEN8"></a>
+          <p>The developer manual provides guidance on coding, testing, packaging, documentation and other issues of
+          importance to those involved with <span class="APPLICATION">Privoxy</span> 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.</p>
+          <p>Please note that this document is constantly evolving. This copy represents the state at the release of
+          version 3.0.27. You can find the latest version of the this manual at <a href=
+          "https://www.privoxy.org/developer-manual/" target="_top">https://www.privoxy.org/developer-manual/</a>.
+          Please have a look at the <a href="https://www.privoxy.org/user-manual/contact.html" target="_top">contact
+          section in the user manual</a> if you are interested in contacting the developers.</p>
+        </div>
+      </div>
+      <hr>
+    </div>
+    <div class="TOC">
+      <dl>
+        <dt><b>Table of Contents</b></dt>
+        <dt>1. <a href="introduction.html">Introduction</a></dt>
+        <dd>
+          <dl>
+            <dt>1.1. <a href="introduction.html#QUICKSTART">Quickstart to Privoxy Development</a></dt>
+          </dl>
+        </dd>
+        <dt>2. <a href="git.html">The Git Repository</a></dt>
+        <dd>
+          <dl>
+            <dt>2.1. <a href="git.html#GITACCESS">Access to Git</a></dt>
+            <dt>2.2. <a href="git.html#GITBRANCHES">Branches</a></dt>
+            <dt>2.3. <a href="git.html#GITCOMMIT">Git Commit Guidelines</a></dt>
+          </dl>
+        </dd>
+        <dt>3. <a href="documentation.html">Documentation Guidelines</a></dt>
+        <dd>
+          <dl>
+            <dt>3.1. <a href="documentation.html#SGML">Quickstart to Docbook and SGML</a></dt>
+            <dt>3.2. <a href="documentation.html#DOCSTYLE"><span class="APPLICATION">Privoxy</span> Documentation
+            Style</a></dt>
+            <dt>3.3. <a href="documentation.html#AEN203">Privoxy Custom Entities</a></dt>
+          </dl>
+        </dd>
+        <dt>4. <a href="coding.html">Coding Guidelines</a></dt>
+        <dd>
+          <dl>
+            <dt>4.1. <a href="coding.html#S1">Introduction</a></dt>
+            <dt>4.2. <a href="coding.html#S2">Using Comments</a></dt>
+            <dd>
+              <dl>
+                <dt>4.2.1. <a href="coding.html#S3">Comment, Comment, Comment</a></dt>
+                <dt>4.2.2. <a href="coding.html#S4">Use blocks for comments</a></dt>
+                <dt>4.2.3. <a href="coding.html#S5">Keep Comments on their own line</a></dt>
+                <dt>4.2.4. <a href="coding.html#S6">Comment each logical step</a></dt>
+                <dt>4.2.5. <a href="coding.html#S7">Comment All Functions Thoroughly</a></dt>
+                <dt>4.2.6. <a href="coding.html#S8">Comment at the end of braces if the content is more than one screen
+                length</a></dt>
+              </dl>
+            </dd>
+            <dt>4.3. <a href="coding.html#S9">Naming Conventions</a></dt>
+            <dd>
+              <dl>
+                <dt>4.3.1. <a href="coding.html#S10">Variable Names</a></dt>
+                <dt>4.3.2. <a href="coding.html#S11">Function Names</a></dt>
+                <dt>4.3.3. <a href="coding.html#S12">Header file prototypes</a></dt>
+                <dt>4.3.4. <a href="coding.html#S13">Enumerations, and #defines</a></dt>
+                <dt>4.3.5. <a href="coding.html#S14">Constants</a></dt>
+              </dl>
+            </dd>
+            <dt>4.4. <a href="coding.html#S15">Using Space</a></dt>
+            <dd>
+              <dl>
+                <dt>4.4.1. <a href="coding.html#S16">Put braces on a line by themselves.</a></dt>
+                <dt>4.4.2. <a href="coding.html#S17">ALL control statements should have a block</a></dt>
+                <dt>4.4.3. <a href="coding.html#S18">Do not belabor/blow-up boolean expressions</a></dt>
+                <dt>4.4.4. <a href="coding.html#S19">Use white space freely because it is free</a></dt>
+                <dt>4.4.5. <a href="coding.html#S20">Don't use white space around structure operators</a></dt>
+                <dt>4.4.6. <a href="coding.html#S21">Make the last brace of a function stand out</a></dt>
+                <dt>4.4.7. <a href="coding.html#S22">Use 3 character indentions</a></dt>
+              </dl>
+            </dd>
+            <dt>4.5. <a href="coding.html#S23">Initializing</a></dt>
+            <dd>
+              <dl>
+                <dt>4.5.1. <a href="coding.html#S24">Initialize all variables</a></dt>
+              </dl>
+            </dd>
+            <dt>4.6. <a href="coding.html#S25">Functions</a></dt>
+            <dd>
+              <dl>
+                <dt>4.6.1. <a href="coding.html#S26">Name functions that return a boolean as a question.</a></dt>
+                <dt>4.6.2. <a href="coding.html#S27">Always specify a return type for a function.</a></dt>
+                <dt>4.6.3. <a href="coding.html#S28">Minimize function calls when iterating by using variables</a></dt>
+                <dt>4.6.4. <a href="coding.html#S29">Pass and Return by Const Reference</a></dt>
+                <dt>4.6.5. <a href="coding.html#S30">Pass and Return by Value</a></dt>
+                <dt>4.6.6. <a href="coding.html#S31">Names of include files</a></dt>
+                <dt>4.6.7. <a href="coding.html#S32">Provide multiple inclusion protection</a></dt>
+                <dt>4.6.8. <a href="coding.html#S33">Use `extern "C"` when appropriate</a></dt>
+                <dt>4.6.9. <a href="coding.html#S34">Where Possible, Use Forward Struct Declaration Instead of
+                Includes</a></dt>
+              </dl>
+            </dd>
+            <dt>4.7. <a href="coding.html#S35">General Coding Practices</a></dt>
+            <dd>
+              <dl>
+                <dt>4.7.1. <a href="coding.html#S36">Turn on warnings</a></dt>
+                <dt>4.7.2. <a href="coding.html#S37">Provide a default case for all switch statements</a></dt>
+                <dt>4.7.3. <a href="coding.html#S38">Try to avoid falling through cases in a switch statement.</a></dt>
+                <dt>4.7.4. <a href="coding.html#S40">Don't mix size_t and other types</a></dt>
+                <dt>4.7.5. <a href="coding.html#S41">Declare each variable and struct on its own line.</a></dt>
+                <dt>4.7.6. <a href="coding.html#S42">Use malloc/zalloc sparingly</a></dt>
+                <dt>4.7.7. <a href="coding.html#S43">The Programmer Who Uses 'malloc' is Responsible for Ensuring
+                'free'</a></dt>
+                <dt>4.7.8. <a href="coding.html#S44">Add loaders to the `file_list' structure and in order</a></dt>
+                <dt>4.7.9. <a href="coding.html#S45">"Uncertain" new code and/or changes to existing code, use
+                XXX</a></dt>
+              </dl>
+            </dd>
+            <dt>4.8. <a href="coding.html#S46">Addendum: Template for files and function comment blocks:</a></dt>
+          </dl>
+        </dd>
+        <dt>5. <a href="testing.html">Testing Guidelines</a></dt>
+        <dd>
+          <dl>
+            <dt>5.1. <a href="testing.html#TESTING-PLAN">Testplan for releases</a></dt>
+            <dt>5.2. <a href="testing.html#FUZZING">Fuzzing Privoxy</a></dt>
+          </dl>
+        </dd>
+        <dt>6. <a href="newrelease.html">Releasing a New Version</a></dt>
+        <dd>
+          <dl>
+            <dt>6.1. <a href="newrelease.html#VERSIONNUMBERS">Version numbers</a></dt>
+            <dt>6.2. <a href="newrelease.html#BEFORERELEASE">Before the Release: Freeze</a></dt>
+            <dt>6.3. <a href="newrelease.html#THERELEASE">Building and Releasing the Packages</a></dt>
+            <dd>
+              <dl>
+                <dt>6.3.1. <a href="newrelease.html#PACK-GUIDELINES">Note on Privoxy Packaging</a></dt>
+                <dt>6.3.2. <a href="newrelease.html#NEWRELEASE-TARBALL">Source Tarball</a></dt>
+                <dt>6.3.3. <a href="newrelease.html#NEWRELEASE-RPM">SuSE, Conectiva or Red Hat RPM</a></dt>
+                <dt>6.3.4. <a href="newrelease.html#NEWRELEASE-OS2">OS/2</a></dt>
+                <dt>6.3.5. <a href="newrelease.html#NEWRELEASE-SOLARIS">Solaris</a></dt>
+                <dt>6.3.6. <a href="newrelease.html#NEWRELEASE-WINDOWS">Windows</a></dt>
+                <dt>6.3.7. <a href="newrelease.html#NEWRELEASE-DEBIAN">Debian</a></dt>
+                <dt>6.3.8. <a href="newrelease.html#NEWRELEASE-MACOSX">Mac OS X</a></dt>
+                <dt>6.3.9. <a href="newrelease.html#NEWRELEASE-FREEBSD">FreeBSD</a></dt>
+              </dl>
+            </dd>
+            <dt>6.4. <a href="newrelease.html#RELEASING">Uploading and Releasing Your Package</a></dt>
+            <dt>6.5. <a href="newrelease.html#AFTERRELEASE">After the Release</a></dt>
+          </dl>
+        </dd>
+        <dt>7. <a href="webserver-update.html">Update the Webserver</a></dt>
+      </dl>
+    </div>
+  </div>
+  <div class="NAVFOOTER">
+    <hr align="left" width="100%">
+    <table summary="Footer navigation table" width="100%" border="0" cellpadding="0" cellspacing="0">
+      <tr>
+        <td width="33%" align="left" valign="top">&nbsp;</td>
+        <td width="34%" align="center" valign="top">&nbsp;</td>
+        <td width="33%" align="right" valign="top"><a href="introduction.html" accesskey="N">Next</a></td>
+      </tr>
+      <tr>
+        <td width="33%" align="left" valign="top">&nbsp;</td>
+        <td width="34%" align="center" valign="top">&nbsp;</td>
+        <td width="33%" align="right" valign="top">Introduction</td>
+      </tr>
+    </table>
+  </div>
+</body>
+</html>
index ee3e90e..3fe32d2 100644 (file)
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->Introduction</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="Privoxy Developer Manual"
-HREF="index.html"><LINK
-REL="PREVIOUS"
-TITLE="Privoxy Developer Manual"
-HREF="index.html"><LINK
-REL="NEXT"
-TITLE="The Git Repository"
-HREF="git.html"><LINK
-REL="STYLESHEET"
-TYPE="text/css"
-HREF="../p_doc.css"><META
-HTTP-EQUIV="Content-Type"
-CONTENT="text/html;
-charset=ISO-8859-1"></HEAD
-><BODY
-CLASS="SECT1"
-BGCOLOR="#EEEEEE"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->Privoxy Developer Manual</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="index.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="git.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="INTRODUCTION"
->1. Introduction</A
-></H1
-><P
->     <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
->, as an heir to
-     <SPAN
-CLASS="APPLICATION"
->Junkbuster</SPAN
->, is a Free Software project
-     and the code is licensed under the GNU General Public License version 2.
-     As such, <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> development is potentially open
-     to anyone who has the time, knowledge, and desire to contribute
-     in any capacity. Our goals are simply to continue the mission,
-     to improve <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
->, and
-     to make it available to as wide an audience as possible.
-    </P
-><P
->     One does not have to be a programmer to contribute. Packaging, testing,
-     documenting and porting, are all important jobs as well.
-    </P
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="QUICKSTART"
->1.1. Quickstart to Privoxy Development</A
-></H2
-><P
->    The first step is to join the <A
-HREF="https://lists.privoxy.org/mailman/listinfo/privoxy-devel"
-TARGET="_top"
->privoxy-devel mailing list</A
->.
-    You can submit your ideas or, even better, patches. Patches are best
-    submitted to the Sourceforge tracker set up for this purpose, but
-    can be sent to the list for review too.
-   </P
-><P
->     You will also need to have a git package installed, which will
-     entail having ssh installed as well, in order to access the git repository.
-     Having the GNU build tools is also going to be important (particularly,
-     autoconf and gmake).
-    </P
-><P
->      For the time being (read, this section is under construction), you can
-      also refer to the extensive comments in the source code. In fact,
-      reading the code is recommended in any case.
-    </P
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="git.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Privoxy Developer Manual</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->The Git Repository</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>Introduction</title>
+  <meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
+  <link rel="HOME" title="Privoxy Developer Manual" href="index.html">
+  <link rel="PREVIOUS" title="Privoxy Developer Manual" href="index.html">
+  <link rel="NEXT" title="The Git Repository" href="git.html">
+  <link rel="STYLESHEET" type="text/css" href="../p_doc.css">
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+<body class="SECT1" bgcolor="#EEEEEE" text="#000000" link="#0000FF" vlink="#840084" alink="#0000FF">
+  <div class="NAVHEADER">
+    <table summary="Header navigation table" width="100%" border="0" cellpadding="0" cellspacing="0">
+      <tr>
+        <th colspan="3" align="center">Privoxy Developer Manual</th>
+      </tr>
+      <tr>
+        <td width="10%" align="left" valign="bottom"><a href="index.html" accesskey="P">Prev</a></td>
+        <td width="80%" align="center" valign="bottom"></td>
+        <td width="10%" align="right" valign="bottom"><a href="git.html" accesskey="N">Next</a></td>
+      </tr>
+    </table>
+    <hr align="left" width="100%">
+  </div>
+  <div class="SECT1">
+    <h1 class="SECT1"><a name="INTRODUCTION" id="INTRODUCTION">1. Introduction</a></h1>
+    <p><span class="APPLICATION">Privoxy</span>, as an heir to <span class="APPLICATION">Junkbuster</span>, is a Free
+    Software project and the code is licensed under the GNU General Public License version 2. As such, <span class=
+    "APPLICATION">Privoxy</span> development is potentially open to anyone who has the time, knowledge, and desire to
+    contribute in any capacity. Our goals are simply to continue the mission, to improve <span class=
+    "APPLICATION">Privoxy</span>, and to make it available to as wide an audience as possible.</p>
+    <p>One does not have to be a programmer to contribute. Packaging, testing, documenting and porting, are all
+    important jobs as well.</p>
+    <div class="SECT2">
+      <h2 class="SECT2"><a name="QUICKSTART" id="QUICKSTART">1.1. Quickstart to Privoxy Development</a></h2>
+      <p>The first step is to join the <a href="https://lists.privoxy.org/mailman/listinfo/privoxy-devel" target=
+      "_top">privoxy-devel mailing list</a>. You can submit your ideas or, even better, patches. Patches are best
+      submitted to the Sourceforge tracker set up for this purpose, but can be sent to the list for review too.</p>
+      <p>You will also need to have a git package installed, which will entail having ssh installed as well, in order
+      to access the git repository. Having the GNU build tools is also going to be important (particularly, autoconf
+      and gmake).</p>
+      <p>For the time being (read, this section is under construction), you can also refer to the extensive comments in
+      the source code. In fact, reading the code is recommended in any case.</p>
+    </div>
+  </div>
+  <div class="NAVFOOTER">
+    <hr align="left" width="100%">
+    <table summary="Footer navigation table" width="100%" border="0" cellpadding="0" cellspacing="0">
+      <tr>
+        <td width="33%" align="left" valign="top"><a href="index.html" accesskey="P">Prev</a></td>
+        <td width="34%" align="center" valign="top"><a href="index.html" accesskey="H">Home</a></td>
+        <td width="33%" align="right" valign="top"><a href="git.html" accesskey="N">Next</a></td>
+      </tr>
+      <tr>
+        <td width="33%" align="left" valign="top">Privoxy Developer Manual</td>
+        <td width="34%" align="center" valign="top">&nbsp;</td>
+        <td width="33%" align="right" valign="top">The Git Repository</td>
+      </tr>
+    </table>
+  </div>
+</body>
+</html>
index c272eb0..c75226e 100644 (file)
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->Releasing a New Version</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="Privoxy Developer Manual"
-HREF="index.html"><LINK
-REL="PREVIOUS"
-TITLE="Testing Guidelines"
-HREF="testing.html"><LINK
-REL="NEXT"
-TITLE="Update the Webserver"
-HREF="webserver-update.html"><LINK
-REL="STYLESHEET"
-TYPE="text/css"
-HREF="../p_doc.css"><META
-HTTP-EQUIV="Content-Type"
-CONTENT="text/html;
-charset=ISO-8859-1"></HEAD
-><BODY
-CLASS="SECT1"
-BGCOLOR="#EEEEEE"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->Privoxy Developer Manual</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="testing.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="webserver-update.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="NEWRELEASE"
->6. Releasing a New Version</A
-></H1
-><P
->        When we release versions of <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
->,
-        our work leaves our cozy secret lab and has to work in the cold
-        RealWorld[tm]. Once it is released, there is no way to call it
-        back, so it is very important that great care is taken to ensure
-        that everything runs fine, and not to introduce problems in the
-        very last minute.
-    </P
-><P
->        So when releasing a new version, please adhere exactly to the
-        procedure outlined in this chapter.
-    </P
-><P
->        The following programs are required to follow this process:
-        <TT
-CLASS="FILENAME"
->ncftpput</TT
-> (ncftp), <TT
-CLASS="FILENAME"
->scp, ssh</TT
-> (ssh),
-        <TT
-CLASS="FILENAME"
->gmake</TT
-> (GNU's version of make), autoconf, cvs.
-    </P
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="VERSIONNUMBERS"
->6.1. Version numbers</A
-></H2
-><P
->      First you need to determine which version number the release will have.
-      <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> version numbers consist of three numbers,
-      separated by dots, like in X.Y.Z (e.g. 3.0.0), where:
-    </P
-><P
-></P
-><UL
-><LI
-><P
->              X, the version major, is rarely ever changed. It is increased by one if
-              turning a development branch into stable substantially changes the functionality,
-              user interface or configuration syntax. Majors 1 and 2 were
-              <SPAN
-CLASS="APPLICATION"
->Junkbuster</SPAN
->, and 3 will be the first stable
-              <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> release.
-            </P
-></LI
-><LI
-><P
-> 
-              Y, the version minor, represents the branch within the major version.
-              At any point in time, there are two branches being maintained:
-              The stable branch, with an even minor, say, 2N, in which no functionality is
-              being added and only bug-fixes are made, and 2N+1, the development branch, in
-              which the further development of <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> takes
-              place.
-              This enables us to turn the code upside down and inside out, while at the same time
-              providing and maintaining a stable version.
-              The minor is reset to zero (and one) when the major is incremented. When a development
-              branch has matured to the point where it can be turned into stable, the old stable branch
-              2N is given up (i.e. no longer maintained), the former development branch 2N+1 becomes the
-              new stable branch 2N+2, and a new development branch 2N+3 is opened.
-            </P
-></LI
-><LI
-><P
->              Z, the point or sub version, represents a release of the software within a branch.
-              It is therefore incremented immediately after each software release.
-      
-              The point version is reset to zero when the minor changes.
-            </P
-><P
->              Stable branches work a little differently, since there should be
-              little to no development happening in such branches. Remember,
-              only bugfixes, which presumably should have had some testing
-              before being committed. Stable branches will then have their
-              version reported as <TT
-CLASS="LITERAL"
->0.0.0</TT
->, during that period
-              between releases when changes are being added. This is to denote
-              that this code is <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->not for release</I
-></SPAN
->. Then
-              as the release nears, the version is bumped according: e.g.
-              <TT
-CLASS="LITERAL"
->3.0.1 -&#62; 0.0.0 -&#62; 3.0.2</TT
->.
-            </P
-></LI
-></UL
-><P
->     In summary, the main Git trunk is the development branch where new
-     features are being worked on for the next stable series. This should
-     almost always be where the most activity takes place. There is always at
-     least one stable branch from the trunk, e.g now it is
-     <TT
-CLASS="LITERAL"
->3.0</TT
->, which is only used to release stable versions.
-     Once the initial *.0 release of the stable branch has been done, then as a
-     rule, only bugfixes that have had prior testing should be committed to
-     the stable branch. Once there are enough bugfixes to justify a new
-     release, the version of this branch is again incremented Example: 3.0.0
-     -&#62; 3.0.1 -&#62; 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
-     <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->before</I
-></SPAN
-> committing to a stable branch!
-    </P
-><P
->     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 Git. If you
-     are working on both, then this would require at least two separate check
-     outs (i.e main trunk, <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->and</I
-></SPAN
-> the stable release branch,
-     which is <TT
-CLASS="LITERAL"
->v_3_0_branch</TT
-> at the moment).
-    </P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="BEFORERELEASE"
->6.2. Before the Release: Freeze</A
-></H2
-><P
->       The following <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->must be done by one of the
-       developers</I
-></SPAN
-> prior to each new release.
-     </P
-><P
-></P
-><UL
-><LI
-><P
->         Make sure that everybody who has worked on the code in the last
-         couple of days has had a chance to yell <SPAN
-CLASS="QUOTE"
->"no!"</SPAN
-> in case
-         they have pending changes/fixes in their pipelines. Announce the
-         freeze so that nobody will interfere with last minute changes.
-       </P
-></LI
-><LI
-><P
->         Update the code status (CODE_STATUS="xxx") in configure.in to one of
-         "alpha", "beta" or "stable".
-       </P
-></LI
-><LI
-><P
->         Rebuild configure and GNUMakefile to make sure the updated values are being used.
-       </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="90%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->$ autoheader &#38;&#38; autoconf     # rebuild configure
-$ ./configure                # rebuild GNUmakefile</PRE
-></TD
-></TR
-></TABLE
-></LI
-><LI
-><P
->        <B
-CLASS="COMMAND"
->make dok-release</B
-> to update the sgml documentation source files.
-       </P
-></LI
-><LI
-><P
->        If action file processing has changed and is not backward-compatible,
-        make sure the "for-privoxy-version=x.y.z" minimum version number in
-        default.action.master has been updated:
-       </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="90%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->{{settings}}
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>Releasing a New Version</title>
+  <meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
+  <link rel="HOME" title="Privoxy Developer Manual" href="index.html">
+  <link rel="PREVIOUS" title="Testing Guidelines" href="testing.html">
+  <link rel="NEXT" title="Update the Webserver" href="webserver-update.html">
+  <link rel="STYLESHEET" type="text/css" href="../p_doc.css">
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+<body class="SECT1" bgcolor="#EEEEEE" text="#000000" link="#0000FF" vlink="#840084" alink="#0000FF">
+  <div class="NAVHEADER">
+    <table summary="Header navigation table" width="100%" border="0" cellpadding="0" cellspacing="0">
+      <tr>
+        <th colspan="3" align="center">Privoxy Developer Manual</th>
+      </tr>
+      <tr>
+        <td width="10%" align="left" valign="bottom"><a href="testing.html" accesskey="P">Prev</a></td>
+        <td width="80%" align="center" valign="bottom"></td>
+        <td width="10%" align="right" valign="bottom"><a href="webserver-update.html" accesskey="N">Next</a></td>
+      </tr>
+    </table>
+    <hr align="left" width="100%">
+  </div>
+  <div class="SECT1">
+    <h1 class="SECT1"><a name="NEWRELEASE" id="NEWRELEASE">6. Releasing a New Version</a></h1>
+    <p>When we release versions of <span class="APPLICATION">Privoxy</span>, our work leaves our cozy secret lab and
+    has to work in the cold RealWorld[tm]. Once it is released, there is no way to call it back, so it is very
+    important that great care is taken to ensure that everything runs fine, and not to introduce problems in the very
+    last minute.</p>
+    <p>So when releasing a new version, please adhere exactly to the procedure outlined in this chapter.</p>
+    <p>The following programs are required to follow this process: <tt class="FILENAME">ncftpput</tt> (ncftp),
+    <tt class="FILENAME">scp, ssh</tt> (ssh), <tt class="FILENAME">gmake</tt> (GNU's version of make), autoconf,
+    cvs.</p>
+    <div class="SECT2">
+      <h2 class="SECT2"><a name="VERSIONNUMBERS" id="VERSIONNUMBERS">6.1. Version numbers</a></h2>
+      <p>First you need to determine which version number the release will have. <span class=
+      "APPLICATION">Privoxy</span> version numbers consist of three numbers, separated by dots, like in X.Y.Z (e.g.
+      3.0.0), where:</p>
+      <ul>
+        <li>
+          <p>X, the version major, is rarely ever changed. It is increased by one if turning a development branch into
+          stable substantially changes the functionality, user interface or configuration syntax. Majors 1 and 2 were
+          <span class="APPLICATION">Junkbuster</span>, and 3 will be the first stable <span class=
+          "APPLICATION">Privoxy</span> release.</p>
+        </li>
+        <li>
+          <p>Y, the version minor, represents the branch within the major version. At any point in time, there are two
+          branches being maintained: The stable branch, with an even minor, say, 2N, in which no functionality is being
+          added and only bug-fixes are made, and 2N+1, the development branch, in which the further development of
+          <span class="APPLICATION">Privoxy</span> takes place. This enables us to turn the code upside down and inside
+          out, while at the same time providing and maintaining a stable version. The minor is reset to zero (and one)
+          when the major is incremented. When a development branch has matured to the point where it can be turned into
+          stable, the old stable branch 2N is given up (i.e. no longer maintained), the former development branch 2N+1
+          becomes the new stable branch 2N+2, and a new development branch 2N+3 is opened.</p>
+        </li>
+        <li>
+          <p>Z, the point or sub version, represents a release of the software within a branch. It is therefore
+          incremented immediately after each software release. The point version is reset to zero when the minor
+          changes.</p>
+          <p>Stable branches work a little differently, since there should be little to no development happening in
+          such branches. Remember, only bugfixes, which presumably should have had some testing before being committed.
+          Stable branches will then have their version reported as <tt class="LITERAL">0.0.0</tt>, during that period
+          between releases when changes are being added. This is to denote that this code is <span class=
+          "emphasis"><i class="EMPHASIS">not for release</i></span>. Then as the release nears, the version is bumped
+          according: e.g. <tt class="LITERAL">3.0.1 -&#62; 0.0.0 -&#62; 3.0.2</tt>.</p>
+        </li>
+      </ul>
+      <p>In summary, the main Git trunk is the development branch where new features are being worked on for the next
+      stable series. This should almost always be where the most activity takes place. There is always at least one
+      stable branch from the trunk, e.g now it is <tt class="LITERAL">3.0</tt>, which is only used to release stable
+      versions. Once the initial *.0 release of the stable branch has been done, then as a rule, only bugfixes that
+      have had prior testing should be committed to the stable branch. Once there are enough bugfixes to justify a new
+      release, the version of this branch is again incremented Example: 3.0.0 -&#62; 3.0.1 -&#62; 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 <span class="emphasis"><i class=
+      "EMPHASIS">before</i></span> committing to a stable branch!</p>
+      <p>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 Git. If you
+      are working on both, then this would require at least two separate check outs (i.e main trunk, <span class=
+      "emphasis"><i class="EMPHASIS">and</i></span> the stable release branch, which is <tt class=
+      "LITERAL">v_3_0_branch</tt> at the moment).</p>
+    </div>
+    <div class="SECT2">
+      <h2 class="SECT2"><a name="BEFORERELEASE" id="BEFORERELEASE">6.2. Before the Release: Freeze</a></h2>
+      <p>The following <span class="emphasis"><i class="EMPHASIS">must be done by one of the developers</i></span>
+      prior to each new release.</p>
+      <ul>
+        <li>
+          <p>Make sure that everybody who has worked on the code in the last couple of days has had a chance to yell
+          <span class="QUOTE">"no!"</span> in case they have pending changes/fixes in their pipelines. Announce the
+          freeze so that nobody will interfere with last minute changes.</p>
+        </li>
+        <li>
+          <p>Update the code status (CODE_STATUS="xxx") in configure.in to one of "alpha", "beta" or "stable".</p>
+        </li>
+        <li>
+          <p>Rebuild configure and GNUMakefile to make sure the updated values are being used.</p>
+          <table border="0" bgcolor="#E0E0E0" width="90%">
+            <tr>
+              <td>
+                <pre class="PROGRAMLISTING">$ autoheader &#38;&#38; autoconf     # rebuild configure
+$ ./configure                # rebuild GNUmakefile</pre>
+              </td>
+            </tr>
+          </table>
+        </li>
+        <li>
+          <p><b class="COMMAND">make dok-release</b> to update the sgml documentation source files.</p>
+        </li>
+        <li>
+          <p>If action file processing has changed and is not backward-compatible, make sure the
+          "for-privoxy-version=x.y.z" minimum version number in default.action.master has been updated:</p>
+          <table border="0" bgcolor="#E0E0E0" width="90%">
+            <tr>
+              <td>
+                <pre class="PROGRAMLISTING">{{settings}}
 #############################################################################
 #MASTER# COMMENT: The minimum Privoxy version:
-for-privoxy-version=3.0.11</PRE
-></TD
-></TR
-></TABLE
-></LI
-><LI
-><P
->        All documentation should be rebuild after the code status has been changed.
-        Finished docs should be then be committed to Git (for those
-        without the ability to build these). Some docs may require
-        rather obscure processing tools. <TT
-CLASS="FILENAME"
->config</TT
->,
-        the man page (and the html version of the man page)
-        fall in this category. README, the man page, AUTHORS, and config
-        should all also be committed to Git for other packagers. The
-        formal docs should be uploaded to the webserver. See the section
-        <A
-HREF="webserver-update.html"
-TARGET="_top"
->"Updating the webserver"</A
->
-        in this manual for details.
-       </P
-></LI
-><LI
-><P
->         The <I
-CLASS="CITETITLE"
->User Manual</I
-> is also used for context
-         sensitive help for the CGI editor. This is version sensitive, so that
-         the user will get appropriate help for his/her release. So with
-         each release a fresh version should be uploaded to the webserver
-         (this is in addition to the main <I
-CLASS="CITETITLE"
->User Manual</I
->
-         link from the main page since we need to keep manuals for various
-         versions available). The CGI pages will link to something like
-         <TT
-CLASS="LITERAL"
->http://privoxy.org/$(VERSION)/user-manual/</TT
->. This
-         will need to be updated for each new release. There is no Makefile
-         target for this at this time!!! It needs to be done manually.
-       </P
-></LI
-><LI
-><P
->        All developers should look at the <TT
-CLASS="FILENAME"
->ChangeLog</TT
-> and
-        make sure noteworthy changes are referenced.
-       </P
-></LI
-><LI
-><P
->        <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Commit all files that were changed in the above steps!</I
-></SPAN
->
-       </P
-></LI
-><LI
-><P
->        Tag all files in Git with the version number with
-        <SPAN
-CLASS="QUOTE"
->"<B
-CLASS="COMMAND"
->cvs tag v_X_Y_Z</B
->"</SPAN
->.
-        Don't use vX_Y_Z, ver_X_Y_Z, v_X.Y.Z (won't work) etc.
-       </P
-></LI
-><LI
-><P
->        If the release was in a development branch, increase the point version
-        from even to odd (X.Y.(Z+1)) again in <TT
-CLASS="FILENAME"
->configure.in</TT
-> and
-        commit your change.
-       </P
-></LI
-><LI
-><P
->        On the webserver, copy the user manual to a new top-level directory
-        called <TT
-CLASS="FILENAME"
->X.Y.Z</TT
->. This ensures that help links from the CGI
-        pages, which have the version as a prefix, will go into the right version of the manual.
-        If this is a development branch release, also symlink <TT
-CLASS="FILENAME"
->X.Y.(Z-1)</TT
->
-        to <TT
-CLASS="FILENAME"
->X.Y.Z</TT
-> and <TT
-CLASS="FILENAME"
->X.Y.(Z+1)</TT
-> to
-        <TT
-CLASS="FILENAME"
->.</TT
-> (i.e. dot).
-       </P
-></LI
-></UL
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="THERELEASE"
->6.3. Building and Releasing the Packages</A
-></H2
-><P
->      Now the individual packages can be built and released. Note that for
-      GPL reasons the first package to be released is always the source tarball.
-     </P
-><P
->      For <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->all</I
-></SPAN
-> types of packages, including the source tarball,
-      <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->you must make sure that you build from clean sources by exporting
-      the right version from Git into an empty directory</I
-></SPAN
-> (just press return when
-      asked for a password):
-     </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  mkdir dist # delete or choose different name if it already exists
+for-privoxy-version=3.0.11</pre>
+              </td>
+            </tr>
+          </table>
+        </li>
+        <li>
+          <p>Create the change log:</p>
+          <table border="0" bgcolor="#E0E0E0" width="90%">
+            <tr>
+              <td>
+                <pre class="PROGRAMLISTING">  $ git tag
+  #   to see the tags
+  $ git log [last release tag]..HEAD &gt; /tmp/log
+  #   get the commit log since the last release
+  $ utils/makeChangeLog /tmp/log &gt; /tmp/change.log
+  #   reformat the commit log</pre>
+              </td>
+            </tr>
+          </table>
+          <p>Edit <tt class="FILENAME">/tmp/change.log</tt> to remove trivial changes and group the changes under
+          general headings like:</p>
+          <table border="0" bgcolor="#E0E0E0" width="90%">
+            <tr>
+              <td>
+                <pre class="PROGRAMLISTING">- Bug fixes:
+- Action file improvements:
+- Filter file improvements:
+- General improvements:
+- Documentation improvements:
+- Build system improvements:
+- Code cleanups:
+- Privoxy-Log-Parser:
+- Privoxy-Regression-Test:</pre>
+              </td>
+            </tr>
+          </table>
+          <p>Add the contents of <tt class="FILENAME">/tmp/change.log</tt> to the start of <tt class=
+          "FILENAME">ChangeLog</tt> and re-create <tt class="FILENAME">doc/source/changelog.sgml</tt>:</p>
+          <table border="0" bgcolor="#E0E0E0" width="90%">
+            <tr>
+              <td>
+                <pre class=
+                "PROGRAMLISTING">  $ utils/changelog2doc.pl /tmp/change.log &gt;| doc/source/changelog.sgml</pre>
+              </td>
+            </tr>
+          </table>
+        </li>
+        <li>
+          <p>All developers should look at the <tt class="FILENAME">ChangeLog</tt> and make sure noteworthy changes are
+          referenced.</p>
+        </li>
+        <li>
+          <p>All documentation should be rebuilt:</p>
+          <table border="0" bgcolor="#E0E0E0" width="90%">
+            <tr>
+              <td>
+                <pre class="PROGRAMLISTING">  $ make dok
+  $ make dok-tidy
+  $ make man
+  $ make config-file</pre>
+              </td>
+            </tr>
+          </table>Finished docs should be then be committed to Git (for those without the ability to build these). Some
+          docs may require rather obscure processing tools. <tt class="FILENAME">config</tt>, the man page (and the
+          html version of the man page) fall in this category. README, the man page, AUTHORS, and config should all
+          also be committed to Git for other packagers. The formal docs should be uploaded to the webserver. See the
+          section <a href="webserver-update.html" target="_top">"Updating the webserver"</a> in this manual for
+          details.
+        </li>
+        <li>
+          <p><span class="emphasis"><i class="EMPHASIS">Commit all files that were changed in the above
+          steps!</i></span></p>
+        </li>
+        <li>
+          <p>The <i class="CITETITLE">User Manual</i> is also used for context sensitive help for the CGI editor. This
+          is version sensitive, so that the user will get appropriate help for his/her release. So with each release a
+          fresh version should be uploaded to the webserver (this is in addition to the main <i class="CITETITLE">User
+          Manual</i> link from the main page since we need to keep manuals for various versions available). The CGI
+          pages will link to something like <tt class="LITERAL">http://privoxy.org/$(VERSION)/user-manual/</tt>. This
+          will need to be updated for each new release. There is no Makefile target for this at this time!!! It needs
+          to be done manually.</p>
+        </li>
+        <li>
+          <p>Tag all files in Git with the version number with <span class="QUOTE">"<b class="COMMAND">cvs tag
+          v_X_Y_Z</b>"</span>. Don't use vX_Y_Z, ver_X_Y_Z, v_X.Y.Z (won't work) etc.</p>
+        </li>
+        <li>
+          <p>On the webserver, copy the user manual to a new top-level directory called <tt class=
+          "FILENAME">X.Y.Z</tt>. This ensures that help links from the CGI pages, which have the version as a prefix,
+          will go into the right version of the manual. If this is a development branch release, also symlink
+          <tt class="FILENAME">X.Y.(Z-1)</tt> to <tt class="FILENAME">X.Y.Z</tt> and <tt class=
+          "FILENAME">X.Y.(Z+1)</tt> to <tt class="FILENAME">.</tt> (i.e. dot).</p>
+        </li>
+      </ul>
+    </div>
+    <div class="SECT2">
+      <h2 class="SECT2"><a name="THERELEASE" id="THERELEASE">6.3. Building and Releasing the Packages</a></h2>
+      <p>Now the individual packages can be built and released. Note that for GPL reasons the first package to be
+      released is always the source tarball.</p>
+      <p>For <span class="emphasis"><i class="EMPHASIS">all</i></span> types of packages, including the source tarball,
+      <span class="emphasis"><i class="EMPHASIS">you must make sure that you build from clean sources by exporting the
+      right version from Git into an empty directory</i></span> (just press return when asked for a password):</p>
+      <table border="0" bgcolor="#E0E0E0" width="100%">
+        <tr>
+          <td>
+            <pre class="PROGRAMLISTING">  mkdir dist # delete or choose different name if it already exists
   cd dist
   cvs -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa login
-  cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa export -r v_X_Y_Z current</PRE
-></TD
-></TR
-></TABLE
-><P
->     <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Do NOT change</I
-></SPAN
-> a single bit, including, but not limited to
-     version information after export from Git. This is to make sure that
-     all release packages, and with them, all future bug reports, are based
-     on exactly the same code.
-    </P
-><DIV
-CLASS="WARNING"
-><P
-></P
-><TABLE
-CLASS="WARNING"
-BORDER="1"
-WIDTH="100%"
-><TR
-><TD
-ALIGN="CENTER"
-><B
->Warning</B
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-><P
->      Every significant release of Privoxy has included at least one
-      package that either had incorrect versions of files, missing files,
-      or incidental leftovers from a previous build process that gave
-      unknown numbers of users headaches to try to figure out what was
-      wrong. PLEASE, make sure you are using pristene sources, and are
-      following the prescribed process!
-     </P
-></TD
-></TR
-></TABLE
-></DIV
-><P
->     Please find additional instructions for the source tarball and the
-     individual platform dependent binary packages below. And details
-     on the Sourceforge release process below that.
-    </P
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="PACK-GUIDELINES"
->6.3.1. Note on Privoxy Packaging</A
-></H3
-><P
->      Please keep these general guidelines in mind when putting together
-      your package. These apply to <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->all</I
-></SPAN
-> platforms!
-     </P
-><P
-></P
-><UL
-><LI
-><P
->          <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->requires</I
-></SPAN
->
-          write access to: all <TT
-CLASS="FILENAME"
->*.action</TT
-> files, all
-          logfiles, and the <TT
-CLASS="FILENAME"
->trust</TT
-> file. You will
-          need to determine the best way to do this for your platform.
-        </P
-></LI
-><LI
-><P
->          Please include up to date documentation. At a bare minimum:
-        </P
-><P
-></P
-><TABLE
-BORDER="0"
-><TBODY
-><TR
-><TD
->          <TT
-CLASS="FILENAME"
->LICENSE</TT
-> (top-level directory)
-         </TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-><P
-></P
-><TABLE
-BORDER="0"
-><TBODY
-><TR
-><TD
->          <TT
-CLASS="FILENAME"
->README</TT
-> (top-level directory)
-         </TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-><P
-></P
-><TABLE
-BORDER="0"
-><TBODY
-><TR
-><TD
->          <TT
-CLASS="FILENAME"
->AUTHORS</TT
-> (top-level directory)
-         </TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-><P
-></P
-><TABLE
-BORDER="0"
-><TBODY
-><TR
-><TD
->          <TT
-CLASS="FILENAME"
->man page</TT
-> (top-level directory, Unix-like
-          platforms only)
-         </TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-><P
-></P
-><TABLE
-BORDER="0"
-><TBODY
-><TR
-><TD
->          <TT
-CLASS="FILENAME"
->The User Manual</TT
-> (doc/webserver/user-manual/)
-         </TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-><P
-></P
-><TABLE
-BORDER="0"
-><TBODY
-><TR
-><TD
->          <TT
-CLASS="FILENAME"
->FAQ</TT
-> (doc/webserver/faq/)
-         </TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-><P
->          Also suggested: <TT
-CLASS="FILENAME"
->Developer Manual</TT
->
-          (doc/webserver/developer-manual) and <TT
-CLASS="FILENAME"
->ChangeLog</TT
->
-          (top-level directory). <TT
-CLASS="FILENAME"
->FAQ</TT
-> and the manuals are
-          HTML docs. There are also text versions in
-          <TT
-CLASS="FILENAME"
->doc/text/</TT
-> which could conceivably also be
-          included.
-        </P
-><P
->         The documentation has been designed such that the manuals are linked
-         to each other from parallel directories, and should be packaged
-         that way. <TT
-CLASS="FILENAME"
->privoxy-index.html</TT
-> can also be
-         included and can serve as a focal point for docs and other links of
-         interest (and possibly renamed to <TT
-CLASS="FILENAME"
->index.html</TT
->).
-         This should be one level up from the manuals. There is a link also
-         on this page to an HTMLized version of the man page. To avoid 404 for
-         this, it is in Git as
-         <TT
-CLASS="FILENAME"
->doc/webserver/man-page/privoxy-man-page.html</TT
->,
-         and should be included along with the manuals. There is also a
-         css stylesheets that can be included for better presentation:
-         <TT
-CLASS="FILENAME"
->p_doc.css</TT
->. This should be in the same directory
-         with <TT
-CLASS="FILENAME"
->privoxy-index.html</TT
->, (i.e. one level up from
-         the manual directories).
-        </P
-></LI
-><LI
-><P
->        <TT
-CLASS="FILENAME"
->user.action</TT
-> and <TT
-CLASS="FILENAME"
->user.filter</TT
->
-        are designed for local preferences. Make sure these do not get overwritten!
-        <TT
-CLASS="FILENAME"
->config</TT
-> should not be overwritten either. This
-        has especially important configuration data in it.
-        <TT
-CLASS="FILENAME"
->trust</TT
-> should be left in tact as well.
-       </P
-></LI
-><LI
-><P
->        Other configuration files (<TT
-CLASS="FILENAME"
->default.action</TT
-> and
-        <TT
-CLASS="FILENAME"
->default.filter</TT
->) should be installed as the new
-        defaults, but all previously installed configuration files should be
-        preserved as backups. This is just good manners :-) These files are
-        likely to change between releases and contain important new features
-        and bug fixes.
-       </P
-></LI
-><LI
-><P
->       Please check platform specific notes in this doc, if you haven't
-       done <SPAN
-CLASS="QUOTE"
->"Privoxy"</SPAN
-> packaging before for other platform
-       specific issues. Conversely, please add any notes that you know
-       are important for your platform (or contact one of the doc
-       maintainers to do this if you can't).
-      </P
-></LI
-><LI
-><P
->       Packagers should do a <SPAN
-CLASS="QUOTE"
->"clean"</SPAN
-> install of their
-       package after building it. So any previous installs should be
-       removed first to ensure the integrity of the newly built package.
-       Then run the package for a while to make sure there are no
-       obvious problems, before uploading.
-     </P
-></LI
-></UL
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="NEWRELEASE-TARBALL"
->6.3.2. Source Tarball</A
-></H3
-><P
->        First, <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->make sure that you have freshly exported the right
-        version into an empty directory</I
-></SPAN
->. (See "Building and releasing
-        packages" above). Then run:
-      </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  cd current
-  autoheader &#38;&#38; autoconf &#38;&#38; ./configure</PRE
-></TD
-></TR
-></TABLE
-><P
->        Then do:
-      </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  make tarball-dist</PRE
-></TD
-></TR
-></TABLE
-><P
->        To upload the package to Sourceforge, simply issue
-      </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  make tarball-upload</PRE
-></TD
-></TR
-></TABLE
-><P
->        Go to the displayed URL and release the file publicly on Sourceforge.
-        For the change log field, use the relevant section of the
-        <TT
-CLASS="FILENAME"
->ChangeLog</TT
-> file.
-      </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="NEWRELEASE-RPM"
->6.3.3. SuSE, Conectiva or Red Hat RPM</A
-></H3
-><P
->        In following text, replace <TT
-CLASS="REPLACEABLE"
-><I
->dist</I
-></TT
->
-        with either <SPAN
-CLASS="QUOTE"
->"rh"</SPAN
-> for Red Hat or <SPAN
-CLASS="QUOTE"
->"suse"</SPAN
-> for SuSE.
-      </P
-><P
->        First, <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->make sure that you have freshly exported the right
-        version into an empty directory</I
-></SPAN
->. (See "Building and releasing
-        packages" above).
-      </P
-><P
->        As the only exception to not changing anything after export from Git,
-        now examine the file <TT
-CLASS="FILENAME"
->privoxy-</TT
-><TT
-CLASS="REPLACEABLE"
-><I
->dist</I
-></TT
-><TT
-CLASS="FILENAME"
->.spec</TT
->
-        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
-        <TT
-CLASS="REPLACEABLE"
-><I
->dist</I
-></TT
-> which is built from version
-        X.Y.Z. Check the
-        <A
-HREF="https://sourceforge.net/project/showfiles.php?group_id=11118"
-TARGET="_top"
->file
-        list</A
-> if unsure. Else, it must be set to the highest already available RPM
-        release number for that version plus one.
-      </P
-><P
->        Then run:
-      </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  cd current
-  autoheader &#38;&#38; autoconf &#38;&#38; ./configure</PRE
-></TD
-></TR
-></TABLE
-><P
->        Then do
-      </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  make <TT
-CLASS="REPLACEABLE"
-><I
->dist</I
-></TT
->-dist</PRE
-></TD
-></TR
-></TABLE
-><P
->        To upload the package to Sourceforge, simply issue
-      </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  make <TT
-CLASS="REPLACEABLE"
-><I
->dist</I
-></TT
->-upload <TT
-CLASS="REPLACEABLE"
-><I
->rpm_packagerev</I
-></TT
-></PRE
-></TD
-></TR
-></TABLE
-><P
->        where <TT
-CLASS="REPLACEABLE"
-><I
->rpm_packagerev</I
-></TT
-> 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.
-      </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="NEWRELEASE-OS2"
->6.3.4. OS/2</A
-></H3
-><P
->        First, <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->make sure that you have freshly exported the right
-        version into an empty directory</I
-></SPAN
->. (See "Building and releasing
-        packages" above). Then get the OS/2 Setup module:
-      </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co os2setup</PRE
-></TD
-></TR
-></TABLE
-><P
->        You will need a mix of development tools.
-        The main compilation takes place with IBM Visual Age C++.
-        Some ancillary work takes place with GNU tools, available from
-        various sources like hobbes.nmsu.edu.
-        Specificially, you will need <TT
-CLASS="FILENAME"
->autoheader</TT
->,
-        <TT
-CLASS="FILENAME"
->autoconf</TT
-> and <TT
-CLASS="FILENAME"
->sh</TT
-> tools.
-        The packaging takes place with WarpIN, available from various sources, including
-        its home page: <A
-HREF="http://www.xworkplace.org/"
-TARGET="_top"
->xworkplace</A
->.
-      </P
-><P
->        Change directory to the <TT
-CLASS="FILENAME"
->os2setup</TT
-> directory.
-        Edit the os2build.cmd file to set the final executable filename.
-        For example,
-      </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  installExeName='privoxyos2_setup_X.Y.Z.exe'</PRE
-></TD
-></TR
-></TABLE
-><P
->        Next, edit the <TT
-CLASS="FILENAME"
->IJB.wis</TT
-> file so the release number matches
-        in the <TT
-CLASS="FILENAME"
->PACKAGEID</TT
-> section:
-      </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  PACKAGEID="Privoxy Team\Privoxy\Privoxy Package\X\Y\Z"</PRE
-></TD
-></TR
-></TABLE
-><P
->        You're now ready to build.  Run:
-      </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  os2build</PRE
-></TD
-></TR
-></TABLE
-><P
->         You will find the  WarpIN-installable executable in the
-        <TT
-CLASS="FILENAME"
->./files</TT
-> directory. Upload this anonymously to
-         <TT
-CLASS="FILENAME"
->uploads.sourceforge.net/incoming</TT
->, create a release
-         for it, and you're done. Use the release notes and Change Log from the
-         source tarball package.
-      </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="NEWRELEASE-SOLARIS"
->6.3.5. Solaris</A
-></H3
-><P
->        Login to Sourceforge's compilefarm via ssh:
-      </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  ssh cf.sourceforge.net</PRE
-></TD
-></TR
-></TABLE
-><P
->        Choose the right operating system (not the Debian one).
-        When logged in, <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->make sure that you have freshly exported the right
-        version into an empty directory</I
-></SPAN
->. (See "Building and releasing
-        packages" above). Then run:
-      </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  cd current
-  autoheader &#38;&#38; autoconf &#38;&#38; ./configure</PRE
-></TD
-></TR
-></TABLE
-><P
->        Then run
-      </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  gmake solaris-dist</PRE
-></TD
-></TR
-></TABLE
-><P
->        which creates a gzip'ed tar archive. Sadly, you cannot use <B
-CLASS="COMMAND"
->make
-        solaris-upload</B
-> on the Sourceforge machine (no ncftpput). You now have
-        to manually upload the archive to Sourceforge's ftp server and release
-        the file publicly. Use the release notes and Change Log from the
-        source tarball package.
-      </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="NEWRELEASE-WINDOWS"
->6.3.6. Windows</A
-></H3
-><P
->        Note that the docbook generated files might need some hand editing,
-        so the Windows build makefile does not rebuild the docs.
-      </P
-><P
->        First, <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->make sure that you have freshly exported the right
-        version into an empty directory</I
-></SPAN
->. (See "Building and releasing
-        packages" above).
-        
-      </P
-><P
->        Then you can build the package.  This is fully automated, and is
-        controlled by <TT
-CLASS="FILENAME"
->windows/GNUmakefile</TT
->.
-        All you need to do is:
-      </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  cd windows
-  make</PRE
-></TD
-></TR
-></TABLE
-><P
->        Now you can manually rename <TT
-CLASS="FILENAME"
->privoxy_setup.exe</TT
-> to
-        <TT
-CLASS="FILENAME"
->privoxy_setup_X.Y.Z.exe</TT
->, and the <TT
-CLASS="FILENAME"
->build</TT
->
-        directory to <TT
-CLASS="FILENAME"
->privoxy_X.Y.Z</TT
->.
-        Create a .zip file of the newly renamed <TT
-CLASS="FILENAME"
->privoxy_X.Y.Z</TT
-> directory,
-        GPG sign the installer and zip file,
-      </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  $ gpg --armor --detach --sign <TT
-CLASS="FILENAME"
->privoxy_setup_X.Y.Z.exe</TT
->
-  $ gpg --armor --detach --sign <TT
-CLASS="FILENAME"
->privoxy_X.Y.Z.zip</TT
-></PRE
-></TD
-></TR
-></TABLE
-><P
->        and upload the files to SourceForge.
-      </P
-><P
->        When releasing the package on SourceForge, use the release notes
-        and Change Log from the source tarball package.
-      </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="NEWRELEASE-DEBIAN"
->6.3.7. Debian</A
-></H3
-><P
->        First, <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->make sure that you have freshly exported the
-        right version into an empty directory</I
-></SPAN
->. (See
-        "Building and releasing packages" above).  Then add a log
-        entry to <TT
-CLASS="FILENAME"
->debian/changelog</TT
->, if it is not
-        already there, for example by running:
-      </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  debchange -v 3.0.27-UNRELEASED-1 "New upstream version"</PRE
-></TD
-></TR
-></TABLE
-><P
->        Then, run:
-      </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  dpkg-buildpackage -rfakeroot -us -uc -b</PRE
-></TD
-></TR
-></TABLE
-><P
->        This will create
-        <TT
-CLASS="FILENAME"
->../privoxy_3.0.27-UNRELEASED-1_i386.deb</TT
->
-        which can be uploaded.  To upload the package to Sourceforge, simply
-        issue
-      </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  make debian-upload</PRE
-></TD
-></TR
-></TABLE
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="NEWRELEASE-MACOSX"
->6.3.8. Mac OS X</A
-></H3
-><P
->        First, <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->make sure that you have freshly exported the right
-        version into an empty directory</I
-></SPAN
->. (See "Building and releasing
-        packages" above).
-      </P
-><P
->        There are three modules available in the Git 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).
-      </P
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="OS-X-OSXPACKAGEBUILDER-MODULE"
->6.3.8.1. OSXPackageBuilder module</A
-></H4
-><P
->          The OSXPackageBuilder module generates OS X installer packages
-          supporting all Macs running OS X 10.4 and above. Obtain it from Git as
-          follows into a folder parallel to the exported privoxy source:
-        </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co OSXPackageBuilder</PRE
-></TD
-></TR
-></TABLE
-><P
->          The module contains complete instructions on its usage in the file
-          <TT
-CLASS="FILENAME"
->OS X Package Builder HOWTO.txt</TT
->.
-        </P
-><P
->          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.
-        </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="OS-X-OSXSETUP-MODULE"
->6.3.8.2. osxsetup module (DEPRECATED)</A
-></H4
-><P
->          <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->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.</I
-></SPAN
->
-        </P
-><P
->          Check out the module from Git as follows into a folder parallel to the
-          exported privoxy source:
-        </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co osxsetup</PRE
-></TD
-></TR
-></TABLE
-><P
->          Then run:
-        </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  cd osxsetup
-  build</PRE
-></TD
-></TR
-></TABLE
-><P
->          This will run <TT
-CLASS="FILENAME"
->autoheader</TT
->, <TT
-CLASS="FILENAME"
->autoconf</TT
->
-          and <TT
-CLASS="FILENAME"
->configure</TT
-> as well as <TT
-CLASS="FILENAME"
->make</TT
->.
-          Finally, it will copy over the necessary files to the ./osxsetup/files
-          directory for further processing by <TT
-CLASS="FILENAME"
->PackageMaker</TT
->.
-        </P
-><P
->        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:
-        </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  zip -r privoxyosx_setup_x.y.z.zip Privoxy.pkg</PRE
-></TD
-></TR
-></TABLE
-><P
->          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.
-        </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="OS-X-MACSETUP-MODULE"
->6.3.8.3. macsetup module</A
-></H4
-><P
->          The macsetup module is ideal if you wish to build and install Privoxy
-          from source on a single machine.
-        </P
-><P
->          Check out the module from Git as follows into a folder parallel to the
-          exported privoxy source:
-        </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co macsetup</PRE
-></TD
-></TR
-></TABLE
-><P
->          The module contains complete instructions on its usage in its
-          <TT
-CLASS="FILENAME"
->README</TT
-> file. The end result will be the
-          exported version of Privoxy installed on the build machine.
-        </P
-></DIV
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="NEWRELEASE-FREEBSD"
->6.3.9. FreeBSD</A
-></H3
-><P
->        Update the www/privoxy port and submit a diff upstream.
-        For details see the <A
-HREF="https://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/"
-TARGET="_top"
->FreeBSD Porter's Handbook</A
->.
-      </P
-></DIV
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="RELEASING"
->6.4. Uploading and Releasing Your Package</A
-></H2
-><P
->      After the package is ready, it is time to upload it
-      to SourceForge, and go through the release steps. The upload
-      is done via FTP:
-    </P
-><P
-></P
-><UL
-><LI
-><P
->        Upload to: <A
-HREF="ftp://upload.sourceforge.net/incoming"
-TARGET="_top"
->ftp://upload.sourceforge.net/incoming</A
->
-      </P
-></LI
-><LI
-><P
->       user: <TT
-CLASS="LITERAL"
->anonymous</TT
->
-      </P
-></LI
-><LI
-><P
->       password: <TT
-CLASS="LITERAL"
->ijbswa-developers@lists.sourceforge.net</TT
->
-      </P
-></LI
-></UL
-><P
->     Or use the <B
-CLASS="COMMAND"
->make</B
-> targets as described above.
-    </P
-><P
->     Once this done go to
-     <A
-HREF="https://sourceforge.net/project/admin/editpackages.php?group_id=11118"
-TARGET="_top"
->                 https://sourceforge.net/project/admin/editpackages.php?group_id=11118</A
->,
-     making sure you are logged in. Find your target platform in the
-     second column, and click <TT
-CLASS="LITERAL"
->Add Release</TT
->. You will
-     then need to create a new release for your package, using the format
-     of <TT
-CLASS="LITERAL"
->$VERSION ($CODE_STATUS)</TT
->, e.g. <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->3.0.27
-     (beta)</I
-></SPAN
->.
-    </P
-><P
->     Now just follow the prompts. Be sure to add any appropriate Release
-     notes. You should see your freshly uploaded packages in
-     <SPAN
-CLASS="QUOTE"
->"Step 2. Add Files To This Release"</SPAN
->. Check the
-     appropriate box(es). Remember at each step to hit the
-     <SPAN
-CLASS="QUOTE"
->"Refresh/Submit"</SPAN
-> buttons! You should now see your
-     file(s) listed in Step 3. Fill out the forms with the appropriate
-     information for your platform, being sure to hit <SPAN
-CLASS="QUOTE"
->"Update"</SPAN
->
-     for each file. If anyone is monitoring your platform, check the
-     <SPAN
-CLASS="QUOTE"
->"email"</SPAN
-> box at the very bottom to notify them of
-     the new package. This should do it!
-    </P
-><P
->     If you have made errors, or need to make changes, you can go through
-     essentially the same steps, but select <TT
-CLASS="LITERAL"
->Edit Release</TT
->,
-     instead of <TT
-CLASS="LITERAL"
->Add Release</TT
->.
-    </P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AFTERRELEASE"
->6.5. After the Release</A
-></H2
-><P
->      When all (or: most of the) packages have been uploaded and made available,
-      send an email to the
-      <A
-HREF="mailto:privoxy-announce@lists.privoxy.org"
-TARGET="_top"
->announce mailing
-      list</A
->, Subject: "Version X.Y.Z available for download". Be sure to
-      include the
-      <A
-HREF="https://sourceforge.net/project/showfiles.php?group_id=11118"
-TARGET="_top"
->      download location</A
->, the release notes and the Changelog. Also, post an
-      updated News item on the project page Sourceforge, and update the Home
-      page and docs linked from the Home page (see below). Other news sites
-      and release oriented sites, such as Freshmeat, should also be notified.
-     </P
-><P
->      Then update the source code for the next version to be released:
-     </P
-><P
-></P
-><UL
-><LI
-><P
->        Increment the version number and change the code status to "UNRELEASED"
-        in <TT
-CLASS="FILENAME"
->configure.in</TT
->
-       </P
-></LI
-><LI
-><P
->        Rebuild configure (<SPAN
-CLASS="QUOTE"
->"<B
-CLASS="COMMAND"
->autoheader &#38;&#38; autoconf</B
->"</SPAN
->)
-        and GNUMakefile (<SPAN
-CLASS="QUOTE"
->"<B
-CLASS="COMMAND"
->./configure</B
->"</SPAN
->)
-       </P
-></LI
-><LI
-><P
->        <SPAN
-CLASS="QUOTE"
->"<B
-CLASS="COMMAND"
->make dok-release</B
->"</SPAN
-> to update the sgml documentation source files.
-       </P
-></LI
-><LI
-><P
->        Commit all your changes.
-       </P
-></LI
-></UL
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="testing.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="webserver-update.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Testing Guidelines</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Update the Webserver</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
+  cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa export -r v_X_Y_Z current</pre>
+          </td>
+        </tr>
+      </table>
+      <p><span class="emphasis"><i class="EMPHASIS">Do NOT change</i></span> a single bit, including, but not limited
+      to version information after export from Git. This is to make sure that all release packages, and with them, all
+      future bug reports, are based on exactly the same code.</p>
+      <div class="WARNING">
+        <table class="WARNING" border="1" width="100%">
+          <tr>
+            <td align="center"><b>Warning</b></td>
+          </tr>
+          <tr>
+            <td align="left">
+              <p>Every significant release of Privoxy has included at least one package that either had incorrect
+              versions of files, missing files, or incidental leftovers from a previous build process that gave unknown
+              numbers of users headaches to try to figure out what was wrong. PLEASE, make sure you are using pristene
+              sources, and are following the prescribed process!</p>
+            </td>
+          </tr>
+        </table>
+      </div>
+      <p>Please find additional instructions for the source tarball and the individual platform dependent binary
+      packages below. And details on the Sourceforge release process below that.</p>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="PACK-GUIDELINES" id="PACK-GUIDELINES">6.3.1. Note on Privoxy Packaging</a></h3>
+        <p>Please keep these general guidelines in mind when putting together your package. These apply to <span class=
+        "emphasis"><i class="EMPHASIS">all</i></span> platforms!</p>
+        <ul>
+          <li>
+            <p><span class="APPLICATION">Privoxy</span> <span class="emphasis"><i class="EMPHASIS">requires</i></span>
+            write access to: all <tt class="FILENAME">*.action</tt> files, all logfiles, and the <tt class=
+            "FILENAME">trust</tt> file. You will need to determine the best way to do this for your platform.</p>
+          </li>
+          <li>
+            <p>Please include up to date documentation. At a bare minimum:</p>
+            <table border="0">
+              <tbody>
+                <tr>
+                  <td><tt class="FILENAME">LICENSE</tt> (top-level directory)</td>
+                </tr>
+              </tbody>
+            </table>
+            <table border="0">
+              <tbody>
+                <tr>
+                  <td><tt class="FILENAME">README</tt> (top-level directory)</td>
+                </tr>
+              </tbody>
+            </table>
+            <table border="0">
+              <tbody>
+                <tr>
+                  <td><tt class="FILENAME">AUTHORS</tt> (top-level directory)</td>
+                </tr>
+              </tbody>
+            </table>
+            <table border="0">
+              <tbody>
+                <tr>
+                  <td><tt class="FILENAME">man page</tt> (top-level directory, Unix-like platforms only)</td>
+                </tr>
+              </tbody>
+            </table>
+            <table border="0">
+              <tbody>
+                <tr>
+                  <td><tt class="FILENAME">The User Manual</tt> (doc/webserver/user-manual/)</td>
+                </tr>
+              </tbody>
+            </table>
+            <table border="0">
+              <tbody>
+                <tr>
+                  <td><tt class="FILENAME">FAQ</tt> (doc/webserver/faq/)</td>
+                </tr>
+              </tbody>
+            </table>
+            <p>Also suggested: <tt class="FILENAME">Developer Manual</tt> (doc/webserver/developer-manual) and
+            <tt class="FILENAME">ChangeLog</tt> (top-level directory). <tt class="FILENAME">FAQ</tt> and the manuals
+            are HTML docs. There are also text versions in <tt class="FILENAME">doc/text/</tt> which could conceivably
+            also be included.</p>
+            <p>The documentation has been designed such that the manuals are linked to each other from parallel
+            directories, and should be packaged that way. <tt class="FILENAME">privoxy-index.html</tt> can also be
+            included and can serve as a focal point for docs and other links of interest (and possibly renamed to
+            <tt class="FILENAME">index.html</tt>). This should be one level up from the manuals. There is a link also
+            on this page to an HTMLized version of the man page. To avoid 404 for this, it is in Git as <tt class=
+            "FILENAME">doc/webserver/man-page/privoxy-man-page.html</tt>, and should be included along with the
+            manuals. There is also a css stylesheets that can be included for better presentation: <tt class=
+            "FILENAME">p_doc.css</tt>. This should be in the same directory with <tt class=
+            "FILENAME">privoxy-index.html</tt>, (i.e. one level up from the manual directories).</p>
+          </li>
+          <li>
+            <p><tt class="FILENAME">user.action</tt> and <tt class="FILENAME">user.filter</tt> are designed for local
+            preferences. Make sure these do not get overwritten! <tt class="FILENAME">config</tt> should not be
+            overwritten either. This has especially important configuration data in it. <tt class="FILENAME">trust</tt>
+            should be left in tact as well.</p>
+          </li>
+          <li>
+            <p>Other configuration files (<tt class="FILENAME">default.action</tt> and <tt class=
+            "FILENAME">default.filter</tt>) should be installed as the new defaults, but all previously installed
+            configuration files should be preserved as backups. This is just good manners :-) These files are likely to
+            change between releases and contain important new features and bug fixes.</p>
+          </li>
+          <li>
+            <p>Please check platform specific notes in this doc, if you haven't done <span class=
+            "QUOTE">"Privoxy"</span> packaging before for other platform specific issues. Conversely, please add any
+            notes that you know are important for your platform (or contact one of the doc maintainers to do this if
+            you can't).</p>
+          </li>
+          <li>
+            <p>Packagers should do a <span class="QUOTE">"clean"</span> install of their package after building it. So
+            any previous installs should be removed first to ensure the integrity of the newly built package. Then run
+            the package for a while to make sure there are no obvious problems, before uploading.</p>
+          </li>
+        </ul>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="NEWRELEASE-TARBALL" id="NEWRELEASE-TARBALL">6.3.2. Source Tarball</a></h3>
+        <p>First, <span class="emphasis"><i class="EMPHASIS">make sure that you have freshly exported the right version
+        into an empty directory</i></span>. (See "Building and releasing packages" above). Then run:</p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">  cd current
+  autoheader &#38;&#38; autoconf &#38;&#38; ./configure</pre>
+            </td>
+          </tr>
+        </table>
+        <p>Then do:</p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">  make tarball-dist</pre>
+            </td>
+          </tr>
+        </table>
+        <p>To upload the package to Sourceforge, simply issue</p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">  make tarball-upload</pre>
+            </td>
+          </tr>
+        </table>
+        <p>Go to the displayed URL and release the file publicly on Sourceforge. For the change log field, use the
+        relevant section of the <tt class="FILENAME">ChangeLog</tt> file.</p>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="NEWRELEASE-RPM" id="NEWRELEASE-RPM">6.3.3. SuSE, Conectiva or Red Hat RPM</a></h3>
+        <p>In following text, replace <tt class="REPLACEABLE"><i>dist</i></tt> with either <span class=
+        "QUOTE">"rh"</span> for Red Hat or <span class="QUOTE">"suse"</span> for SuSE.</p>
+        <p>First, <span class="emphasis"><i class="EMPHASIS">make sure that you have freshly exported the right version
+        into an empty directory</i></span>. (See "Building and releasing packages" above).</p>
+        <p>As the only exception to not changing anything after export from Git, now examine the file <tt class=
+        "FILENAME">privoxy-</tt><tt class="REPLACEABLE"><i>dist</i></tt><tt class="FILENAME">.spec</tt> 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 <tt class=
+        "REPLACEABLE"><i>dist</i></tt> which is built from version X.Y.Z. Check the <a href=
+        "https://sourceforge.net/project/showfiles.php?group_id=11118" target="_top">file list</a> if unsure. Else, it
+        must be set to the highest already available RPM release number for that version plus one.</p>
+        <p>Then run:</p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">  cd current
+  autoheader &#38;&#38; autoconf &#38;&#38; ./configure</pre>
+            </td>
+          </tr>
+        </table>
+        <p>Then do</p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">  make <tt class="REPLACEABLE"><i>dist</i></tt>-dist</pre>
+            </td>
+          </tr>
+        </table>
+        <p>To upload the package to Sourceforge, simply issue</p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">  make <tt class="REPLACEABLE"><i>dist</i></tt>-upload <tt class=
+              "REPLACEABLE"><i>rpm_packagerev</i></tt></pre>
+            </td>
+          </tr>
+        </table>
+        <p>where <tt class="REPLACEABLE"><i>rpm_packagerev</i></tt> 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.</p>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="NEWRELEASE-OS2" id="NEWRELEASE-OS2">6.3.4. OS/2</a></h3>
+        <p>First, <span class="emphasis"><i class="EMPHASIS">make sure that you have freshly exported the right version
+        into an empty directory</i></span>. (See "Building and releasing packages" above). Then get the OS/2 Setup
+        module:</p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class=
+              "PROGRAMLISTING">  cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co os2setup</pre>
+            </td>
+          </tr>
+        </table>
+        <p>You will need a mix of development tools. The main compilation takes place with IBM Visual Age C++. Some
+        ancillary work takes place with GNU tools, available from various sources like hobbes.nmsu.edu. Specificially,
+        you will need <tt class="FILENAME">autoheader</tt>, <tt class="FILENAME">autoconf</tt> and <tt class=
+        "FILENAME">sh</tt> tools. The packaging takes place with WarpIN, available from various sources, including its
+        home page: <a href="http://www.xworkplace.org/" target="_top">xworkplace</a>.</p>
+        <p>Change directory to the <tt class="FILENAME">os2setup</tt> directory. Edit the os2build.cmd file to set the
+        final executable filename. For example,</p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">  installExeName='privoxyos2_setup_X.Y.Z.exe'</pre>
+            </td>
+          </tr>
+        </table>
+        <p>Next, edit the <tt class="FILENAME">IJB.wis</tt> file so the release number matches in the <tt class=
+        "FILENAME">PACKAGEID</tt> section:</p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">  PACKAGEID="Privoxy Team\Privoxy\Privoxy Package\X\Y\Z"</pre>
+            </td>
+          </tr>
+        </table>
+        <p>You're now ready to build. Run:</p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">  os2build</pre>
+            </td>
+          </tr>
+        </table>
+        <p>You will find the WarpIN-installable executable in the <tt class="FILENAME">./files</tt> directory. Upload
+        this anonymously to <tt class="FILENAME">uploads.sourceforge.net/incoming</tt>, create a release for it, and
+        you're done. Use the release notes and Change Log from the source tarball package.</p>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="NEWRELEASE-SOLARIS" id="NEWRELEASE-SOLARIS">6.3.5. Solaris</a></h3>
+        <p>Login to Sourceforge's compilefarm via ssh:</p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">  ssh cf.sourceforge.net</pre>
+            </td>
+          </tr>
+        </table>
+        <p>Choose the right operating system (not the Debian one). When logged in, <span class="emphasis"><i class=
+        "EMPHASIS">make sure that you have freshly exported the right version into an empty directory</i></span>. (See
+        "Building and releasing packages" above). Then run:</p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">  cd current
+  autoheader &#38;&#38; autoconf &#38;&#38; ./configure</pre>
+            </td>
+          </tr>
+        </table>
+        <p>Then run</p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">  gmake solaris-dist</pre>
+            </td>
+          </tr>
+        </table>
+        <p>which creates a gzip'ed tar archive. Sadly, you cannot use <b class="COMMAND">make solaris-upload</b> on the
+        Sourceforge machine (no ncftpput). You now have to manually upload the archive to Sourceforge's ftp server and
+        release the file publicly. Use the release notes and Change Log from the source tarball package.</p>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="NEWRELEASE-WINDOWS" id="NEWRELEASE-WINDOWS">6.3.6. Windows</a></h3>
+        <p>Note that the docbook generated files might need some hand editing, so the Windows build makefile does not
+        rebuild the docs.</p>
+        <p>First, <span class="emphasis"><i class="EMPHASIS">make sure that you have freshly exported the right version
+        into an empty directory</i></span>. (See "Building and releasing packages" above).</p>
+        <p>Then you can build the package. This is fully automated, and is controlled by <tt class=
+        "FILENAME">windows/GNUmakefile</tt>. All you need to do is:</p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">  cd windows
+  make</pre>
+            </td>
+          </tr>
+        </table>
+        <p>Now you can manually rename <tt class="FILENAME">privoxy_setup.exe</tt> to <tt class=
+        "FILENAME">privoxy_setup_X.Y.Z.exe</tt>, and the <tt class="FILENAME">build</tt> directory to <tt class=
+        "FILENAME">privoxy_X.Y.Z</tt>. Create a .zip file of the newly renamed <tt class="FILENAME">privoxy_X.Y.Z</tt>
+        directory, GPG sign the installer and zip file,</p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">  $ gpg --armor --detach --sign <tt class=
+              "FILENAME">privoxy_setup_X.Y.Z.exe</tt>
+  $ gpg --armor --detach --sign <tt class="FILENAME">privoxy_X.Y.Z.zip</tt></pre>
+            </td>
+          </tr>
+        </table>
+        <p>and upload the files to SourceForge.</p>
+        <p>When releasing the package on SourceForge, use the release notes and Change Log from the source tarball
+        package.</p>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="NEWRELEASE-DEBIAN" id="NEWRELEASE-DEBIAN">6.3.7. Debian</a></h3>
+        <p>First, <span class="emphasis"><i class="EMPHASIS">make sure that you have freshly exported the right version
+        into an empty directory</i></span>. (See "Building and releasing packages" above). Then add a log entry to
+        <tt class="FILENAME">debian/changelog</tt>, if it is not already there, for example by running:</p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">  debchange -v 3.0.27-UNRELEASED-1 "New upstream version"</pre>
+            </td>
+          </tr>
+        </table>
+        <p>Then, run:</p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">  dpkg-buildpackage -rfakeroot -us -uc -b</pre>
+            </td>
+          </tr>
+        </table>
+        <p>This will create <tt class="FILENAME">../privoxy_3.0.27-UNRELEASED-1_i386.deb</tt> which can be uploaded. To
+        upload the package to Sourceforge, simply issue</p>
+        <table border="0" bgcolor="#E0E0E0" width="100%">
+          <tr>
+            <td>
+              <pre class="PROGRAMLISTING">  make debian-upload</pre>
+            </td>
+          </tr>
+        </table>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="NEWRELEASE-MACOSX" id="NEWRELEASE-MACOSX">6.3.8. Mac OS X</a></h3>
+        <p>First, <span class="emphasis"><i class="EMPHASIS">make sure that you have freshly exported the right version
+        into an empty directory</i></span>. (See "Building and releasing packages" above).</p>
+        <p>There are three modules available in the Git 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).</p>
+        <div class="SECT4">
+          <h4 class="SECT4"><a name="OS-X-OSXPACKAGEBUILDER-MODULE" id="OS-X-OSXPACKAGEBUILDER-MODULE">6.3.8.1.
+          OSXPackageBuilder module</a></h4>
+          <p>The OSXPackageBuilder module generates OS X installer packages supporting all Macs running OS X 10.4 and
+          above. Obtain it from Git as follows into a folder parallel to the exported privoxy source:</p>
+          <table border="0" bgcolor="#E0E0E0" width="100%">
+            <tr>
+              <td>
+                <pre class=
+                "PROGRAMLISTING">  cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co OSXPackageBuilder</pre>
+              </td>
+            </tr>
+          </table>
+          <p>The module contains complete instructions on its usage in the file <tt class="FILENAME">OS X Package
+          Builder HOWTO.txt</tt>.</p>
+          <p>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.</p>
+        </div>
+        <div class="SECT4">
+          <h4 class="SECT4"><a name="OS-X-OSXSETUP-MODULE" id="OS-X-OSXSETUP-MODULE">6.3.8.2. osxsetup module
+          (DEPRECATED)</a></h4>
+          <p><span class="emphasis"><i class="EMPHASIS">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.</i></span></p>
+          <p>Check out the module from Git as follows into a folder parallel to the exported privoxy source:</p>
+          <table border="0" bgcolor="#E0E0E0" width="100%">
+            <tr>
+              <td>
+                <pre class=
+                "PROGRAMLISTING">  cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co osxsetup</pre>
+              </td>
+            </tr>
+          </table>
+          <p>Then run:</p>
+          <table border="0" bgcolor="#E0E0E0" width="100%">
+            <tr>
+              <td>
+                <pre class="PROGRAMLISTING">  cd osxsetup
+  build</pre>
+              </td>
+            </tr>
+          </table>
+          <p>This will run <tt class="FILENAME">autoheader</tt>, <tt class="FILENAME">autoconf</tt> and <tt class=
+          "FILENAME">configure</tt> as well as <tt class="FILENAME">make</tt>. Finally, it will copy over the necessary
+          files to the ./osxsetup/files directory for further processing by <tt class="FILENAME">PackageMaker</tt>.</p>
+          <p>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:</p>
+          <table border="0" bgcolor="#E0E0E0" width="100%">
+            <tr>
+              <td>
+                <pre class="PROGRAMLISTING">  zip -r privoxyosx_setup_x.y.z.zip Privoxy.pkg</pre>
+              </td>
+            </tr>
+          </table>
+          <p>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.</p>
+        </div>
+        <div class="SECT4">
+          <h4 class="SECT4"><a name="OS-X-MACSETUP-MODULE" id="OS-X-MACSETUP-MODULE">6.3.8.3. macsetup module</a></h4>
+          <p>The macsetup module is ideal if you wish to build and install Privoxy from source on a single machine.</p>
+          <p>Check out the module from Git as follows into a folder parallel to the exported privoxy source:</p>
+          <table border="0" bgcolor="#E0E0E0" width="100%">
+            <tr>
+              <td>
+                <pre class=
+                "PROGRAMLISTING">  cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co macsetup</pre>
+              </td>
+            </tr>
+          </table>
+          <p>The module contains complete instructions on its usage in its <tt class="FILENAME">README</tt> file. The
+          end result will be the exported version of Privoxy installed on the build machine.</p>
+        </div>
+      </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="NEWRELEASE-FREEBSD" id="NEWRELEASE-FREEBSD">6.3.9. FreeBSD</a></h3>
+        <p>Update the www/privoxy port and submit a diff upstream. For details see the <a href=
+        "https://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/" target="_top">FreeBSD Porter's
+        Handbook</a>.</p>
+      </div>
+    </div>
+    <div class="SECT2">
+      <h2 class="SECT2"><a name="RELEASING" id="RELEASING">6.4. Uploading and Releasing Your Package</a></h2>
+      <p>After the package is ready, it is time to upload it to SourceForge, and go through the release steps. The
+      upload is done via FTP:</p>
+      <ul>
+        <li>
+          <p>Upload to: <a href="ftp://upload.sourceforge.net/incoming" target=
+          "_top">ftp://upload.sourceforge.net/incoming</a></p>
+        </li>
+        <li>
+          <p>user: <tt class="LITERAL">anonymous</tt></p>
+        </li>
+        <li>
+          <p>password: <tt class="LITERAL">ijbswa-developers@lists.sourceforge.net</tt></p>
+        </li>
+      </ul>
+      <p>Or use the <b class="COMMAND">make</b> targets as described above.</p>
+      <p>Once this done go to <a href="https://sourceforge.net/project/admin/editpackages.php?group_id=11118" target=
+      "_top">https://sourceforge.net/project/admin/editpackages.php?group_id=11118</a>, making sure you are logged in.
+      Find your target platform in the second column, and click <tt class="LITERAL">Add Release</tt>. You will then
+      need to create a new release for your package, using the format of <tt class="LITERAL">$VERSION
+      ($CODE_STATUS)</tt>, e.g. <span class="emphasis"><i class="EMPHASIS">3.0.27 (beta)</i></span>.</p>
+      <p>Now just follow the prompts. Be sure to add any appropriate Release notes. You should see your freshly
+      uploaded packages in <span class="QUOTE">"Step 2. Add Files To This Release"</span>. Check the appropriate
+      box(es). Remember at each step to hit the <span class="QUOTE">"Refresh/Submit"</span> buttons! You should now see
+      your file(s) listed in Step 3. Fill out the forms with the appropriate information for your platform, being sure
+      to hit <span class="QUOTE">"Update"</span> for each file. If anyone is monitoring your platform, check the
+      <span class="QUOTE">"email"</span> box at the very bottom to notify them of the new package. This should do
+      it!</p>
+      <p>If you have made errors, or need to make changes, you can go through essentially the same steps, but select
+      <tt class="LITERAL">Edit Release</tt>, instead of <tt class="LITERAL">Add Release</tt>.</p>
+    </div>
+    <div class="SECT2">
+      <h2 class="SECT2"><a name="AFTERRELEASE" id="AFTERRELEASE">6.5. After the Release</a></h2>
+      <p>When all (or: most of the) packages have been uploaded and made available, send an email to the <a href=
+      "mailto:privoxy-announce@lists.privoxy.org" target="_top">announce mailing list</a>, Subject: "Version X.Y.Z
+      available for download". Be sure to include the <a href=
+      "https://sourceforge.net/project/showfiles.php?group_id=11118" target="_top">download location</a>, the release
+      notes and the Changelog. Also, post an updated News item on the project page Sourceforge, and update the Home
+      page and docs linked from the Home page (see below). Other news sites and release oriented sites, such as
+      Freshmeat, should also be notified.</p>
+      <p>Then update the source code for the next version to be released:</p>
+      <ul>
+        <li>
+          <p>Increment the version number and change the code status to "UNRELEASED" in <tt class=
+          "FILENAME">configure.in</tt></p>
+        </li>
+        <li>
+          <p>Rebuild configure (<span class="QUOTE">"<b class="COMMAND">autoheader &#38;&#38; autoconf</b>"</span>) and
+          GNUMakefile (<span class="QUOTE">"<b class="COMMAND">./configure</b>"</span>)</p>
+        </li>
+        <li>
+          <p><span class="QUOTE">"<b class="COMMAND">make dok-release</b>"</span> to update the sgml documentation
+          source files.</p>
+        </li>
+        <li>
+          <p>Commit all your changes.</p>
+        </li>
+      </ul>
+    </div>
+  </div>
+  <div class="NAVFOOTER">
+    <hr align="left" width="100%">
+    <table summary="Footer navigation table" width="100%" border="0" cellpadding="0" cellspacing="0">
+      <tr>
+        <td width="33%" align="left" valign="top"><a href="testing.html" accesskey="P">Prev</a></td>
+        <td width="34%" align="center" valign="top"><a href="index.html" accesskey="H">Home</a></td>
+        <td width="33%" align="right" valign="top"><a href="webserver-update.html" accesskey="N">Next</a></td>
+      </tr>
+      <tr>
+        <td width="33%" align="left" valign="top">Testing Guidelines</td>
+        <td width="34%" align="center" valign="top">&nbsp;</td>
+        <td width="33%" align="right" valign="top">Update the Webserver</td>
+      </tr>
+    </table>
+  </div>
+</body>
+</html>
index facbfef..46c398c 100644 (file)
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->Testing Guidelines</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="Privoxy Developer Manual"
-HREF="index.html"><LINK
-REL="PREVIOUS"
-TITLE="Coding Guidelines"
-HREF="coding.html"><LINK
-REL="NEXT"
-TITLE="Releasing a New Version"
-HREF="newrelease.html"><LINK
-REL="STYLESHEET"
-TYPE="text/css"
-HREF="../p_doc.css"><META
-HTTP-EQUIV="Content-Type"
-CONTENT="text/html;
-charset=ISO-8859-1"></HEAD
-><BODY
-CLASS="SECT1"
-BGCOLOR="#EEEEEE"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->Privoxy Developer Manual</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="coding.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="newrelease.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="TESTING"
->5. Testing Guidelines</A
-></H1
-><P
->To be filled.</P
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="TESTING-PLAN"
->5.1. Testplan for releases</A
-></H2
-><P
->       Explain release numbers. major, minor. developer releases. etc.
-      </P
-><P
-></P
-><OL
-TYPE="1"
-><LI
-><P
->Remove any existing rpm with rpm -e</P
-></LI
-><LI
-><P
->Remove any file that was left over. This includes (but is not limited to)
-          </P
-><P
-></P
-><UL
-><LI
-><P
->/var/log/privoxy</P
-></LI
-><LI
-><P
->/etc/privoxy</P
-></LI
-><LI
-><P
->/usr/sbin/privoxy</P
-></LI
-><LI
-><P
->/etc/init.d/privoxy</P
-></LI
-><LI
-><P
->/usr/doc/privoxy*</P
-></LI
-></UL
-></LI
-><LI
-><P
->Install the rpm. Any error messages?</P
-></LI
-><LI
-><P
->start,stop,status <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> with the specific script
-      (e.g. /etc/rc.d/init/privoxy stop). Reboot your machine. Does
-      autostart work?</P
-></LI
-><LI
-><P
->Start browsing. Does <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> work? Logfile written?</P
-></LI
-><LI
-><P
->Remove the rpm. Any error messages? All files removed?</P
-></LI
-></OL
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="FUZZING"
->5.2. Fuzzing Privoxy</A
-></H2
-><P
->       To make fuzzing more convenient, Privoxy can be configured
-       with --enable-fuzz which will result in the --fuzz option
-       becoming available.
-     </P
-><P
->      Example (tested on ElectroBSD):
-     </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-># Compile Privoxy with instrumentation for afl
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>Testing Guidelines</title>
+  <meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
+  <link rel="HOME" title="Privoxy Developer Manual" href="index.html">
+  <link rel="PREVIOUS" title="Coding Guidelines" href="coding.html">
+  <link rel="NEXT" title="Releasing a New Version" href="newrelease.html">
+  <link rel="STYLESHEET" type="text/css" href="../p_doc.css">
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+<body class="SECT1" bgcolor="#EEEEEE" text="#000000" link="#0000FF" vlink="#840084" alink="#0000FF">
+  <div class="NAVHEADER">
+    <table summary="Header navigation table" width="100%" border="0" cellpadding="0" cellspacing="0">
+      <tr>
+        <th colspan="3" align="center">Privoxy Developer Manual</th>
+      </tr>
+      <tr>
+        <td width="10%" align="left" valign="bottom"><a href="coding.html" accesskey="P">Prev</a></td>
+        <td width="80%" align="center" valign="bottom"></td>
+        <td width="10%" align="right" valign="bottom"><a href="newrelease.html" accesskey="N">Next</a></td>
+      </tr>
+    </table>
+    <hr align="left" width="100%">
+  </div>
+  <div class="SECT1">
+    <h1 class="SECT1"><a name="TESTING" id="TESTING">5. Testing Guidelines</a></h1>
+    <p>To be filled.</p>
+    <div class="SECT2">
+      <h2 class="SECT2"><a name="TESTING-PLAN" id="TESTING-PLAN">5.1. Testplan for releases</a></h2>
+      <p>Explain release numbers. major, minor. developer releases. etc.</p>
+      <ol type="1">
+        <li>
+          <p>Remove any existing rpm with rpm -e</p>
+        </li>
+        <li>
+          <p>Remove any file that was left over. This includes (but is not limited to)</p>
+          <ul>
+            <li>
+              <p>/var/log/privoxy</p>
+            </li>
+            <li>
+              <p>/etc/privoxy</p>
+            </li>
+            <li>
+              <p>/usr/sbin/privoxy</p>
+            </li>
+            <li>
+              <p>/etc/init.d/privoxy</p>
+            </li>
+            <li>
+              <p>/usr/doc/privoxy*</p>
+            </li>
+          </ul>
+        </li>
+        <li>
+          <p>Install the rpm. Any error messages?</p>
+        </li>
+        <li>
+          <p>start,stop,status <span class="APPLICATION">Privoxy</span> with the specific script (e.g.
+          /etc/rc.d/init/privoxy stop). Reboot your machine. Does autostart work?</p>
+        </li>
+        <li>
+          <p>Start browsing. Does <span class="APPLICATION">Privoxy</span> work? Logfile written?</p>
+        </li>
+        <li>
+          <p>Remove the rpm. Any error messages? All files removed?</p>
+        </li>
+      </ol>
+    </div>
+    <div class="SECT2">
+      <h2 class="SECT2"><a name="FUZZING" id="FUZZING">5.2. Fuzzing Privoxy</a></h2>
+      <p>To make fuzzing more convenient, Privoxy can be configured with --enable-fuzz which will result in the --fuzz
+      option becoming available.</p>
+      <p>Example (tested on ElectroBSD):</p>
+      <table border="0" bgcolor="#E0E0E0" width="100%">
+        <tr>
+          <td>
+            <pre class="PROGRAMLISTING"># Compile Privoxy with instrumentation for afl
 $ export CC=afl-clang
 $ export CFLAGS="-fsanitize=address -ggdb"
 $ export CPPFLAGS=-I/usr/local/include/
@@ -228,70 +126,26 @@ $ cat &#62;input/pcrs.txt
 FILTER: bla fasel
 s@(.{1})[432](\d+)@$1$2$hostname@UgisT
 
-$ afl-fuzz -i input/ -o output/ -f bla.filter -m none privoxy --fuzz filter bla.filter --stfu</PRE
-></TD
-></TR
-></TABLE
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="coding.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="newrelease.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Coding Guidelines</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Releasing a New Version</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
+$ afl-fuzz -i input/ -o output/ -f bla.filter -m none privoxy --fuzz filter bla.filter --stfu</pre>
+          </td>
+        </tr>
+      </table>
+    </div>
+  </div>
+  <div class="NAVFOOTER">
+    <hr align="left" width="100%">
+    <table summary="Footer navigation table" width="100%" border="0" cellpadding="0" cellspacing="0">
+      <tr>
+        <td width="33%" align="left" valign="top"><a href="coding.html" accesskey="P">Prev</a></td>
+        <td width="34%" align="center" valign="top"><a href="index.html" accesskey="H">Home</a></td>
+        <td width="33%" align="right" valign="top"><a href="newrelease.html" accesskey="N">Next</a></td>
+      </tr>
+      <tr>
+        <td width="33%" align="left" valign="top">Coding Guidelines</td>
+        <td width="34%" align="center" valign="top">&nbsp;</td>
+        <td width="33%" align="right" valign="top">Releasing a New Version</td>
+      </tr>
+    </table>
+  </div>
+</body>
+</html>
index e98fba7..5183b2b 100644 (file)
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->Update the Webserver</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="Privoxy Developer Manual"
-HREF="index.html"><LINK
-REL="PREVIOUS"
-TITLE="Releasing a New Version"
-HREF="newrelease.html"><LINK
-REL="STYLESHEET"
-TYPE="text/css"
-HREF="../p_doc.css"><META
-HTTP-EQUIV="Content-Type"
-CONTENT="text/html;
-charset=ISO-8859-1"></HEAD
-><BODY
-CLASS="SECT1"
-BGCOLOR="#EEEEEE"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->Privoxy Developer Manual</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="newrelease.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
->&nbsp;</TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="WEBSERVER-UPDATE"
->7. Update the Webserver</A
-></H1
-><P
->    The webserver should be updated at least with each stable release. When
-    updating, please follow these steps to make sure that no broken links,
-    inconsistent contents or permission problems will occur (as it has many
-    times in the past!):
-   </P
-><P
->    If you have changed anything in the stable-branch documentation source
-    SGML files, do:
-   </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  make dok</PRE
-></TD
-></TR
-></TABLE
-><P
->    That will generate <TT
-CLASS="FILENAME"
->doc/webserver/user-manual</TT
->,
-    <TT
-CLASS="FILENAME"
->doc/webserver/developer-manual</TT
->,
-    <TT
-CLASS="FILENAME"
->doc/webserver/faq</TT
->,
-    <TT
-CLASS="FILENAME"
->doc/webserver/index.html</TT
-> automatically.
-   </P
-><P
->    If you changed the manual page sources, generate
-    <TT
-CLASS="FILENAME"
->doc/webserver/man-page/privoxy-man-page.html</TT
->
-    by running <SPAN
-CLASS="QUOTE"
->"<B
-CLASS="COMMAND"
->make man</B
->"</SPAN
->. (This is
-    a separate target due to dependencies on some obscure perl scripts
-    [now in Git, but not well tested]. See comments in <TT
-CLASS="FILENAME"
->GNUmakefile</TT
->.)
-   </P
-><P
->    If you want to add new files to the webserver, create them locally in
-    the <TT
-CLASS="FILENAME"
->doc/webserver/*</TT
-> directory (or
-    create new directories under <TT
-CLASS="FILENAME"
->doc/webserver</TT
->).
-   </P
-><P
->    Next, commit any changes from the above steps to Git. All set?
-    If these are docs in the stable branch, then do:
-   </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  make webserver</PRE
-></TD
-></TR
-></TABLE
-><P
->    This will do the upload to <A
-HREF="https://www.privoxy.org/"
-TARGET="_top"
->the
-    webserver</A
-> (www.privoxy.org) and ensure all files and directories
-    there are group writable.
-   </P
-><P
->    Please do <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->NOT</I
-></SPAN
-> 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.
-   </P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="newrelease.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Releasing a New Version</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->&nbsp;</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>Update the Webserver</title>
+  <meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
+  <link rel="HOME" title="Privoxy Developer Manual" href="index.html">
+  <link rel="PREVIOUS" title="Releasing a New Version" href="newrelease.html">
+  <link rel="STYLESHEET" type="text/css" href="../p_doc.css">
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+<body class="SECT1" bgcolor="#EEEEEE" text="#000000" link="#0000FF" vlink="#840084" alink="#0000FF">
+  <div class="NAVHEADER">
+    <table summary="Header navigation table" width="100%" border="0" cellpadding="0" cellspacing="0">
+      <tr>
+        <th colspan="3" align="center">Privoxy Developer Manual</th>
+      </tr>
+      <tr>
+        <td width="10%" align="left" valign="bottom"><a href="newrelease.html" accesskey="P">Prev</a></td>
+        <td width="80%" align="center" valign="bottom"></td>
+        <td width="10%" align="right" valign="bottom">&nbsp;</td>
+      </tr>
+    </table>
+    <hr align="left" width="100%">
+  </div>
+  <div class="SECT1">
+    <h1 class="SECT1"><a name="WEBSERVER-UPDATE" id="WEBSERVER-UPDATE">7. Update the Webserver</a></h1>
+    <p>The webserver should be updated at least with each stable release. When updating, please follow these steps to
+    make sure that no broken links, inconsistent contents or permission problems will occur (as it has many times in
+    the past!):</p>
+    <p>If you have changed anything in the stable-branch documentation source SGML files, do:</p>
+    <table border="0" bgcolor="#E0E0E0" width="100%">
+      <tr>
+        <td>
+          <pre class="PROGRAMLISTING">  make dok</pre>
+        </td>
+      </tr>
+    </table>
+    <p>That will generate <tt class="FILENAME">doc/webserver/user-manual</tt>, <tt class=
+    "FILENAME">doc/webserver/developer-manual</tt>, <tt class="FILENAME">doc/webserver/faq</tt>, <tt class=
+    "FILENAME">doc/webserver/index.html</tt> automatically.</p>
+    <p>If you changed the manual page sources, generate <tt class=
+    "FILENAME">doc/webserver/man-page/privoxy-man-page.html</tt> by running <span class="QUOTE">"<b class=
+    "COMMAND">make man</b>"</span>. (This is a separate target due to dependencies on some obscure perl scripts [now in
+    Git, but not well tested]. See comments in <tt class="FILENAME">GNUmakefile</tt>.)</p>
+    <p>If you want to add new files to the webserver, create them locally in the <tt class=
+    "FILENAME">doc/webserver/*</tt> directory (or create new directories under <tt class=
+    "FILENAME">doc/webserver</tt>).</p>
+    <p>Next, commit any changes from the above steps to Git. All set? If these are docs in the stable branch, then
+    do:</p>
+    <table border="0" bgcolor="#E0E0E0" width="100%">
+      <tr>
+        <td>
+          <pre class="PROGRAMLISTING">  make webserver</pre>
+        </td>
+      </tr>
+    </table>
+    <p>This will do the upload to <a href="https://www.privoxy.org/" target="_top">the webserver</a> (www.privoxy.org)
+    and ensure all files and directories there are group writable.</p>
+    <p>Please do <span class="emphasis"><i class="EMPHASIS">NOT</i></span> 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.</p>
+  </div>
+  <div class="NAVFOOTER">
+    <hr align="left" width="100%">
+    <table summary="Footer navigation table" width="100%" border="0" cellpadding="0" cellspacing="0">
+      <tr>
+        <td width="33%" align="left" valign="top"><a href="newrelease.html" accesskey="P">Prev</a></td>
+        <td width="34%" align="center" valign="top"><a href="index.html" accesskey="H">Home</a></td>
+        <td width="33%" align="right" valign="top">&nbsp;</td>
+      </tr>
+      <tr>
+        <td width="33%" align="left" valign="top">Releasing a New Version</td>
+        <td width="34%" align="center" valign="top">&nbsp;</td>
+        <td width="33%" align="right" valign="top">&nbsp;</td>
+      </tr>
+    </table>
+  </div>
+</body>
+</html>
index b9f3870..76ce468 100644 (file)
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->Configuration</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="Privoxy Frequently Asked Questions"
-HREF="index.html"><LINK
-REL="PREVIOUS"
-TITLE="Installation"
-HREF="installation.html"><LINK
-REL="NEXT"
-TITLE="Miscellaneous"
-HREF="misc.html"><LINK
-REL="STYLESHEET"
-TYPE="text/css"
-HREF="../p_doc.css"><META
-HTTP-EQUIV="Content-Type"
-CONTENT="text/html;
-charset=ISO-8859-1"></HEAD
-><BODY
-CLASS="SECT1"
-BGCOLOR="#EEEEEE"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->Privoxy Frequently Asked Questions</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="installation.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="misc.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="CONFIGURATION"
->3. Configuration</A
-></H1
-><DIV
-CLASS="SECT2"
-><H3
-CLASS="SECT2"
-><A
-NAME="ACTIONSFILE"
->3.1. What exactly is an <SPAN
-CLASS="QUOTE"
->"actions"</SPAN
-> file?</A
-></H3
-><P
-> <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> utilizes the concept of <SPAN
-CLASS="QUOTE"
->" <A
-HREF="../user-manual/actions-file.html#ACTIONS"
-TARGET="_top"
->actions</A
->"</SPAN
->
- that are used to manipulate and control web page data.
- <A
-HREF="../user-manual/actions-file.html"
-TARGET="_top"
->Actions files</A
->
- are where these <A
-HREF="../user-manual/actions-file.html#ACTIONS"
-TARGET="_top"
->actions</A
->
- that <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> could take while processing a certain
- request, are configured. Typically, you would define a set of default actions
- that apply globally to all URLs, then add exceptions to these defaults where needed.
- There is a wide array of actions available that give the user a high degree
- of control and flexibility on how to process each and every web page.</P
-><P
-> Actions can be defined on a <A
-HREF="../user-manual/actions-file.html#AF-PATTERNS"
-TARGET="_top"
->URL pattern</A
-> basis, i.e.
- for single URLs, whole web sites, groups or parts thereof etc. Actions can also be
- grouped together and then applied to requests matching one or more patterns.
- There are many possible actions that might apply to any given site. As an example,
- if you are blocking <A
-HREF="http://en.wikipedia.org/wiki/Browser_cookie"
-TARGET="_top"
->cookies</A
->
- as one of your default actions, but need to accept cookies from a given site,
- you would need to define an exception for this site in one of your actions
- files, preferably in <TT
-CLASS="FILENAME"
->user.action</TT
->.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H3
-CLASS="SECT2"
-><A
-NAME="ACTIONSS"
->3.2. The <SPAN
-CLASS="QUOTE"
->"actions"</SPAN
-> concept confuses me. Please list
-some of these <SPAN
-CLASS="QUOTE"
->"actions"</SPAN
->.</A
-></H3
-><P
-> For a comprehensive discussion of the actions concept, please refer
- to the <A
-HREF="../user-manual/actions-file.html"
-TARGET="_top"
->actions file
- chapter</A
-> in the <A
-HREF="../user-manual/index.html"
-TARGET="_top"
->User
- Manual</A
->. It includes a <A
-HREF="../user-manual/actions-file.html#ACTIONS"
-TARGET="_top"
->list of all actions</A
->
- and an <A
-HREF="../user-manual/actions-file.html#ACT-EXAMPLES"
-TARGET="_top"
->actions
- file tutorial</A
-> to get you started.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H3
-CLASS="SECT2"
-><A
-NAME="ACTCONFIG"
->3.3. How are actions files configured? What is the easiest
-way to do this?</A
-></H3
-><P
-> Actions files are just text files in a special syntax and can be edited
- with a text editor. But probably the easiest way is to access
- <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
->'s user interface with your web browser
- at <A
-HREF="http://config.privoxy.org/"
-TARGET="_top"
->http://config.privoxy.org/</A
->
- (Shortcut: <A
-HREF="http://p.p/"
-TARGET="_top"
->http://p.p/</A
->) and then select
- <SPAN
-CLASS="QUOTE"
->"<A
-HREF="http://config.privoxy.org/show-status"
-TARGET="_top"
->View &#38;
- change the current configuration</A
->"</SPAN
-> from the menu. Note
- that this feature must be explicitly enabled in the main config file
- (see <A
-HREF="../user-manual/config.html#ENABLE-EDIT-ACTIONS"
-TARGET="_top"
->enable-edit-actions</A
->).</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H3
-CLASS="SECT2"
-><A
-NAME="AEN419"
->3.4. There are several different <SPAN
-CLASS="QUOTE"
->"actions"</SPAN
-> files. What are
-the differences?</A
-></H3
-><P
-> Please have a look at the <A
-HREF="../user-manual/actions-file.html"
-TARGET="_top"
->the actions chapter</A
->
- in the <A
-HREF="../user-manual/index.html"
-TARGET="_top"
->User Manual</A
-> for a detailed explanation.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H3
-CLASS="SECT2"
-><A
-NAME="GETUPDATES"
->3.5. Where can I get updated Actions Files?</A
-></H3
-><P
->  Based on your feedback and the continuing development, updates of
-  <TT
-CLASS="FILENAME"
->default.action</TT
-> will be
-  made available from time to time on the <A
-HREF="https://sourceforge.net/project/showfiles.php?group_id=11118"
-TARGET="_top"
->files section</A
-> of
-  our <A
-HREF="https://sourceforge.net/projects/ijbswa/"
-TARGET="_top"
->project page</A
->.
- </P
-><P
->  If you wish to receive an email notification whenever we release updates of
-  <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> or the actions file, <A
-HREF="https://lists.privoxy.org/mailman/listinfo/privoxy-announce"
-TARGET="_top"
->subscribe
-  to our announce mailing list</A
->, privoxy-announce@lists.privoxy.org.
- </P
-></DIV
-><DIV
-CLASS="SECT2"
-><H3
-CLASS="SECT2"
-><A
-NAME="NEWCONFIG"
->3.6. Can I use my old config files?</A
-></H3
-><P
->  The syntax and purpose of configuration files has remained roughly the
-  same throughout the 3.x series, but backwards compatibility is not guaranteed.
-  Also each release contains updated, <SPAN
-CLASS="QUOTE"
->"improved"</SPAN
-> versions and it is
-  therefore strongly recommended to install the newer configuration files
-  and merge back your modifications.
- </P
-></DIV
-><DIV
-CLASS="SECT2"
-><H3
-CLASS="SECT2"
-><A
-NAME="DIFFICULT"
->3.7. Why is the configuration so complicated?</A
-></H3
-><P
->  <SPAN
-CLASS="QUOTE"
->"Complicated"</SPAN
-> is in the eye of the beholder.
- </P
-><P
->  Privoxy is currently mainly written by and for people who are already
-  familiar with the underlying concepts like regular expressions, HTTP and HTML,
-  or are willing to become familiar with them to be able to get the most
-  out of a powerful and flexible tool such as Privoxy.
- </P
-><P
->  While everybody is expected to be able to get a Privoxy default installation
-  up and running, fine-tuning requires a certain amount of background
-  information and Privoxy's documentation mainly concentrates on the
-  Privoxy-specific parts while only providing references to the rest.
- </P
-><P
->  If you or anyone you know has the skills, time and energy to
-  reduce the barrier of entry, please <A
-HREF="general.html#PARTICIPATE"
->get involved</A
->.
- </P
-></DIV
-><DIV
-CLASS="SECT2"
-><H3
-CLASS="SECT2"
-><A
-NAME="YAHOO"
->3.8. How can I make my Yahoo/Hotmail/Gmail account work?</A
-></H3
-><P
->  The default configuration shouldn't impact the usability of any of these services.
-  It may, however, make all <A
-HREF="http://en.wikipedia.org/wiki/Browser_cookie"
-TARGET="_top"
->cookies</A
->
-  temporary, so that your browser will forget your
-  login credentials in between browser sessions. If you would like not to have to log
-  in manually each time you access those websites, simply turn off all cookie handling
-  for them in the <TT
-CLASS="FILENAME"
->user.action</TT
-> file. An example for yahoo might
-  look like:
- </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
-># Allow all cookies for Yahoo login:
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>Configuration</title>
+  <meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
+  <link rel="HOME" title="Privoxy Frequently Asked Questions" href="index.html">
+  <link rel="PREVIOUS" title="Installation" href="installation.html">
+  <link rel="NEXT" title="Miscellaneous" href="misc.html">
+  <link rel="STYLESHEET" type="text/css" href="../p_doc.css">
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+<body class="SECT1" bgcolor="#EEEEEE" text="#000000" link="#0000FF" vlink="#840084" alink="#0000FF">
+  <div class="NAVHEADER">
+    <table summary="Header navigation table" width="100%" border="0" cellpadding="0" cellspacing="0">
+      <tr>
+        <th colspan="3" align="center">Privoxy Frequently Asked Questions</th>
+      </tr>
+      <tr>
+        <td width="10%" align="left" valign="bottom"><a href="installation.html" accesskey="P">Prev</a></td>
+        <td width="80%" align="center" valign="bottom"></td>
+        <td width="10%" align="right" valign="bottom"><a href="misc.html" accesskey="N">Next</a></td>
+      </tr>
+    </table>
+    <hr align="left" width="100%">
+  </div>
+  <div class="SECT1">
+    <h1 class="SECT1"><a name="CONFIGURATION" id="CONFIGURATION">3. Configuration</a></h1>
+    <div class="SECT2">
+      <h3 class="SECT2"><a name="ACTIONSFILE" id="ACTIONSFILE">3.1. What exactly is an <span class=
+      "QUOTE">"actions"</span> file?</a></h3>
+      <p><span class="APPLICATION">Privoxy</span> utilizes the concept of <span class="QUOTE">" <a href=
+      "../user-manual/actions-file.html#ACTIONS" target="_top">actions</a>"</span> that are used to manipulate and
+      control web page data. <a href="../user-manual/actions-file.html" target="_top">Actions files</a> are where these
+      <a href="../user-manual/actions-file.html#ACTIONS" target="_top">actions</a> that <span class=
+      "APPLICATION">Privoxy</span> could take while processing a certain request, are configured. Typically, you would
+      define a set of default actions that apply globally to all URLs, then add exceptions to these defaults where
+      needed. There is a wide array of actions available that give the user a high degree of control and flexibility on
+      how to process each and every web page.</p>
+      <p>Actions can be defined on a <a href="../user-manual/actions-file.html#AF-PATTERNS" target="_top">URL
+      pattern</a> basis, i.e. for single URLs, whole web sites, groups or parts thereof etc. Actions can also be
+      grouped together and then applied to requests matching one or more patterns. There are many possible actions that
+      might apply to any given site. As an example, if you are blocking <a href=
+      "http://en.wikipedia.org/wiki/Browser_cookie" target="_top">cookies</a> as one of your default actions, but need
+      to accept cookies from a given site, you would need to define an exception for this site in one of your actions
+      files, preferably in <tt class="FILENAME">user.action</tt>.</p>
+    </div>
+    <div class="SECT2">
+      <h3 class="SECT2"><a name="ACTIONSS" id="ACTIONSS">3.2. The <span class="QUOTE">"actions"</span> concept confuses
+      me. Please list some of these <span class="QUOTE">"actions"</span>.</a></h3>
+      <p>For a comprehensive discussion of the actions concept, please refer to the <a href=
+      "../user-manual/actions-file.html" target="_top">actions file chapter</a> in the <a href=
+      "../user-manual/index.html" target="_top">User Manual</a>. It includes a <a href=
+      "../user-manual/actions-file.html#ACTIONS" target="_top">list of all actions</a> and an <a href=
+      "../user-manual/actions-file.html#ACT-EXAMPLES" target="_top">actions file tutorial</a> to get you started.</p>
+    </div>
+    <div class="SECT2">
+      <h3 class="SECT2"><a name="ACTCONFIG" id="ACTCONFIG">3.3. How are actions files configured? What is the easiest
+      way to do this?</a></h3>
+      <p>Actions files are just text files in a special syntax and can be edited with a text editor. But probably the
+      easiest way is to access <span class="APPLICATION">Privoxy</span>'s user interface with your web browser at
+      <a href="http://config.privoxy.org/" target="_top">http://config.privoxy.org/</a> (Shortcut: <a href=
+      "http://p.p/" target="_top">http://p.p/</a>) and then select <span class="QUOTE">"<a href=
+      "http://config.privoxy.org/show-status" target="_top">View &#38; change the current configuration</a>"</span>
+      from the menu. Note that this feature must be explicitly enabled in the main config file (see <a href=
+      "../user-manual/config.html#ENABLE-EDIT-ACTIONS" target="_top">enable-edit-actions</a>).</p>
+    </div>
+    <div class="SECT2">
+      <h3 class="SECT2"><a name="AEN417" id="AEN417">3.4. There are several different <span class=
+      "QUOTE">"actions"</span> files. What are the differences?</a></h3>
+      <p>Please have a look at the <a href="../user-manual/actions-file.html" target="_top">the actions chapter</a> in
+      the <a href="../user-manual/index.html" target="_top">User Manual</a> for a detailed explanation.</p>
+    </div>
+    <div class="SECT2">
+      <h3 class="SECT2"><a name="GETUPDATES" id="GETUPDATES">3.5. Where can I get updated Actions Files?</a></h3>
+      <p>Based on your feedback and the continuing development, updates of <tt class="FILENAME">default.action</tt>
+      will be made available from time to time on the <a href=
+      "https://sourceforge.net/project/showfiles.php?group_id=11118" target="_top">files section</a> of our <a href=
+      "https://sourceforge.net/projects/ijbswa/" target="_top">project page</a>.</p>
+      <p>If you wish to receive an email notification whenever we release updates of <span class=
+      "APPLICATION">Privoxy</span> or the actions file, <a href=
+      "https://lists.privoxy.org/mailman/listinfo/privoxy-announce" target="_top">subscribe to our announce mailing
+      list</a>, privoxy-announce@lists.privoxy.org.</p>
+    </div>
+    <div class="SECT2">
+      <h3 class="SECT2"><a name="NEWCONFIG" id="NEWCONFIG">3.6. Can I use my old config files?</a></h3>
+      <p>The syntax and purpose of configuration files has remained roughly the same throughout the 3.x series, but
+      backwards compatibility is not guaranteed. Also each release contains updated, <span class=
+      "QUOTE">"improved"</span> versions and it is therefore strongly recommended to install the newer configuration
+      files and merge back your modifications.</p>
+    </div>
+    <div class="SECT2">
+      <h3 class="SECT2"><a name="DIFFICULT" id="DIFFICULT">3.7. Why is the configuration so complicated?</a></h3>
+      <p><span class="QUOTE">"Complicated"</span> is in the eye of the beholder.</p>
+      <p>Privoxy is currently mainly written by and for people who are already familiar with the underlying concepts
+      like regular expressions, HTTP and HTML, or are willing to become familiar with them to be able to get the most
+      out of a powerful and flexible tool such as Privoxy.</p>
+      <p>While everybody is expected to be able to get a Privoxy default installation up and running, fine-tuning
+      requires a certain amount of background information and Privoxy's documentation mainly concentrates on the
+      Privoxy-specific parts while only providing references to the rest.</p>
+      <p>If you or anyone you know has the skills, time and energy to reduce the barrier of entry, please <a href=
+      "general.html#PARTICIPATE">get involved</a>.</p>
+    </div>
+    <div class="SECT2">
+      <h3 class="SECT2"><a name="YAHOO" id="YAHOO">3.8. How can I make my Yahoo/Hotmail/Gmail account work?</a></h3>
+      <p>The default configuration shouldn't impact the usability of any of these services. It may, however, make all
+      <a href="http://en.wikipedia.org/wiki/Browser_cookie" target="_top">cookies</a> temporary, so that your browser
+      will forget your login credentials in between browser sessions. If you would like not to have to log in manually
+      each time you access those websites, simply turn off all cookie handling for them in the <tt class=
+      "FILENAME">user.action</tt> file. An example for yahoo might look like:</p>
+      <table border="0" bgcolor="#E0E0E0" width="100%">
+        <tr>
+          <td>
+            <pre class="SCREEN"># Allow all cookies for Yahoo login:
 #
-{ -<A
-HREF="../user-manual/actions-file.html#CRUNCH-INCOMING-COOKIES"
-TARGET="_top"
->crunch-incoming-cookies</A
-> -<A
-HREF="../user-manual/actions-file.html#CRUNCH-OUTGOING-COOKIES"
-TARGET="_top"
->crunch-outgoing-cookies</A
-> -<A
-HREF="../user-manual/actions-file.html#SESSION-COOKIES-ONLY"
-TARGET="_top"
->session-cookies-only</A
-> }
-.login.yahoo.com</PRE
-></TD
-></TR
-></TABLE
-><P
->  These kinds of sites are often quite complex and heavy with
-  <A
-HREF="http://en.wikipedia.org/wiki/Javascript"
-TARGET="_top"
->Javascript</A
-> and
-  thus <SPAN
-CLASS="QUOTE"
->"fragile"</SPAN
->. So if <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->still</I
-></SPAN
-> a problem,
-  we have an <A
-HREF="../user-manual/actions-file.html#ALIASES"
-TARGET="_top"
->alias</A
-> just for such
-  sticky situations:
- </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
-># Gmail is a _fragile_ site:
+{ -<a href="../user-manual/actions-file.html#CRUNCH-INCOMING-COOKIES" target=
+"_top">crunch-incoming-cookies</a> -<a href="../user-manual/actions-file.html#CRUNCH-OUTGOING-COOKIES" target=
+"_top">crunch-outgoing-cookies</a> -<a href="../user-manual/actions-file.html#SESSION-COOKIES-ONLY" target=
+"_top">session-cookies-only</a> }
+.login.yahoo.com</pre>
+          </td>
+        </tr>
+      </table>
+      <p>These kinds of sites are often quite complex and heavy with <a href="http://en.wikipedia.org/wiki/Javascript"
+      target="_top">Javascript</a> and thus <span class="QUOTE">"fragile"</span>. So if <span class=
+      "emphasis"><i class="EMPHASIS">still</i></span> a problem, we have an <a href=
+      "../user-manual/actions-file.html#ALIASES" target="_top">alias</a> just for such sticky situations:</p>
+      <table border="0" bgcolor="#E0E0E0" width="100%">
+        <tr>
+          <td>
+            <pre class="SCREEN"># Gmail is a _fragile_ site:
 #
-{ <TT
-CLASS="LITERAL"
->fragile</TT
-> }
+{ <tt class="LITERAL">fragile</tt> }
  # Gmail is ...
- mail.google.com</PRE
-></TD
-></TR
-></TABLE
-><P
->  Be sure to flush your browser's caches whenever making these kinds of
-  changes, just to make sure the changes <SPAN
-CLASS="QUOTE"
->"take"</SPAN
->.
- </P
-><P
->  Make sure the domain, host and path are appropriate as well. Your browser can
-  tell you where you are specifically and you should use that information for
-  your configuration settings. Note that above it is not referenced as
-  <TT
-CLASS="LITERAL"
->gmail.com</TT
->, which is a valid domain name.
- </P
-></DIV
-><DIV
-CLASS="SECT2"
-><H3
-CLASS="SECT2"
-><A
-NAME="CONFIGFILES"
->3.9. What's the difference between the
-<SPAN
-CLASS="QUOTE"
->"Cautious"</SPAN
->, <SPAN
-CLASS="QUOTE"
->"Medium"</SPAN
-> and <SPAN
-CLASS="QUOTE"
->"Advanced"</SPAN
-> defaults?</A
-></H3
-><P
->  Configuring <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> is not entirely trivial. To
-  help you get started, we provide you with three different default action
-  <SPAN
-CLASS="QUOTE"
->"profiles"</SPAN
-> in the web based actions file editor at <A
-HREF="http://config.privoxy.org/show-status"
-TARGET="_top"
->http://config.privoxy.org/show-status</A
->.
-  See the <A
-HREF="../user-manual/actions-file.html"
-TARGET="_top"
-><I
-CLASS="CITETITLE"
->User
-  Manual</I
-></A
-> for a list of actions, and how the default
-  profiles are set.
- </P
-><P
-> Where the defaults are likely to break some sites, exceptions for
- known popular <SPAN
-CLASS="QUOTE"
->"problem"</SPAN
-> 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
- <SPAN
-CLASS="QUOTE"
->"Cautious"</SPAN
-> setting. This is safest and will have the fewest
- problems. See the <A
-HREF="../user-manual/index.html"
-TARGET="_top"
-><I
-CLASS="CITETITLE"
->User Manual</I
-></A
->
- for a more detailed discussion.</P
-><P
-> It should be noted that the <SPAN
-CLASS="QUOTE"
->"Advanced"</SPAN
-> profile (formerly known
- as the <SPAN
-CLASS="QUOTE"
->"Adventuresome"</SPAN
-> profile) is more
- aggressive, and will make use of some of
- <SPAN
-CLASS="APPLICATION"
->Privoxy's</SPAN
-> advanced features. Use at your own risk!</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H3
-CLASS="SECT2"
-><A
-NAME="BROWSECONFIG"
->3.10. Why can I change the configuration
-with a browser? Does that not raise security issues?</A
-></H3
-><P
->  It may seem strange that regular users can edit the config files with their
-  browsers, although the whole <TT
-CLASS="FILENAME"
->/etc/privoxy</TT
-> hierarchy
-  belongs to the user <SPAN
-CLASS="QUOTE"
->"privoxy"</SPAN
->, with only 644 permissions.
- </P
-><P
->  When you use the browser-based editor, <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
->
-  itself is writing to the config files.  Because
-  <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> is running as the user <SPAN
-CLASS="QUOTE"
->"privoxy"</SPAN
->,
-  it can update its own config files.
- </P
-><P
->  If you run <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> for multiple untrusted users (e.g. in
-  a LAN) or aren't entirely in control of your own browser, you will probably want
-  to make sure that the web-based editor and remote toggle features are
-  <SPAN
-CLASS="QUOTE"
->"off"</SPAN
-> by setting <SPAN
-CLASS="QUOTE"
->"<TT
-CLASS="LITERAL"
-><A
-HREF="../user-manual/config.html#ENABLE-EDIT-ACTIONS"
-TARGET="_top"
->enable-edit-actions</A
->
-  0</TT
->"</SPAN
-> and <SPAN
-CLASS="QUOTE"
->"<TT
-CLASS="LITERAL"
-><A
-HREF="../user-manual/config.html#ENABLE-REMOTE-TOGGLE"
-TARGET="_top"
->enable-remote-toggle</A
->
-  0</TT
->"</SPAN
-> in the <A
-HREF="../user-manual/config.html"
-TARGET="_top"
->main configuration file</A
->.
- </P
-><P
->  As of <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> 3.0.7 these options are disabled by default.
- </P
-></DIV
-><DIV
-CLASS="SECT2"
-><H3
-CLASS="SECT2"
-><A
-NAME="FILTERFILE"
->3.11. What is the <TT
-CLASS="FILENAME"
->default.filter</TT
-> file? What is a <SPAN
-CLASS="QUOTE"
->"filter"</SPAN
->?</A
-></H3
-><P
-> The <A
-HREF="../user-manual/filter-file.html"
-TARGET="_top"
-><TT
-CLASS="FILENAME"
->default.filter</TT
-></A
->
- file is where <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->filters</I
-></SPAN
-> 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 <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->anything</I
-></SPAN
-> in the page source,
- header filters can be applied to either server or client headers.
- Regular expressions are used to accomplish this.</P
-><P
-> There are a number of pre-defined filters to deal with common annoyances. The
- filters are only defined here, to invoke them, you need to use the
- <A
-HREF="../user-manual/actions-file.html#FILTER"
-TARGET="_top"
-><TT
-CLASS="LITERAL"
->filter</TT
->
- action</A
-> in one of the actions files. Content filtering is automatically
- disabled for inappropriate MIME types, but if you know better than Privoxy
- what should or should not be filtered you can filter any content you like.</P
-><P
-> Filters should
- <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->not</I
-></SPAN
-> be confused with <A
-HREF="../user-manual/actions-file.html#BLOCK"
-TARGET="_top"
-><TT
-CLASS="LITERAL"
->blocks</TT
-></A
->, which
- is a completely different action, and is more typically used to block ads and
- unwanted sites.</P
-><P
-> If you are familiar with regular expressions, and HTML, you can look at
- the provided <TT
-CLASS="FILENAME"
->default.filter</TT
-> with a text editor and define
- your own filters.  This is potentially a very powerful feature, but
- requires some expertise in both regular expressions and HTML/HTTP.
-  You should
- place any modifications to the default filters, or any new ones you create
- in a separate file, such as <TT
-CLASS="FILENAME"
->user.filter</TT
->, so they won't
- be overwritten during upgrades.
- The ability to define multiple filter files
- in <TT
-CLASS="FILENAME"
->config</TT
-> is a new feature as of v. 3.0.5.</P
-><P
-> There is no GUI editor option for this part of the configuration,
- but you can disable/enable the various pre-defined filters of the included
- <TT
-CLASS="FILENAME"
->default.filter</TT
-> file with the <A
-HREF="http://config.privoxy.org/show-status"
-TARGET="_top"
->web-based actions file editor</A
->.
- Note that the custom actions editor must be explicitly enabled in
- the main config file (see <A
-HREF="../user-manual/config.html#ENABLE-EDIT-ACTIONS"
-TARGET="_top"
->enable-edit-actions</A
->).</P
-><P
-> If you intend to develop your own filters, you might want to have a look at
- <A
-HREF="https://www.fabiankeil.de/sourcecode/pft/"
-TARGET="_top"
->Privoxy-Filter-Test</A
->.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H3
-CLASS="SECT2"
-><A
-NAME="LANCONFIG"
->3.12. How can I set up Privoxy to act as a proxy for my
- LAN?</A
-></H3
-><P
-> By default, <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> only responds to requests
- from <TT
-CLASS="LITERAL"
->127.0.0.1</TT
-> (localhost). To have it act as a server for
- a network, this needs to be changed in the <A
-HREF="../user-manual/config.html"
-TARGET="_top"
->main configuration file</A
->. Look for
- the <TT
-CLASS="LITERAL"
-><A
-HREF="../user-manual/config.html#LISTEN-ADDRESS"
-TARGET="_top"
->listen-address</A
-></TT
->
- option, which may be commented out with a <SPAN
-CLASS="QUOTE"
->"#"</SPAN
-> symbol. Make sure
- it is uncommented, and assign it the address of the LAN gateway interface,
- and port number to use. Assuming your LAN address is 192.168.1.1 and you
- wish to run <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> on port 8118, this line
- should look like:</P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
->  listen-address  192.168.1.1:8118</PRE
-></TD
-></TR
-></TABLE
-><P
-> Save the file, and restart <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
->. Configure
- all browsers on the network then to use this address and port number.</P
-><P
-> Alternately, you can have <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> listen on
- all available interfaces:</P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
->  listen-address    :8118</PRE
-></TD
-></TR
-></TABLE
-><P
-> And then use <SPAN
-CLASS="APPLICATION"
->Privoxy's</SPAN
->
- <A
-HREF="../user-manual/config.html#PERMIT-ACCESS"
-TARGET="_top"
->permit-access</A
->
- feature to limit connections. A firewall in this situation is recommended
- as well.</P
-><P
-> The above steps should be the same for any TCP network, regardless of
- operating system.</P
-><P
-> If you run <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> on a LAN with untrusted users,
- we recommend that you double-check the <A
-HREF="../user-manual/config.html#ACCESS-CONTROL"
-TARGET="_top"
->access control and security</A
->
- options!</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H3
-CLASS="SECT2"
-><A
-NAME="NOSEEUM"
->3.13. Instead of ads, now I get a checkerboard pattern. I don't want to see anything.</A
-></H3
-><P
-> The replacement for blocked images can be controlled with the <A
-HREF="../user-manual/actions-file.html#SET-IMAGE-BLOCKER"
-TARGET="_top"
-><TT
-CLASS="LITERAL"
->set-image-blocker</TT
->
- action</A
->. You have the choice of a checkerboard pattern, a transparent 1x1 GIF
- image (aka <SPAN
-CLASS="QUOTE"
->"blank"</SPAN
->), or a redirect to a custom image of your choice.
- Note that this choice only has effect for images which are blocked as images, i.e.
- whose URLs match both a <TT
-CLASS="LITERAL"
-><A
-HREF="../user-manual/actions-file.html#HANDLE-AS-IMAGE"
-TARGET="_top"
->handle-as-image</A
-></TT
->
- <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->and</I
-></SPAN
-> <TT
-CLASS="LITERAL"
-><A
-HREF="../user-manual/actions-file.html#BLOCK"
-TARGET="_top"
->block</A
-></TT
-> action.</P
-><P
-> If you want to see nothing, then change the <A
-HREF="../user-manual/actions-file.html#SET-IMAGE-BLOCKER"
-TARGET="_top"
-><TT
-CLASS="LITERAL"
->set-image-blocker</TT
->
- action</A
-> to <SPAN
-CLASS="QUOTE"
->"blank"</SPAN
->. This can be done by editing the
- <TT
-CLASS="FILENAME"
->user.action</TT
-> file, or through the <A
-HREF="http://config.privoxy.org/show-status"
-TARGET="_top"
->web-based actions file editor</A
->.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H3
-CLASS="SECT2"
-><A
-NAME="WHYSEEUM"
->3.14. Why would anybody want to see a checkerboard pattern?</A
-></H3
-><P
-> Remember that <A
-HREF="general.html#WHATSANAD"
->telling which image is an ad and which
- isn't</A
->, is an educated guess. While we hope that the standard configuration
- is rather smart, it will make occasional mistakes. The checkerboard image is visually
- decent, and it shows you where images have been blocked, which can be very
- helpful in case some navigation aid or otherwise innocent image was
- erroneously blocked. It is recommended for new users so they can
- <SPAN
-CLASS="QUOTE"
->"see"</SPAN
-> what is happening. Some people might also enjoy seeing how
- many banners they <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->don't</I
-></SPAN
-> have to see.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H3
-CLASS="SECT2"
-><A
-NAME="BLOCKEDBYTEXT"
->3.15. I see some images being replaced with text
-instead of the checkerboard image. Why and how do I get rid of this?</A
-></H3
-><P
-> This happens when the banners are not embedded in the HTML code of the
- page itself, but in separate HTML (sub)documents that are loaded into (i)frames
- or (i)layers, and these external HTML documents are blocked. Being non-images
- they get replaced by a substitute HTML page rather than a substitute image,
- which wouldn't work out technically, since the browser expects and accepts
- only HTML when it has requested an HTML document.</P
-><P
-> The substitute page adapts to the available space and shows itself as a
- miniature two-liner if loaded into small frames, or full-blown with a
- large red "BLOCKED" banner if space allows.</P
-><P
-> If you prefer the banners to be blocked by images, you must see to it that
- the HTML documents in which they are embedded are not blocked. Clicking
- the <SPAN
-CLASS="QUOTE"
->"See why"</SPAN
-> link offered in the substitute page will show
- you which rule blocked the page. After changing the rule and un-blocking
- the HTML documents, the browser will try to load the actual banner images
- and the usual image blocking will (hopefully!) kick in.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H3
-CLASS="SECT2"
-><A
-NAME="SRVANY"
->3.16. Can Privoxy run as a service
-on Win2K/NT/XP?</A
-></H3
-><P
-> Yes. Version 3.0.5 introduces full <SPAN
-CLASS="APPLICATION"
->Windows</SPAN
-> service
- functionality. See <A
-HREF="../user-manual/installation.html#INSTALLATION-PACK-WIN"
-TARGET="_top"
-> the <I
-CLASS="CITETITLE"
->User Manual</I
-></A
-> for details on how to install and configure
- <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> as a service.</P
-><P
-> Earlier 3.x versions could run as a system service using <B
-CLASS="COMMAND"
->srvany.exe</B
->.
- See the discussion at <A
-HREF="https://sourceforge.net/tracker/?func=detail&#38;atid=361118&#38;aid=485617&#38;group_id=11118"
-TARGET="_top"
->https://sourceforge.net/tracker/?func=detail&#38;atid=361118&#38;aid=485617&#38;group_id=11118</A
->,
- for details, and a sample configuration.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H3
-CLASS="SECT2"
-><A
-NAME="OTHERPROXY"
->3.17. How can I make Privoxy work with other proxies?</A
-></H3
-><P
-> This can be done and is often useful to combine the benefits of
- <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> with those of a another proxy,
- for example to cache content.
- See the <A
-HREF="../user-manual/config.html#FORWARDING"
-TARGET="_top"
->forwarding chapter</A
->
- in the <A
-HREF="../user-manual/index.html"
-TARGET="_top"
->User Manual</A
-> which
- describes how to do this. If you intend to use Privoxy with Tor,
- please also have a look at
- <A
-HREF="misc.html#TOR"
->How do I use Privoxy together with Tor</A
->.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H3
-CLASS="SECT2"
-><A
-NAME="PORT-80"
->3.18. Can I just set Privoxy to use port 80
-and thus avoid individual browser configuration?</A
-></H3
-><P
-> No, its more complicated than that. This only works with special kinds
- of proxies known as <SPAN
-CLASS="QUOTE"
->"intercepting"</SPAN
-> proxies
- (<A
-HREF="configuration.html#INTERCEPTING"
->see below</A
->).</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H3
-CLASS="SECT2"
-><A
-NAME="TRANSPARENT"
->3.19. Can Privoxy run as a <SPAN
-CLASS="QUOTE"
->"transparent"</SPAN
-> proxy?</A
-></H3
-><P
-> The whole idea of Privoxy is to modify client requests
- and server responses in all sorts of ways and therefore
- it's not a transparent proxy as described in
- <A
-HREF="http://tools.ietf.org/html/rfc2616"
-TARGET="_top"
->RFC 2616</A
->.</P
-><P
-> However, some people say <SPAN
-CLASS="QUOTE"
->"transparent proxy"</SPAN
-> when they
- mean <SPAN
-CLASS="QUOTE"
->"intercepting proxy"</SPAN
->. If you are one of them,
- please read the <A
-HREF="configuration.html#INTERCEPTING"
->next entry</A
->.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H3
-CLASS="SECT2"
-><A
-NAME="INTERCEPTING"
->3.20. Can Privoxy run as a <SPAN
-CLASS="QUOTE"
->"intercepting"</SPAN
-> proxy?</A
-></H3
-><P
-> <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> can't intercept traffic itself,
-  but it can handle requests that where intercepted and redirected
-  with a packet filter (like <SPAN
-CLASS="APPLICATION"
->PF</SPAN
-> or
-  <SPAN
-CLASS="APPLICATION"
->iptables</SPAN
->), as long as the <TT
-CLASS="LITERAL"
->Host</TT
->
-  header is present.
-  </P
-><P
->  As the <TT
-CLASS="LITERAL"
->Host</TT
-> header is required by HTTP/1.1 and as most
-  web sites rely on it anyway, this limitation shouldn't be a problem.</P
-><P
->  Please refer to your packet filter's documentation to learn how to
-  intercept and redirect traffic into <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
->.
-  Afterward you just have to configure <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> to
-  <A
-HREF="../user-manual/config.html#ACCEPT-INTERCEPTED-REQUESTS"
-TARGET="_top"
->accept
-  intercepted requests</A
->.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H3
-CLASS="SECT2"
-><A
-NAME="OUTLOOK"
->3.21. How can I configure Privoxy for use with Outlook?</A
-></H3
-><P
-> Versions of <SPAN
-CLASS="APPLICATION"
->Outlook</SPAN
-> prior to Office 2007, use
- <SPAN
-CLASS="APPLICATION"
->Internet Explorer</SPAN
-> components to both render HTML,
- and fetch any HTTP requests that may be embedded in an HTML email. So however
- you have <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> configured to work with IE, this
- configuration should automatically be shared, at least with older version of
- Internet Explorer.</P
-><P
-> Starting with Office 2007, Microsoft is instead using the MS-Word rendering
- engine with Outlook. It is unknown whether this can be configured to use a
- proxy.
- </P
-></DIV
-><DIV
-CLASS="SECT2"
-><H3
-CLASS="SECT2"
-><A
-NAME="OUTLOOK-MORE"
->3.22. How can I have separate rules just for HTML mail?</A
-></H3
-><P
-> The short answer is, you can't. <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> has no way
- of knowing which particular application makes a request, so there is no way to
- distinguish between web pages and HTML mail.
- <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> just blindly proxies all requests. In the
- case of <SPAN
-CLASS="APPLICATION"
->Outlook Express</SPAN
-> (see above), OE uses
- IE anyway, and there is no way for <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> to ever
- be able to distinguish between them (nor could any other proxy type application for
- that matter).</P
-><P
-> For a good discussion of some of the issues involved (including privacy and
- security issues), see
- <A
-HREF="https://sourceforge.net/tracker/?func=detail&#38;atid=211118&#38;aid=629518&#38;group_id=11118"
-TARGET="_top"
->https://sourceforge.net/tracker/?func=detail&#38;atid=211118&#38;aid=629518&#38;group_id=11118</A
->.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H3
-CLASS="SECT2"
-><A
-NAME="SNEAKY-COOKIES"
->3.23. I sometimes notice cookies sneaking through. How?</A
-></H3
-><P
-> <A
-HREF="http://en.wikipedia.org/wiki/Browser_cookie"
-TARGET="_top"
->Cookies</A
-> can be
- set in several ways. The classic method is via the
- <TT
-CLASS="LITERAL"
->Set-Cookie</TT
-> HTTP header. This is straightforward, and an
- easy one to manipulate, such as the <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> concept of
- <A
-HREF="../user-manual/actions-file.html#SESSION-COOKIES-ONLY"
-TARGET="_top"
->session-cookies-only</A
->.
- There is also the possibility of using
-  <A
-HREF="http://en.wikipedia.org/wiki/Javascript"
-TARGET="_top"
->Javascript</A
-> to
- set cookies (<SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> calls these <TT
-CLASS="LITERAL"
->content-cookies</TT
->). This
- is trickier because the syntax can vary widely, and thus requires a certain
- amount of guesswork. It is not realistic to catch all of these short of
- disabling Javascript, which would break many sites. And lastly, if the
- cookies are embedded in a HTTPS/SSL secure session via Javascript, they are beyond
- <SPAN
-CLASS="APPLICATION"
->Privoxy's</SPAN
-> reach.</P
-><P
-> All in all, <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> can help manage cookies in general, can help minimize
- the loss of privacy posed by cookies, but can't realistically stop all
- cookies.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H3
-CLASS="SECT2"
-><A
-NAME="EVIL-COOKIES"
->3.24. Are all cookies bad? Why?</A
-></H3
-><P
-> No, in fact there are many beneficial uses of
- <A
-HREF="http://en.wikipedia.org/wiki/Browser_cookie"
-TARGET="_top"
->cookies</A
->. Cookies are just a
- method that browsers can use to store data between pages, or between browser
- sessions. Sometimes there is a good reason for this, and the user's life is a
- bit easier as a result. But there is a long history of some websites taking
- advantage of this layer of trust, and using the data they glean from you and
- your 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 <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->need</I
-></SPAN
-> to be there.</P
-><P
->  See the
-   <A
-HREF="http://en.wikipedia.org/wiki/Browser_cookie"
-TARGET="_top"
->Wikipedia cookie
-  definition</A
-> for more.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H3
-CLASS="SECT2"
-><A
-NAME="ALLOW-COOKIES"
->3.25. How can I allow permanent cookies for my trusted sites?</A
-></H3
-><P
->  There are several actions that relate to cookies. The default behavior is to
-  allow only <SPAN
-CLASS="QUOTE"
->"session cookies"</SPAN
->, which means the cookies only last
-  for the current browser session. This eliminates most kinds of abuse related
-  to cookies. But there may be cases where you want cookies to last.</P
-><P
->  To disable all cookie actions, so that cookies are allowed unrestricted,
-  both in and out, for <TT
-CLASS="LITERAL"
->example.com</TT
->:</P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
-> { -crunch-incoming-cookies -crunch-outgoing-cookies -session-cookies-only -filter{content-cookies} }
-  .example.com</PRE
-></TD
-></TR
-></TABLE
-><P
-> Place the above in <TT
-CLASS="FILENAME"
->user.action</TT
->. Note that some of these may
- be off by default anyway, so this might be redundant, but there is no harm
- being explicit in what you want to happen. <TT
-CLASS="FILENAME"
->user.action</TT
->
- includes an alias for this situation, called
- <TT
-CLASS="LITERAL"
->allow-all-cookies</TT
->.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H3
-CLASS="SECT2"
-><A
-NAME="MULTIPLES"
->3.26. Can I have separate configurations for different users?</A
-></H3
-><P
-> Each instance of <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> has its own
- configuration, including such attributes as the TCP port that it listens on.
- What you can do is run multiple instances of <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
->, each with
- a unique
- <A
-HREF="../user-manual/config.html#LISTEN-ADDRESS"
-TARGET="_top"
->listen-address</A
->
- configuration setting, and configuration path, and then
- each of these can have their own configurations. Think of it as per-port
- configuration.</P
-><P
-> Simple enough for a few users, but for large installations, consider having
- groups of users that might share like configurations.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H3
-CLASS="SECT2"
-><A
-NAME="WHITELISTS"
->3.27. Can I set-up Privoxy as a whitelist of
-<SPAN
-CLASS="QUOTE"
->"good"</SPAN
-> sites?</A
-></H3
-><P
-> Sure. There are a couple of things you can do for simple white-listing.
- Here's one real easy one:</P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
-> ############################################################
+ mail.google.com</pre>
+          </td>
+        </tr>
+      </table>
+      <p>Be sure to flush your browser's caches whenever making these kinds of changes, just to make sure the changes
+      <span class="QUOTE">"take"</span>.</p>
+      <p>Make sure the domain, host and path are appropriate as well. Your browser can tell you where you are
+      specifically and you should use that information for your configuration settings. Note that above it is not
+      referenced as <tt class="LITERAL">gmail.com</tt>, which is a valid domain name.</p>
+    </div>
+    <div class="SECT2">
+      <h3 class="SECT2"><a name="CONFIGFILES" id="CONFIGFILES">3.9. What's the difference between the <span class=
+      "QUOTE">"Cautious"</span>, <span class="QUOTE">"Medium"</span> and <span class="QUOTE">"Advanced"</span>
+      defaults?</a></h3>
+      <p>Configuring <span class="APPLICATION">Privoxy</span> is not entirely trivial. To help you get started, we
+      provide you with three different default action <span class="QUOTE">"profiles"</span> in the web based actions
+      file editor at <a href="http://config.privoxy.org/show-status" target=
+      "_top">http://config.privoxy.org/show-status</a>. See the <a href="../user-manual/actions-file.html" target=
+      "_top"><i class="CITETITLE">User Manual</i></a> for a list of actions, and how the default profiles are set.</p>
+      <p>Where the defaults are likely to break some sites, exceptions for known popular <span class=
+      "QUOTE">"problem"</span> 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 <span class=
+      "QUOTE">"Cautious"</span> setting. This is safest and will have the fewest problems. See the <a href=
+      "../user-manual/index.html" target="_top"><i class="CITETITLE">User Manual</i></a> for a more detailed
+      discussion.</p>
+      <p>It should be noted that the <span class="QUOTE">"Advanced"</span> profile (formerly known as the <span class=
+      "QUOTE">"Adventuresome"</span> profile) is more aggressive, and will make use of some of <span class=
+      "APPLICATION">Privoxy's</span> advanced features. Use at your own risk!</p>
+    </div>
+    <div class="SECT2">
+      <h3 class="SECT2"><a name="BROWSECONFIG" id="BROWSECONFIG">3.10. Why can I change the configuration with a
+      browser? Does that not raise security issues?</a></h3>
+      <p>It may seem strange that regular users can edit the config files with their browsers, although the whole
+      <tt class="FILENAME">/etc/privoxy</tt> hierarchy belongs to the user <span class="QUOTE">"privoxy"</span>, with
+      only 644 permissions.</p>
+      <p>When you use the browser-based editor, <span class="APPLICATION">Privoxy</span> itself is writing to the
+      config files. Because <span class="APPLICATION">Privoxy</span> is running as the user <span class=
+      "QUOTE">"privoxy"</span>, it can update its own config files.</p>
+      <p>If you run <span class="APPLICATION">Privoxy</span> for multiple untrusted users (e.g. in a LAN) or aren't
+      entirely in control of your own browser, you will probably want to make sure that the web-based editor and remote
+      toggle features are <span class="QUOTE">"off"</span> by setting <span class="QUOTE">"<tt class="LITERAL"><a href=
+      "../user-manual/config.html#ENABLE-EDIT-ACTIONS" target="_top">enable-edit-actions</a> 0</tt>"</span> and
+      <span class="QUOTE">"<tt class="LITERAL"><a href="../user-manual/config.html#ENABLE-REMOTE-TOGGLE" target=
+      "_top">enable-remote-toggle</a> 0</tt>"</span> in the <a href="../user-manual/config.html" target="_top">main
+      configuration file</a>.</p>
+      <p>As of <span class="APPLICATION">Privoxy</span> 3.0.7 these options are disabled by default.</p>
+    </div>
+    <div class="SECT2">
+      <h3 class="SECT2"><a name="FILTERFILE" id="FILTERFILE">3.11. What is the <tt class="FILENAME">default.filter</tt>
+      file? What is a <span class="QUOTE">"filter"</span>?</a></h3>
+      <p>The <a href="../user-manual/filter-file.html" target="_top"><tt class="FILENAME">default.filter</tt></a> file
+      is where <span class="emphasis"><i class="EMPHASIS">filters</i></span> 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 <span class="emphasis"><i class="EMPHASIS">anything</i></span> in the page
+      source, header filters can be applied to either server or client headers. Regular expressions are used to
+      accomplish this.</p>
+      <p>There are a number of pre-defined filters to deal with common annoyances. The filters are only defined here,
+      to invoke them, you need to use the <a href="../user-manual/actions-file.html#FILTER" target="_top"><tt class=
+      "LITERAL">filter</tt> action</a> in one of the actions files. Content filtering is automatically disabled for
+      inappropriate MIME types, but if you know better than Privoxy what should or should not be filtered you can
+      filter any content you like.</p>
+      <p>Filters should <span class="emphasis"><i class="EMPHASIS">not</i></span> be confused with <a href=
+      "../user-manual/actions-file.html#BLOCK" target="_top"><tt class="LITERAL">blocks</tt></a>, which is a completely
+      different action, and is more typically used to block ads and unwanted sites.</p>
+      <p>If you are familiar with regular expressions, and HTML, you can look at the provided <tt class=
+      "FILENAME">default.filter</tt> with a text editor and define your own filters. This is potentially a very
+      powerful feature, but requires some expertise in both regular expressions and HTML/HTTP. You should place any
+      modifications to the default filters, or any new ones you create in a separate file, such as <tt class=
+      "FILENAME">user.filter</tt>, so they won't be overwritten during upgrades. The ability to define multiple filter
+      files in <tt class="FILENAME">config</tt> is a new feature as of v. 3.0.5.</p>
+      <p>There is no GUI editor option for this part of the configuration, but you can disable/enable the various
+      pre-defined filters of the included <tt class="FILENAME">default.filter</tt> file with the <a href=
+      "http://config.privoxy.org/show-status" target="_top">web-based actions file editor</a>. Note that the custom
+      actions editor must be explicitly enabled in the main config file (see <a href=
+      "../user-manual/config.html#ENABLE-EDIT-ACTIONS" target="_top">enable-edit-actions</a>).</p>
+      <p>If you intend to develop your own filters, you might want to have a look at <a href=
+      "https://www.fabiankeil.de/sourcecode/pft/" target="_top">Privoxy-Filter-Test</a>.</p>
+    </div>
+    <div class="SECT2">
+      <h3 class="SECT2"><a name="LANCONFIG" id="LANCONFIG">3.12. How can I set up Privoxy to act as a proxy for my
+      LAN?</a></h3>
+      <p>By default, <span class="APPLICATION">Privoxy</span> only responds to requests from <tt class=
+      "LITERAL">127.0.0.1</tt> (localhost). To have it act as a server for a network, this needs to be changed in the
+      <a href="../user-manual/config.html" target="_top">main configuration file</a>. Look for the <tt class=
+      "LITERAL"><a href="../user-manual/config.html#LISTEN-ADDRESS" target="_top">listen-address</a></tt> option, which
+      may be commented out with a <span class="QUOTE">"#"</span> symbol. Make sure it is uncommented, and assign it the
+      address of the LAN gateway interface, and port number to use. Assuming your LAN address is 192.168.1.1 and you
+      wish to run <span class="APPLICATION">Privoxy</span> on port 8118, this line should look like:</p>
+      <table border="0" bgcolor="#E0E0E0" width="100%">
+        <tr>
+          <td>
+            <pre class="SCREEN">  listen-address  192.168.1.1:8118</pre>
+          </td>
+        </tr>
+      </table>
+      <p>Save the file, and restart <span class="APPLICATION">Privoxy</span>. Configure all browsers on the network
+      then to use this address and port number.</p>
+      <p>Alternately, you can have <span class="APPLICATION">Privoxy</span> listen on all available interfaces:</p>
+      <table border="0" bgcolor="#E0E0E0" width="100%">
+        <tr>
+          <td>
+            <pre class="SCREEN">  listen-address    :8118</pre>
+          </td>
+        </tr>
+      </table>
+      <p>And then use <span class="APPLICATION">Privoxy's</span> <a href="../user-manual/config.html#PERMIT-ACCESS"
+      target="_top">permit-access</a> feature to limit connections. A firewall in this situation is recommended as
+      well.</p>
+      <p>The above steps should be the same for any TCP network, regardless of operating system.</p>
+      <p>If you run <span class="APPLICATION">Privoxy</span> on a LAN with untrusted users, we recommend that you
+      double-check the <a href="../user-manual/config.html#ACCESS-CONTROL" target="_top">access control and
+      security</a> options!</p>
+    </div>
+    <div class="SECT2">
+      <h3 class="SECT2"><a name="NOSEEUM" id="NOSEEUM">3.13. Instead of ads, now I get a checkerboard pattern. I don't
+      want to see anything.</a></h3>
+      <p>The replacement for blocked images can be controlled with the <a href=
+      "../user-manual/actions-file.html#SET-IMAGE-BLOCKER" target="_top"><tt class="LITERAL">set-image-blocker</tt>
+      action</a>. You have the choice of a checkerboard pattern, a transparent 1x1 GIF image (aka <span class=
+      "QUOTE">"blank"</span>), or a redirect to a custom image of your choice. Note that this choice only has effect
+      for images which are blocked as images, i.e. whose URLs match both a <tt class="LITERAL"><a href=
+      "../user-manual/actions-file.html#HANDLE-AS-IMAGE" target="_top">handle-as-image</a></tt> <span class=
+      "emphasis"><i class="EMPHASIS">and</i></span> <tt class="LITERAL"><a href=
+      "../user-manual/actions-file.html#BLOCK" target="_top">block</a></tt> action.</p>
+      <p>If you want to see nothing, then change the <a href="../user-manual/actions-file.html#SET-IMAGE-BLOCKER"
+      target="_top"><tt class="LITERAL">set-image-blocker</tt> action</a> to <span class="QUOTE">"blank"</span>. This
+      can be done by editing the <tt class="FILENAME">user.action</tt> file, or through the <a href=
+      "http://config.privoxy.org/show-status" target="_top">web-based actions file editor</a>.</p>
+    </div>
+    <div class="SECT2">
+      <h3 class="SECT2"><a name="WHYSEEUM" id="WHYSEEUM">3.14. Why would anybody want to see a checkerboard
+      pattern?</a></h3>
+      <p>Remember that <a href="general.html#WHATSANAD">telling which image is an ad and which isn't</a>, is an
+      educated guess. While we hope that the standard configuration is rather smart, it will make occasional mistakes.
+      The checkerboard image is visually decent, and it shows you where images have been blocked, which can be very
+      helpful in case some navigation aid or otherwise innocent image was erroneously blocked. It is recommended for
+      new users so they can <span class="QUOTE">"see"</span> what is happening. Some people might also enjoy seeing how
+      many banners they <span class="emphasis"><i class="EMPHASIS">don't</i></span> have to see.</p>
+    </div>
+    <div class="SECT2">
+      <h3 class="SECT2"><a name="BLOCKEDBYTEXT" id="BLOCKEDBYTEXT">3.15. I see some images being replaced with text
+      instead of the checkerboard image. Why and how do I get rid of this?</a></h3>
+      <p>This happens when the banners are not embedded in the HTML code of the page itself, but in separate HTML
+      (sub)documents that are loaded into (i)frames or (i)layers, and these external HTML documents are blocked. Being
+      non-images they get replaced by a substitute HTML page rather than a substitute image, which wouldn't work out
+      technically, since the browser expects and accepts only HTML when it has requested an HTML document.</p>
+      <p>The substitute page adapts to the available space and shows itself as a miniature two-liner if loaded into
+      small frames, or full-blown with a large red "BLOCKED" banner if space allows.</p>
+      <p>If you prefer the banners to be blocked by images, you must see to it that the HTML documents in which they
+      are embedded are not blocked. Clicking the <span class="QUOTE">"See why"</span> link offered in the substitute
+      page will show you which rule blocked the page. After changing the rule and un-blocking the HTML documents, the
+      browser will try to load the actual banner images and the usual image blocking will (hopefully!) kick in.</p>
+    </div>
+    <div class="SECT2">
+      <h3 class="SECT2"><a name="SRVANY" id="SRVANY">3.16. Can Privoxy run as a service on Win2K/NT/XP?</a></h3>
+      <p>Yes. Version 3.0.5 introduces full <span class="APPLICATION">Windows</span> service functionality. See
+      <a href="../user-manual/installation.html#INSTALLATION-PACK-WIN" target="_top">the <i class="CITETITLE">User
+      Manual</i></a> for details on how to install and configure <span class="APPLICATION">Privoxy</span> as a
+      service.</p>
+      <p>Earlier 3.x versions could run as a system service using <b class="COMMAND">srvany.exe</b>. See the discussion
+      at <a href="https://sourceforge.net/tracker/?func=detail&#38;atid=361118&#38;aid=485617&#38;group_id=11118"
+      target="_top">https://sourceforge.net/tracker/?func=detail&#38;atid=361118&#38;aid=485617&#38;group_id=11118</a>,
+      for details, and a sample configuration.</p>
+    </div>
+    <div class="SECT2">
+      <h3 class="SECT2"><a name="OTHERPROXY" id="OTHERPROXY">3.17. How can I make Privoxy work with other
+      proxies?</a></h3>
+      <p>This can be done and is often useful to combine the benefits of <span class="APPLICATION">Privoxy</span> with
+      those of a another proxy, for example to cache content. See the <a href="../user-manual/config.html#FORWARDING"
+      target="_top">forwarding chapter</a> in the <a href="../user-manual/index.html" target="_top">User Manual</a>
+      which describes how to do this. If you intend to use Privoxy with Tor, please also have a look at <a href=
+      "misc.html#TOR">How do I use Privoxy together with Tor</a>.</p>
+    </div>
+    <div class="SECT2">
+      <h3 class="SECT2"><a name="PORT-80" id="PORT-80">3.18. Can I just set Privoxy to use port 80 and thus avoid
+      individual browser configuration?</a></h3>
+      <p>No, its more complicated than that. This only works with special kinds of proxies known as <span class=
+      "QUOTE">"intercepting"</span> proxies (<a href="configuration.html#INTERCEPTING">see below</a>).</p>
+    </div>
+    <div class="SECT2">
+      <h3 class="SECT2"><a name="TRANSPARENT" id="TRANSPARENT">3.19. Can Privoxy run as a <span class=
+      "QUOTE">"transparent"</span> proxy?</a></h3>
+      <p>The whole idea of Privoxy is to modify client requests and server responses in all sorts of ways and therefore
+      it's not a transparent proxy as described in <a href="http://tools.ietf.org/html/rfc2616" target="_top">RFC
+      2616</a>.</p>
+      <p>However, some people say <span class="QUOTE">"transparent proxy"</span> when they mean <span class=
+      "QUOTE">"intercepting proxy"</span>. If you are one of them, please read the <a href=
+      "configuration.html#INTERCEPTING">next entry</a>.</p>
+    </div>
+    <div class="SECT2">
+      <h3 class="SECT2"><a name="INTERCEPTING" id="INTERCEPTING">3.20. Can Privoxy run as a <span class=
+      "QUOTE">"intercepting"</span> proxy?</a></h3>
+      <p><span class="APPLICATION">Privoxy</span> can't intercept traffic itself, but it can handle requests that where
+      intercepted and redirected with a packet filter (like <span class="APPLICATION">PF</span> or <span class=
+      "APPLICATION">iptables</span>), as long as the <tt class="LITERAL">Host</tt> header is present.</p>
+      <p>As the <tt class="LITERAL">Host</tt> header is required by HTTP/1.1 and as most web sites rely on it anyway,
+      this limitation shouldn't be a problem.</p>
+      <p>Please refer to your packet filter's documentation to learn how to intercept and redirect traffic into
+      <span class="APPLICATION">Privoxy</span>. Afterward you just have to configure <span class=
+      "APPLICATION">Privoxy</span> to <a href="../user-manual/config.html#ACCEPT-INTERCEPTED-REQUESTS" target=
+      "_top">accept intercepted requests</a>.</p>
+    </div>
+    <div class="SECT2">
+      <h3 class="SECT2"><a name="OUTLOOK" id="OUTLOOK">3.21. How can I configure Privoxy for use with Outlook?</a></h3>
+      <p>Versions of <span class="APPLICATION">Outlook</span> prior to Office 2007, use <span class=
+      "APPLICATION">Internet Explorer</span> components to both render HTML, and fetch any HTTP requests that may be
+      embedded in an HTML email. So however you have <span class="APPLICATION">Privoxy</span> configured to work with
+      IE, this configuration should automatically be shared, at least with older version of Internet Explorer.</p>
+      <p>Starting with Office 2007, Microsoft is instead using the MS-Word rendering engine with Outlook. It is unknown
+      whether this can be configured to use a proxy.</p>
+    </div>
+    <div class="SECT2">
+      <h3 class="SECT2"><a name="OUTLOOK-MORE" id="OUTLOOK-MORE">3.22. How can I have separate rules just for HTML
+      mail?</a></h3>
+      <p>The short answer is, you can't. <span class="APPLICATION">Privoxy</span> has no way of knowing which
+      particular application makes a request, so there is no way to distinguish between web pages and HTML mail.
+      <span class="APPLICATION">Privoxy</span> just blindly proxies all requests. In the case of <span class=
+      "APPLICATION">Outlook Express</span> (see above), OE uses IE anyway, and there is no way for <span class=
+      "APPLICATION">Privoxy</span> to ever be able to distinguish between them (nor could any other proxy type
+      application for that matter).</p>
+      <p>For a good discussion of some of the issues involved (including privacy and security issues), see <a href=
+      "https://sourceforge.net/tracker/?func=detail&#38;atid=211118&#38;aid=629518&#38;group_id=11118" target=
+      "_top">https://sourceforge.net/tracker/?func=detail&#38;atid=211118&#38;aid=629518&#38;group_id=11118</a>.</p>
+    </div>
+    <div class="SECT2">
+      <h3 class="SECT2"><a name="SNEAKY-COOKIES"