summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorbmah <bmah@FreeBSD.org>2003-03-01 16:28:25 +0000
committerbmah <bmah@FreeBSD.org>2003-03-01 16:28:25 +0000
commit24699baf7fff5d4846d3bbc51c7d54acd85e76c5 (patch)
treee2b8617684b82685b2c06813d8cce4bce4ae67e0 /release
parent2a79d3755eba58a0a84cc24e12b74db4bc5d7a65 (diff)
downloadFreeBSD-src-24699baf7fff5d4846d3bbc51c7d54acd85e76c5.zip
FreeBSD-src-24699baf7fff5d4846d3bbc51c7d54acd85e76c5.tar.gz
Updated release notes: add nooption/nomakeoption to nodevice, FILE
3.41. MFC noted: IPFilter 3.4.31.
Diffstat (limited to 'release')
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/article.sgml9
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/common/new.sgml9
2 files changed, 12 insertions, 6 deletions
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index 959ed3a..2ca0801 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -293,7 +293,7 @@
<title>Contributed Software</title>
<para><application>IPFilter</application> has been updated to
- 3.4.31.</para>
+ 3.4.31. &merged;</para>
</sect3>
</sect2>
@@ -313,7 +313,10 @@
<para>&man.config.8; now implements a <literal>nodevice</literal>
kernel configuration file directive that cancels the effect of a
- <literal>device</literal> directive.</para>
+ <literal>device</literal> directive. The new
+ <literal>nooption</literal> and <literal>nomakeoption</literal>
+ directives cancel prior <literal>option</literal> and
+ <literal>makeoption</literal> directives, respectively.</para>
<para>The <option>-N</option> and <option>-W</option> flags to
&man.disklabel.8; have been retired.</para>
@@ -481,7 +484,7 @@
1.11.5. &merged;</para>
<para><application>FILE</application> has been updated to
- 3.40.</para>
+ 3.41.</para>
<para><application>GCC</application> has been updated to
3.2.2 (release version).</para>
diff --git a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
index 959ed3a..2ca0801 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -293,7 +293,7 @@
<title>Contributed Software</title>
<para><application>IPFilter</application> has been updated to
- 3.4.31.</para>
+ 3.4.31. &merged;</para>
</sect3>
</sect2>
@@ -313,7 +313,10 @@
<para>&man.config.8; now implements a <literal>nodevice</literal>
kernel configuration file directive that cancels the effect of a
- <literal>device</literal> directive.</para>
+ <literal>device</literal> directive. The new
+ <literal>nooption</literal> and <literal>nomakeoption</literal>
+ directives cancel prior <literal>option</literal> and
+ <literal>makeoption</literal> directives, respectively.</para>
<para>The <option>-N</option> and <option>-W</option> flags to
&man.disklabel.8; have been retired.</para>
@@ -481,7 +484,7 @@
1.11.5. &merged;</para>
<para><application>FILE</application> has been updated to
- 3.40.</para>
+ 3.41.</para>
<para><application>GCC</application> has been updated to
3.2.2 (release version).</para>
OpenPOWER on IntegriCloud