From 6809b4094659e29e2d5de44a9df51b7d7ec7596a Mon Sep 17 00:00:00 2001
From: b1v1r <b1v1r@9017d574-64ec-4062-9424-5e00b32a252b>
Date: Mon, 3 Aug 2009 18:52:19 +0000
Subject: [PATCH] Add "phase:1" to all initcol examples (MODSEC-80).

---
 doc/modsecurity2-apache-reference.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/doc/modsecurity2-apache-reference.xml b/doc/modsecurity2-apache-reference.xml
index 76c815c0..e0ca08b9 100644
--- a/doc/modsecurity2-apache-reference.xml
+++ b/doc/modsecurity2-apache-reference.xml
@@ -6,7 +6,7 @@
   Manual</title>
 
   <articleinfo>
-    <releaseinfo>Version 2.5.10-dev1 (July 27, 2009)</releaseinfo>
+    <releaseinfo>Version 2.5.10 (Aug 3, 2009)</releaseinfo>
 
     <copyright>
       <year>2004-2009</year>
@@ -533,7 +533,7 @@ LoadFile /usr/lib/liblua5.1.so</programlisting></para>
 
       <para><emphasis>Example Usage:</emphasis> <literal
       moreinfo="none">SecAction
-      nolog,initcol:RESOURCE=%{REQUEST_FILENAME}</literal></para>
+      nolog,phase:1,initcol:RESOURCE=%{REQUEST_FILENAME}</literal></para>
 
       <para><emphasis>Processing Phase:</emphasis> Any</para>
 
@@ -4753,10 +4753,14 @@ setvar:session.suspicious=1,<emphasis>expirevar:session.suspicious=3600</emphasi
       <para>Example: The following example initiates IP address
       tracking.</para>
 
-      <programlisting format="linespecific">SecAction<emphasis> initcol:ip=%{REMOTE_ADDR}</emphasis>,nolog</programlisting>
+      <programlisting format="linespecific">SecAction <emphasis>phase:1,initcol:ip=%{REMOTE_ADDR}</emphasis>,nolog</programlisting>
 
       <para><emphasis>Note</emphasis></para>
 
+      <para>Normally you will want to use <emphasis>phase:1</emphasis>
+      along with <emphasis>initcol</emphasis> so that the collection is
+      available in all phases.</para>
+
       <para>Collections are loaded into memory when the initcol action is
       encountered. The collection in storage will be persisted (and the
       appropriate counters increased) <emphasis>only</emphasis> if it was
@@ -4775,7 +4779,7 @@ setvar:session.suspicious=1,<emphasis>expirevar:session.suspicious=3600</emphasi
 
       <para>Example:</para>
 
-      <programlisting format="linespecific">SecAction initcol:ip=%{REMOTE_ADDR},<emphasis>log</emphasis></programlisting>
+      <programlisting format="linespecific">SecAction phase:1,initcol:ip=%{REMOTE_ADDR},<emphasis>log</emphasis></programlisting>
 
       <para><emphasis>Note</emphasis></para>