From c2cd03128526e4c4b0c55da92d38ca10a56bb0d2 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Thu, 2 Aug 2012 11:31:25 -0700
Subject: [PATCH] Mention the conntrack file in the config basics doc.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 docs/configuration_file_basics.xml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/docs/configuration_file_basics.xml b/docs/configuration_file_basics.xml
index f838eeda0..1b46934b0 100644
--- a/docs/configuration_file_basics.xml
+++ b/docs/configuration_file_basics.xml
@@ -332,6 +332,11 @@ ACCEPT  net     $FW      tcp     www     #This is an end-of-line comment</progra
     following files:</para>
 
     <itemizedlist>
+      <listitem>
+        <para><filename>/etc/shorewall/conntrack</filename> (formerly
+        <filename>/etc/shorewall/notrack</filename>)</para>
+      </listitem>
+
       <listitem>
         <para><filename>/etc/shorewall/accounting</filename></para>
       </listitem>
@@ -344,10 +349,6 @@ ACCEPT  net     $FW      tcp     www     #This is an end-of-line comment</progra
         <para><filename>/etc/shorewall/nat</filename></para>
       </listitem>
 
-      <listitem>
-        <para><filename>/etc/shorewall/notrack</filename></para>
-      </listitem>
-
       <listitem>
         <para><filename>/etc/shorewall/rules</filename></para>
       </listitem>
@@ -570,6 +571,12 @@ ACCEPT      net:\
             mark, ipsec, headers</entry>
           </row>
 
+          <row>
+            <entry>conntrack (formerly notrack)</entry>
+
+            <entry>source,dest,proto,dport,sport,user</entry>
+          </row>
+
           <row>
             <entry>blacklist</entry>