mirror of
https://gitlab.com/shorewall/code.git
synced 2024-11-22 07:33:43 +01:00
4.4.28->4.5.0
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
parent
0686df326d
commit
72699a6af6
@ -3,7 +3,7 @@
|
|||||||
#
|
#
|
||||||
# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
|
# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
|
||||||
#
|
#
|
||||||
# (c) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011 - Tom Eastep (teastep@shorewall.net)
|
# (c) 1999-2012 - Tom Eastep (teastep@shorewall.net)
|
||||||
#
|
#
|
||||||
# Complete documentation is available at http://shorewall.net
|
# Complete documentation is available at http://shorewall.net
|
||||||
#
|
#
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#
|
#
|
||||||
# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
|
# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
|
||||||
#
|
#
|
||||||
# (c) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011 - Tom Eastep (teastep@shorewall.net)
|
# (c) 1999-2012 - Tom Eastep (teastep@shorewall.net)
|
||||||
#
|
#
|
||||||
# Complete documentation is available at http://shorewall.net
|
# Complete documentation is available at http://shorewall.net
|
||||||
#
|
#
|
||||||
|
@ -1243,7 +1243,7 @@
|
|||||||
directory is given, then Shorewall will look in that directory first
|
directory is given, then Shorewall will look in that directory first
|
||||||
when opening configuration files.</para>
|
when opening configuration files.</para>
|
||||||
|
|
||||||
<para>Begining with Shorewall 4.4.28, you may specify a different
|
<para>Begining with Shorewall 4.5.0, you may specify a different
|
||||||
<replaceable>timeout</replaceable> value using the
|
<replaceable>timeout</replaceable> value using the
|
||||||
<option>-t</option> option. The numeric
|
<option>-t</option> option. The numeric
|
||||||
<replaceable>timeout</replaceable> may optionally be followed by an
|
<replaceable>timeout</replaceable> may optionally be followed by an
|
||||||
@ -1265,7 +1265,7 @@
|
|||||||
Shorewall will look in that directory first when opening
|
Shorewall will look in that directory first when opening
|
||||||
configuration files.</para>
|
configuration files.</para>
|
||||||
|
|
||||||
<para>Begining with Shorewall 4.4.28, you may specify a different
|
<para>Begining with Shorewall 4.5.0, you may specify a different
|
||||||
<replaceable>timeout</replaceable> value using the
|
<replaceable>timeout</replaceable> value using the
|
||||||
<option>-t</option> option. The numeric
|
<option>-t</option> option. The numeric
|
||||||
<replaceable>timeout</replaceable> may optionally be followed by an
|
<replaceable>timeout</replaceable> may optionally be followed by an
|
||||||
@ -1600,7 +1600,7 @@
|
|||||||
role="bold">restore</emphasis> is performed after
|
role="bold">restore</emphasis> is performed after
|
||||||
<replaceable>timeout</replaceable> seconds.</para>
|
<replaceable>timeout</replaceable> seconds.</para>
|
||||||
|
|
||||||
<para>Begining with Shorewall 4.4.28, the numeric
|
<para>Begining with Shorewall 4.5.0, the numeric
|
||||||
<replaceable>timeout</replaceable> may optionally be followed by an
|
<replaceable>timeout</replaceable> may optionally be followed by an
|
||||||
<option>s</option>, <option>m</option> or <option>h</option> suffix
|
<option>s</option>, <option>m</option> or <option>h</option> suffix
|
||||||
(e.g., 5m) to specify seconds, minutes or hours respectively. If the
|
(e.g., 5m) to specify seconds, minutes or hours respectively. If the
|
||||||
|
@ -1108,7 +1108,7 @@
|
|||||||
directory is given, then Shorewall6 will look in that directory
|
directory is given, then Shorewall6 will look in that directory
|
||||||
first when opening configuration files.</para>
|
first when opening configuration files.</para>
|
||||||
|
|
||||||
<para>Begining with Shorewall 4.4.28, you may specify a different
|
<para>Begining with Shorewall 4.5.0, you may specify a different
|
||||||
<replaceable>timeout</replaceable> value using the
|
<replaceable>timeout</replaceable> value using the
|
||||||
<option>-t</option> option. The numeric
|
<option>-t</option> option. The numeric
|
||||||
<replaceable>timeout</replaceable> may optionally be followed by an
|
<replaceable>timeout</replaceable> may optionally be followed by an
|
||||||
@ -1130,7 +1130,7 @@
|
|||||||
Shorewall6 will look in that directory first when opening
|
Shorewall6 will look in that directory first when opening
|
||||||
configuration files.</para>
|
configuration files.</para>
|
||||||
|
|
||||||
<para>Begining with Shorewall 4.4.28, you may specify a different
|
<para>Begining with Shorewall 4.5.0, you may specify a different
|
||||||
<replaceable>timeout</replaceable> value using the
|
<replaceable>timeout</replaceable> value using the
|
||||||
<option>-t</option> option. The numeric
|
<option>-t</option> option. The numeric
|
||||||
<replaceable>timeout</replaceable> may optionally be followed by an
|
<replaceable>timeout</replaceable> may optionally be followed by an
|
||||||
@ -1422,7 +1422,7 @@
|
|||||||
role="bold">restore</emphasis> is performed after
|
role="bold">restore</emphasis> is performed after
|
||||||
<replaceable>timeout</replaceable> seconds.</para>
|
<replaceable>timeout</replaceable> seconds.</para>
|
||||||
|
|
||||||
<para>Begining with Shorewall 4.4.28, the numeric
|
<para>Begining with Shorewall 4.5.0, the numeric
|
||||||
<replaceable>timeout</replaceable> may optionally be followed by an
|
<replaceable>timeout</replaceable> may optionally be followed by an
|
||||||
<option>s</option>, <option>m</option> or <option>h</option> suffix
|
<option>s</option>, <option>m</option> or <option>h</option> suffix
|
||||||
(e.g., 5m) to specify seconds, minutes or hours respectively. If the
|
(e.g., 5m) to specify seconds, minutes or hours respectively. If the
|
||||||
|
Loading…
Reference in New Issue
Block a user