holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Merge branch 'master' of ssh://shorewall.git.sourceforge.net/gitroot/shorewall/shorewall

Browse Source 
Conflicts:
	Shorewall-core/install.sh
	Shorewall/install.sh

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-02-25 07:30:07 -08:00
commit 016fe4bcf1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Shorewall/manpages/shorewall.xml
View File

@ -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.5.0, you may specify a different <para>Beginning 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.5.0, you may specify a different <para>Beginning 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.5.0, the numeric <para>Beginning 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

6
Shorewall6/manpages/shorewall6.xml
View File

@ -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.5.0, you may specify a different <para>Beginning 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.5.0, you may specify a different <para>Beginning 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.5.0, the numeric <para>Beginning 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