extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-22 14:20:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://server.shorewall.net/home/teastep/shorewall/code

Browse Source
This commit is contained in:
Tom Eastep 2015-11-09 07:37:08 -08:00
commit 2994808e83
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
docs/Build.xml
View File

@ -164,10 +164,10 @@
</section>
<section>
<title>build45 and build46</title>
<title>build45, build46 and build50</title>
<para>These are the scripts that respectively build Shorewall 4.5 and
Shorewall 4.6 packages from Git.</para>
<para>These are the scripts that respectively build Shorewall 4.5,
Shorewall 4.6 and Shorewall 5.0 packages from Git.</para>
<para>The scripts copy content from Git using the <command>git
archive</command> command. They then use that content to build the
@ -281,7 +281,7 @@
<para>The general form of the build command is:</para>
<blockquote>
<para><command>build</command>4x [ -<replaceable>options</replaceable>
<para><command>build</command>xx [ -<replaceable>options</replaceable>
] <replaceable>release</replaceable> [ <replaceable>prior
release</replaceable> ]</para>
</blockquote>
@ -549,15 +549,23 @@
</listitem>
<listitem>
<para>MAC - Apple MacIntosh (Shorewall and Shorewall6 packages
only)</para>
<para>MAC - Apple MacIntosh (Shorewall-core, Shorewall and
Shorewall6 packages only)</para>
</listitem>
<listitem>
<para>CYGWIN - Cygwin under Windows (Shorewall and Shorewall6
packages only)</para>
<para>CYGWIN - Cygwin under Windows (Shorewall-core, Shorewall and
Shorewall6 packages only)</para>
</listitem>
<listitem>
<para>OPENWRT - OpenWRT (Shorewall-core, Shorewall6-lite ad
Shorewall6-lite only)</para>
</listitem>
</itemizedlist>
<para>See the <ulink url="Insall.htm">installation article</ulink> for
additional information</para>
</section>
</section>
</article>

18
docs/Install.xml
View File

@ -187,6 +187,10 @@
<listitem>
<para>shorewallrc.suse (SLES and OpenSuSE)</para>
</listitem>
<listitem>
<para>shorewallrc.openwrt (OpenWRT)</para>
</listitem>
</itemizedlist>
<para>When installing 4.5.2 or later for the first time, a special
@ -232,9 +236,9 @@
<member>./install.sh
<replaceable>shorewallrcfile-that-meets-your-needs</replaceable></member>
<member></member>
<member/>
<member>Example: <command>./install
<member>Example: <command>./install.sh
shorewallrc.debian</command></member>
</simplelist>
</listitem>
@ -334,6 +338,14 @@
<para>SLES and OpenSuSe</para>
</listitem>
</varlistentry>
<varlistentry>
<term>openwrt</term>
<listitem>
<para>OpenWRT (Shorewall 5.0.2 and later)</para>
</listitem>
</varlistentry>
</variablelist>
</listitem>
</varlistentry>
@ -698,7 +710,7 @@
root of the filesystem tree. In other words, the created installation
is only runnable if one chroots to $DESTDIR. Please note that the
uninstall.sh scripts cannot uninstall a configuration installed with
non-empty DESTDIR. </para>
non-empty DESTDIR.</para>
</section>
<section>