extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-01-03 03:59:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolve conflicts -- take 2

Browse Source
This commit is contained in:
Tom Eastep 2011-01-13 19:24:15 -08:00
parent edde07fd85
commit 4a69ad35ee
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/three-interface.xml
View File

@ -181,7 +181,7 @@
class="directory">/etc/shorewall</filename> directory is empty. This class="directory">/etc/shorewall</filename> directory is empty. This
is intentional. The released configuration file skeletons may be found is intentional. The released configuration file skeletons may be found
on your system in the directory <filename on your system in the directory <filename
class="directory">/usr/share/doc/shorewall-common/default-config</filename>. class="directory">/usr/share/doc/shorewall/default-config</filename>.
Simply copy the files you need from that directory to <filename Simply copy the files you need from that directory to <filename
class="directory">/etc/shorewall</filename> and modify the class="directory">/etc/shorewall</filename> and modify the
copies.</para> copies.</para>
@ -199,7 +199,7 @@
directory. If you don't know where the Shorewall documentation directory. If you don't know where the Shorewall documentation
directory is, you can find the samples using this command:</para> directory is, you can find the samples using this command:</para>
<programlisting>~# rpm -ql shorewall-common | fgrep three-interfaces <programlisting>~# rpm -ql shorewall | fgrep three-interfaces
/usr/share/doc/packages/shorewall/Samples/three-interfaces /usr/share/doc/packages/shorewall/Samples/three-interfaces
/usr/share/doc/packages/shorewall/Samples/three-interfaces/interfaces /usr/share/doc/packages/shorewall/Samples/three-interfaces/interfaces
/usr/share/doc/packages/shorewall/Samples/three-interfaces/masq /usr/share/doc/packages/shorewall/Samples/three-interfaces/masq
@ -224,7 +224,7 @@
<listitem> <listitem>
<para><graphic fileref="images/openlogo-nd-25.png" />If you installed <para><graphic fileref="images/openlogo-nd-25.png" />If you installed
using a Shorewall 4.x .deb, the samples are in <filename using a Shorewall 4.x .deb, the samples are in <filename
class="directory">/usr/share/doc/shorewall-common/examples/three-interfaces</filename>. class="directory">/usr/share/doc/shorewall/examples/three-interfaces</filename>.
You do not need the shorewall-doc package to have access to the You do not need the shorewall-doc package to have access to the
samples.</para> samples.</para>
</listitem> </listitem>