From 9ba4bbebb28d0b56a9145f3f041735f18592ab75 Mon Sep 17 00:00:00 2001
From: Vadim Kurland <vadim@netcitadel.com>
Date: Thu, 3 Jul 2008 22:59:19 +0000
Subject: [PATCH] updated man page

---
 doc/ChangeLog    |  2 ++
 doc/fwbuilder.1  | 45 ++++++++++++++++++++++++++++++++++++---------
 src/gui/main.cpp |  4 +++-
 3 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 2c584f7fc..63c4ce54d 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,7 @@
 2008-07-03  Vadim Kurland  <vadim@vk.crocodile.org>
 
+	* fwbuilder.1: updated man page for fwbuilder GUI.
+
 	* ipt.cpp (main): document iptables version settings from the
 	firewall object in generated script (for support and debugging).
 
diff --git a/doc/fwbuilder.1 b/doc/fwbuilder.1
index d7829eb45..fbb6d2d1c 100644
--- a/doc/fwbuilder.1
+++ b/doc/fwbuilder.1
@@ -8,9 +8,13 @@ fwbuilder \- Multiplatform firewall configuration tool
 .SH SYNOPSIS
 
 .B /usr/bin/fwbuilder
-[
-.B -f file.xml
-] 
+.RB [-f file.fwb]
+.RB [-d]
+.RB [-h]
+.RB [-o file]
+.RB [-p object_name]
+.RB [-v]
+ 
 
 .SH "DESCRIPTION"
 
@@ -29,19 +33,42 @@ GUI and policy compilers are completely independent,
 this provides for a consistent abstract model and the 
 same GUI for different firewall platforms.
 
-At the moment of this writing Firewall Builder supports firewalls
-based on iptables (available on Linux, kernel 2.4.x, see
-fwb_ipt(1)), ipfilter (available on a variety of platforms
-including *BSD, Solaris and others, see fwb_ipf(1)) and pf (available
-on OpenBSD 3.0, see fwb_pf(1))
+Firewall Builder supports firewalls based on iptables (Linux kernel
+2.4.x and 2.6.x, see fwb_ipt(1)), ipfilter (variety of platforms
+including *BSD, Solaris and others, see fwb_ipf(1)), pf (OpenBSD and
+FreeBSD, see fwb_pf(1)), ipfw (FreeBSD and others), Cisco PIX (v6.x
+and 7.x) and Cisco IOS extended access lists.
+
 
 .SH OPTIONS
+
 .IP "-f FILE"
 Specify the name of the file to be loaded when program starts.
 
+.IP "-d"
+Turns on debug mode. Note that in this mode the program generates
+lots of output on standard error. This is used for debugging.
+
+.IP "-h"
+Prints brief help message
+
+.IP "-o file"
+Specify the name of the file for the print output, see option "-p".
+
+.IP "-p object_name"
+Print rules and objects for the firewall object "object_name" and
+immediately exit. The program does not go into interactive mode and
+does not need X11. Print output will be placed in the file specified
+with "-o" option.  If file name is not given with option "-o", print
+output is stored in the file "print.pdf" in the current directory.
+
+
 .SH FILES
 .IP $HOME/.qt/firewallbuilder2rc
-fwbuilder stores user preferences in this file 
+Fwbuilder v2.1 stores user preferences in this file.
+
+.IP $HOME/.config/netcitadel.com/Firewall\ Builder.conf
+Fwbuilder v3.0 stores user preferences in this file.
 
 .SH URL
 Firewall Builder home page is located at the following URL:
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index 224e57e30..293e4ff53 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -620,7 +620,9 @@ int main( int argc, char ** argv )
 #endif
         if (pparam)
         {
-            FWWindow::printFirewallFromFile(filename,pparamValue,print_output_file_name);
+            FWWindow::printFirewallFromFile(filename,
+                                            pparamValue,
+                                            print_output_file_name);
             return 0;
         }