diff --git a/manpages/shorewall.conf.xml b/manpages/shorewall.conf.xml
new file mode 100644
index 000000000..786764d31
--- /dev/null
+++ b/manpages/shorewall.conf.xml
@@ -0,0 +1,51 @@
+
+
+
+ shorewall.conf
+
+ 5
+
+
+
+ shorewall.conf
+
+ Shorewall global configuration file
+
+
+
+
+ /etc/shorewall/shorewall.conf
+
+
+
+
+ Description
+
+ This file sets options that apply to Shorewall as a whole.
+
+ The file consists of Shell comments (lines beginning with '#'),
+ blank lines and assignment statements
+ (variable=value). Each
+ variable's setting is preceded by comments that describe the variable and
+ it's effect.
+
+
+
+ FILES
+
+ /etc/shorewall/shorewall.conf
+
+
+
+ See ALSO
+
+ shorewall(8), shorewall-accounting(5), shorewall-actions(5),
+ shorewall-blacklist(5), shorewall-hosts(5), shorewall-interfaces(5),
+ shorewall-ipsec(5), shorewall-maclist(5), shorewall-masq(5),
+ shorewall-nat(5), shorewall-netmap(5), shorewall-params(5),
+ shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5),
+ shorewall-route_rules(5), shorewall-routestopped(5), shorewall-rules(5),
+ shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-tcrules(5),
+ shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5)
+
+
\ No newline at end of file
diff --git a/manpages/shorewall.xml b/manpages/shorewall.xml
index 5fb30738b..ee7cda0c6 100644
--- a/manpages/shorewall.xml
+++ b/manpages/shorewall.xml
@@ -188,6 +188,8 @@
directorysystem
+
+
@@ -333,9 +335,8 @@
show
-
-
-
+
@@ -347,9 +348,17 @@
-
-
-
+
+
+
+
+ shorewall
+
+ -options
+
+ show
+
+
@@ -522,6 +531,15 @@
The delete command reverses the effect of an earlier add command.
+
+ The interface argument names an interface
+ defined in the shorewall-interfaces(5) file. A
+ host-list is comma-separated list whose
+ elements are:
+
+ A host or network address
+ The name of a bridge port
+ The name of a bridge port followed by a colon (:) and a host or network address
@@ -554,7 +572,7 @@
If directory1 is omitted, the current
- working directory is assumed.
+ working directory is assumed.
Allows a non-root user to compile a shorewall script and stage
it on a system (provided that the user has access to the system via
@@ -855,6 +873,24 @@
+
+ classifiers
+
+
+ Displays information about the packet classifiers
+ defined on the system as a result of traffic shaping
+ configuration.
+
+
+
+
+ config
+
+
+ Dispays distribution-specific defaults.
+
+
+
connections
@@ -863,9 +899,120 @@
the firewall.
+
+
+ macros
+
+
+ Displays information about each macro defined on the
+ firewall system.
+
+
+
+
+ mangle
+
+
+ Displays the Netfilter mangle table using the command
+ iptables -t mangle -L -n -v.
+ The -x option is passed
+ directly through to iptables.
+
+
+
+
+ nat
+
+
+ Displays the Netfilter nat table using the command
+ iptables -t nat -L -n -v. The
+ -x option is passed directly
+ through to iptables.
+
+
+
+
+ tc
+
+
+ Displays information about queuing disciplines, classes
+ and filters.
+
+
+
+
+ zones
+
+
+ Displays the current composition of the Shorewall zones
+ on the system.
+
+
+
+
+ start
+
+
+ Start shorewall. Existing connections through shorewall
+ managed interfaces are untouched. New connections will be allowed
+ only if they are allowed by the firewall rules or policies. If a
+ directory is included in the command, Shorewall
+ will look in that directory first for
+ configuration files.If -f is
+ specified, the saved configuration specified by the RESTOREFILE
+ option in shorewall.conf(5) will be restored if that saved
+ configuration exists and has been modified more recently than the
+ files in /etc/shorewall.
+
+
+
+
+ stop
+
+
+ Stops the firewall. All existing connections, except those
+ listed in shorewall-routestopped(5) or permitted by the
+ ADMINISABSENTMINDED option in shorewall.conf(5), are taken down. The
+ only new traffic permitted through the firewall is from systems
+ listed in shorewall-routestopped(5) or by
+ ADMINISABSENTMINDED.
+
+
+
+
+ status
+
+
+ Produces a short report about the state of the
+ Shorewall-configured firewall.
+
+
+
+
+ try (Deprecated)
+
+
+ Restart shorewall using the specified configuration. If an
+ error occurs during the restart, then another shorewall restart is performed using the
+ default configuration. If a timeout is specified then the restart is
+ always performed after the timeout occurs and uses the default
+ configuration. When restarting using the default configuration, if
+ the default restore script (as specified by the RESTOREFILE setting
+ in shorewall.conf(5) exists. then that script is used.
+
+
+
+
+ version
+
+
+ Displays Shorewall.s version.
+
+