Merge branch '4.5.21'

This commit is contained in:
Tom Eastep 2014-01-15 17:39:03 -08:00
commit dec088566b
2 changed files with 13 additions and 2 deletions

View File

@ -1546,7 +1546,7 @@ do_dump_command() {
}
dump_command() {
do_dump_command | dump_filter
do_dump_command $@ | dump_filter
}
#
@ -3423,7 +3423,7 @@ usage() # $1 = exit status
echo " delete <interface>[:<host-list>] ... <zone>"
echo " disable <interface>"
echo " drop <address> ..."
echo " dump [ -x ]"
echo " dump [ -x ] [ -l ]"
echo " enable <interface>"
echo " forget [ <file name> ]"
echo " help"

View File

@ -3168,5 +3168,16 @@ EXT_IF:192.168.1.1 0.0.0.0/0 192.168.1.254
</listitem>
</orderedlist>
</section>
<section>
<title id="faq102">(FAQ 102) What is 'qt'? I see it in some of the older
documentation.</title>
<para><emphasis role="bold">Answer</emphasis>: 'qt' stands for 'quiet';
qt() is a shell function that accepts a command with arguments as
parameters. It redirects both standard out and standard error to
/dev/null. It is defined in the Shorewall-core shell library
lib.common.</para>
</section>
</section>
</article>