From 2d80689ac43fd015f67f528b64ef4be44dc3f057 Mon Sep 17 00:00:00 2001
From: ivanr <ivanr@9017d574-64ec-4062-9424-5e00b32a252b>
Date: Fri, 29 Jun 2007 23:23:00 +0000
Subject: [PATCH] Clarified that we are a GPLv2-only project.

---
 doc/modsecurity2-apache-reference.xml | 38 ++++++++++++++-------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/doc/modsecurity2-apache-reference.xml b/doc/modsecurity2-apache-reference.xml
index 42123eac..8b1fb448 100644
--- a/doc/modsecurity2-apache-reference.xml
+++ b/doc/modsecurity2-apache-reference.xml
@@ -167,12 +167,11 @@
 
       <para>ModSecurity is available under two licenses. Users can choose to
       use the software under the terms of the GNU General Public License
-      (<ulink
-      url="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</ulink>),as
-      an Open Source / Free Software product. A range of commercial licenses
-      is also available, together with a range of commercial support
-      contracts. For more information on commercial licensing please contact
-      Breach Security.</para>
+      version 2 (licence text is included with the distribution),as an Open
+      Source / Free Software product. A range of commercial licenses is also
+      available, together with a range of commercial support contracts. For
+      more information on commercial licensing please contact Breach
+      Security.</para>
 
       <note>
         <para>ModSecurity, mod_security, and ModSecurity Pro are trademarks or
@@ -1037,12 +1036,13 @@ SecAuditLogStorageDir logs/audit
       <para>Development of a state of the art external protection tool will be
       a focus of subsequent ModSecurity releases. However, a fully functional
       tool is already available as part of the Apache httpd tools project
-      (<link linkend="http://www.apachesecurity.net/tools/">http://www.apachesecurity.net/tools/</link>). The
-      tool is called httpd-guardian and can be used to defend against Denial
-      of Service attacks. It uses the blacklist tool (from the same project)
-      to interact with an iptables-based (Linux) or pf-based (*BSD) firewall,
-      dynamically blacklisting the offending IP addresses. It can also
-      interact with SnortSam (http://www.snortsam.net). Assuming
+      (<link
+      linkend="http://www.apachesecurity.net/tools/">http://www.apachesecurity.net/tools/</link>).
+      The tool is called httpd-guardian and can be used to defend against
+      Denial of Service attacks. It uses the blacklist tool (from the same
+      project) to interact with an iptables-based (Linux) or pf-based (*BSD)
+      firewall, dynamically blacklisting the offending IP addresses. It can
+      also interact with SnortSam (http://www.snortsam.net). Assuming
       httpd-guardian is already configured (look into the source code for the
       detailed instructions) you only need to add one line to your Apache
       configuration to deploy it:</para>
@@ -1878,10 +1878,12 @@ SecRule HTTP_Host "!^$" "deny,<emphasis role="bold">phase:1</emphasis>"</program
       expression in the selection operator itself. The following rule will
       look into all arguments whose names begin with <literal
       moreinfo="none">id_</literal>: <programlisting format="linespecific">SecRule ARGS:/^id_/ dirty</programlisting></para>
-            
-      <note><para>In ModSecurity 1.X, the <literal>ARGS</literal> variable stood
-      for <literal>QUERY_STRING</literal> + <literal>POST_PAYLOAD</literal>,
-      whereas now it expands to to individual variables.</para></note>
+
+      <note>
+        <para>In ModSecurity 1.X, the <literal>ARGS</literal> variable stood
+        for <literal>QUERY_STRING</literal> + <literal>POST_PAYLOAD</literal>,
+        whereas now it expands to to individual variables.</para>
+      </note>
     </section>
 
     <section>
@@ -4030,7 +4032,7 @@ SecRule XML:/soap:Envelope/soap:Body/q1:getInput/id() "123" phase:2,deny</progra
           <literal moreinfo="none">PCRE_DOLLAR_ENDONLY</literal> flags are set
           during compilation, meaning a single dot will match any character,
           including the newlines and a <literal moreinfo="none">$</literal>
-					end anchor will not match a trailing newline charater.</para>
+          end anchor will not match a trailing newline charater.</para>
         </listitem>
       </orderedlist>
     </section>
@@ -4173,4 +4175,4 @@ SecRule XML "<emphasis role="bold">@validateSchema /path/to/apache2/conf/xml.xsd
       </itemizedlist>
     </section>
   </section>
-</article>
+</article>
\ No newline at end of file