Use 'stop_firewall' when

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9344 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb

Shorewall-perl/prog.footer

@@ -101,13 +101,9 @@ case "$COMMAND" in
     stop)
 	[ $# -ne 1 ] && usage 2
 	progress_message3 "Stopping $PRODUCT...."
-	if [ -n "$RTCONLY" ]; then
+	stop_firewall
-	    delete_tc1
-	else
-	    stop_firewall
-	fi
 	status=0
-	[ -n "$SUBSYSLOCK" ] && rm -f $SUBSYSLOCK
+	[ -n "$SUBSYSLOCK" ] && [ -z "$RTCONLY" ] && rm -f $SUBSYSLOCK
 	progress_message3 "done."
 	;;
     reset)
@@ -188,15 +184,11 @@ case "$COMMAND" in
 	;;
     clear)
 	[ $# -ne 1 ] && usage 2
-	if [ -n "${NORTC}$"{RTCONLY} ]; then
+	progress_message3 "Clearing $PRODUCT...."
-	    error_message "The -n and -r options may not be used with 'clear'"
+	clear_firewall
-	    status=1
+	status=0
-	else
+	[ -n "$SUBSYSLOCK" ] && [ -z "$RTCONLY" ] && rm -f $SUBSYSLOCK
-	    progress_message3 "Clearing $PRODUCT...."
+	progress_message3 "done."
-	    clear_firewall
-	    status=0
-	    [ -n "$SUBSYSLOCK" ] && rm -f $SUBSYSLOCK
-	    progress_message3 "done."
 	fi
 	;;
     status)

manpages/shorewall-nesting.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
 <refentry>
   <refmeta>
     <refentrytitle>shorewall-nesting</refentrytitle>
@@ -208,4 +210,4 @@
     shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5),
     shorewall-zones(5)</para>
   </refsect1>
-</refentry>
+</refentry>