From c60ab6bfda596ce815367615c9555fa167c4e44d Mon Sep 17 00:00:00 2001
From: b1v1r <b1v1r@9017d574-64ec-4062-9424-5e00b32a252b>
Date: Mon, 21 Dec 2009 16:38:21 +0000
Subject: [PATCH] Merged changes from 2.5.x into trunk.

---
 CHANGES                               | 2 ++
 doc/modsecurity2-apache-reference.xml | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 67dab1b2..43458b1a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
 12 Dec 2009 - trunk
 -------------------
 
+ * Reserved 700,000-799,999 IDs for Ivan Ristic.
+
  * Fixed SecAction not working when CONNECT request method is used
    (MODSEC-110). [Ivan Ristic]
 
diff --git a/doc/modsecurity2-apache-reference.xml b/doc/modsecurity2-apache-reference.xml
index fb39c797..26d6955c 100644
--- a/doc/modsecurity2-apache-reference.xml
+++ b/doc/modsecurity2-apache-reference.xml
@@ -3253,8 +3253,12 @@ setvar:session.suspicious=1,<emphasis>expirevar:session.suspicious=3600</emphasi
               url="http://projects.otaku42.de/wiki/ScallyWhack">ScallyWhack</ulink>.</para>
         </listitem>
         <listitem>
-          <para>430,000-899,999; unused (available for reservation).</para>
+          <para>430,000-699,999; unused (available for reservation).</para>
         </listitem>
+        <listitem>
+            <para>700,000-799,999; reserved for Ivan Ristic.</para>
+        </listitem>
+
         <listitem>
           <para>900,000-999,999; reserved for the <ulink
               url="http://www.modsecurity.org/projects/rules/">Core Rules</ulink> project.</para>