Merge in 2.5 doc changes.

Cleanup doc formatting.

doc/html-chunked.xsl

@@ -12,7 +12,7 @@
 </xsl:template>
 
 <xsl:template name="user.footer.navigation">
-    <div class="copyright" align="center">Copyright (C) 2004-2008 <a href="http://www.breach.com">Breach Security</a></div>
+    <div class="copyright" align="center">Copyright (C) 2004-2009 <a href="http://www.breach.com">Breach Security</a></div>
 </xsl:template>
 
 <xsl:template name="article.titlepage.separator">

doc/html.xsl

@@ -8,7 +8,7 @@
 </xsl:template>
 
 <xsl:template name="user.footer.navigation">
-    <div class="copyright" align="center">Copyright (C) 2004-2008 <a href="http://www.breach.com">Breach Security</a></div>
+    <div class="copyright" align="center">Copyright (C) 2004-2009 <a href="http://www.breach.com">Breach Security</a></div>
 </xsl:template>
 
 <xsl:template name="article.titlepage.separator">

doc/migration-matrix.xml

@@ -6,7 +6,7 @@
     <releaseinfo>Version 1.0 / (April 10, 2007)</releaseinfo>
 
     <copyright>
-      <year>2004-2008</year>
+      <year>2004-2009</year>
 
       <holder>Breach Security, Inc. (<ulink
       url="http://www.breach.com">http://www.breach.com</ulink>)</holder>
@@ -181,8 +181,6 @@
                 dynamically for individual requests.</para>
               </listitem>
             </itemizedlist>
-
-            
           </td>
 
           <td>Replace SecFilterEngine with SecRuleEngine. The DynamicOnly mode
@@ -242,8 +240,6 @@
                 </para>
               </listitem>
             </itemizedlist>
-
-            
           </td>
 
           <td>Replace SecFilterDefaultAction with SecDefaultAction.
@@ -525,8 +521,6 @@
                 <para>sha1</para>
               </listitem>
             </itemizedlist>
-
-            
           </td>
 
           <td>In Mod 1.x, the normalization functions were implicit and you

doc/modsecurity2-apache-reference.xml

@@ -9,7 +9,7 @@
     <releaseinfo>Version 2.6.0-trunk (March 5, 2009)</releaseinfo>
 
     <copyright>
-      <year>2004-2008</year>
+      <year>2004-2009</year>
 
       <holder>Breach Security, Inc. (<ulink
       url="http://www.breach.com">http://www.breach.com</ulink>)</holder>
@@ -4270,6 +4270,12 @@ SecAction phase:3,allow</programlisting>
       <para>Example:</para>
 
       <programlisting>SecRule RESPONSE_CONTENT_TYPE "^text/html" "nolog,pass,<emphasis>append:'&lt;hr&gt;Footer'</emphasis>"</programlisting>
+
+      <note>
+        <para>While macro expansion is allowed in the additional content, you
+        are strongly cautioned against inserting user defined data
+        fields.</para>
+      </note>
     </section>
 
     <section>
@@ -4923,6 +4929,12 @@ SecRule REQUEST_HEADERS:User-Agent "Test" log,deny,status:403</programlisting>
       <para>Example:</para>
 
       <programlisting>SecRule RESPONSE_CONTENT_TYPE ^text/html "phase:3,nolog,pass,<emphasis>prepend:'Header&lt;br&gt;'</emphasis>"</programlisting>
+
+      <note>
+        <para>While macro expansion is allowed in the additional content, you
+        are strongly cautioned against inserting user defined data
+        fields.</para>
+      </note>
     </section>
 
     <section>
@@ -5915,15 +5927,6 @@ SecRule REQUEST_METHOD "!<emphasis>@within %{tx.allowed_methods}</emphasis>" t:l
       being persisted. This keeps counter data consistent even if the counter
       was modified and persisted by another thread/process during the
       transaction.</para>
-
-      <para>Please note that ModSecurity does not implement atomic updates of
-      persistent variables at this time. Variables are read from storage
-      whenever <literal>initcol</literal> is encountered in the rules and
-      persisted at the end of request processing. On busy servers requests
-      often run in parallel, leading to situations where one request
-      overwrites the changes made by another request. We anticipate
-      implementing atomic updates of counter values in a future
-      version.</para>
     </note>
 
     <note>
@@ -6035,4 +6038,4 @@ SecRule REQUEST_METHOD "!<emphasis>@within %{tx.allowed_methods}</emphasis>" t:l
       </section>
     </section>
   </section>
-</article>
+</article>