Merge branch '5.0.13'

This commit is contained in:
Tom Eastep 2016-10-16 16:36:08 -07:00
commit f3dd77a3f1
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
2 changed files with 6 additions and 4 deletions

View File

@ -920,7 +920,8 @@ net all DROP info</programlisting>then the chain name is 'net-all'
an administrative system in directories containing the an administrative system in directories containing the
configurations of remote firewalls. The contents of the variable are configurations of remote firewalls. The contents of the variable are
the default value for the <replaceable>system</replaceable> the default value for the <replaceable>system</replaceable>
parameter to the <command>remote-reload</command> and parameter to the <command>remote-start</command>,
<command>remote-reload</command> and
<command>remote-restart</command> commands.</para> <command>remote-restart</command> commands.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>

View File

@ -781,7 +781,8 @@ net all DROP info</programlisting>then the chain name is 'net-all'
an administrative system in directories containing the an administrative system in directories containing the
configurations of remote firewalls. The contents of the variable are configurations of remote firewalls. The contents of the variable are
the default value for the <replaceable>system</replaceable> the default value for the <replaceable>system</replaceable>
parameter to the <command>remote-reload</command> and parameter to the <command>remote-start</command>,
<command>remote-reload</command> and
<command>remote-restart</command> commands.</para> <command>remote-restart</command> commands.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>