From ff48a78eac29e28ce16149b96f0d0cc3830fcfea Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Tue, 1 Feb 2011 17:15:49 -0800
Subject: [PATCH] Rename 'ipaccount' to 'ipa'

---
 Shorewall/changelog.txt    | 2 +-
 Shorewall/lib.cli          | 2 +-
 Shorewall/releasenotes.txt | 2 +-
 Shorewall/shorewall        | 2 +-
 manpages/shorewall.xml     | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index c0d7010b9..ecf6c55d0 100644
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -6,7 +6,7 @@ Changes in Shorewall 4.4.17 RC 1
 
 3)  Tighten up the editing of ACCOUNT(...).
 
-4)  Add 'show ipaccount' command.
+4)  Add 'show ipa' command.
 
 Changes in Shorewall 4.4.17 Beta 3
 
diff --git a/Shorewall/lib.cli b/Shorewall/lib.cli
index 3605e11d3..0a858e1fc 100644
--- a/Shorewall/lib.cli
+++ b/Shorewall/lib.cli
@@ -713,7 +713,7 @@ show_command() {
 	    echo
 	    [ -f ${VARDIR}/policies ] && cat ${VARDIR}/policies;
 	    ;;
-	ipaccount)
+	ipa)
 	    echo "$g_product $SHOREWALL_VERSION per-IP Accounting at $g_hostname - $(date)"
 	    echo
 	    [ $# -gt 1 ] && usage 1
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index 9e3b1d7ae..e2dc62e63 100644
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -81,7 +81,7 @@ Beta 1
 
 RC 1
 
-1)  A 'show ipaccount' command has been added to /sbin/shorewall. It
+1)  A 'show ipa' command has been added to /sbin/shorewall. It
     displays each per-IP accounting table.  
 
 Beta 3
diff --git a/Shorewall/shorewall b/Shorewall/shorewall
index 7590882ef..d481b2896 100755
--- a/Shorewall/shorewall
+++ b/Shorewall/shorewall
@@ -1363,7 +1363,7 @@ usage() # $1 = exit status
     echo "   show dynamic <zone>"
     echo "   show filters"
     echo "   show ip"
-    echo "   show ipaccount"
+    echo "   show ipa"
     echo "   show [ -m ] log [<regex>]"
     echo "   show macro <macro>"
     echo "   show macros"
diff --git a/manpages/shorewall.xml b/manpages/shorewall.xml
index c073e5a5a..9d1d8950b 100644
--- a/manpages/shorewall.xml
+++ b/manpages/shorewall.xml
@@ -487,7 +487,7 @@
       <arg choice="plain"><option>show</option></arg>
 
       <arg
-      choice="req"><option>actions|classifiers|connections|config|filters|ip|ipaccount|macros|zones</option></arg>
+      choice="req"><option>actions|classifiers|connections|config|filters|ip|ipa|macros|zones</option></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
@@ -1275,7 +1275,7 @@
             </varlistentry>
 
             <varlistentry>
-              <term><emphasis role="bold">ipaccount</emphasis></term>
+              <term><emphasis role="bold">ipa</emphasis></term>
 
               <listitem>
                 <para>Added in Shorewall 4.4.17. Displays the per-IP