Update the 'Build' and 'Install' files for 5.0

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2015-11-08 13:33:25 -08:00
parent 8ae6e3ff57
commit 65a0c62b0d
2 changed files with 31 additions and 11 deletions

View File

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

View File

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