diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index 6ea8862a93ad..7214d8153d1d 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -358,7 +358,7 @@
console. &merged;
The uaudio driver, for USB audio devices, has been
- added.
+ added. &merged;
The &man.umodem.4; driver for USB modems
has been added. Support is provided for the 3Com 5605 and
@@ -998,6 +998,10 @@ options HZ=1000 # not compulsory but strongly recommended
packets into the main IP input processing code, has been
added.
+ A new &man.ng.l2tp.4; netgraph node type, which implements
+ the encapsulation layer of the L2TP protocol as described in
+ RFC 2661, has been added. &merged;
+
The &man.ng.mppc.4; and &man.ng.bridge.4; node types have
been added to the &man.netgraph.4; subsystem. The
&man.ng.ether.4; node is now dynamically loadable.
@@ -2210,7 +2214,7 @@ options HZ=1000 # not compulsory but strongly recommended
&man.daemon.3;, has been added. It detaches itself from its
controlling terminal and executes a program specified on the
command line. This allows the user to run an arbitrary program
- as if it were written to be a daemon.
+ as if it were written to be a daemon. &merged;
&man.devinfo.8;, a simple tool to print the device tree and resource
usage by devices, has been added.
@@ -2462,6 +2466,10 @@ options HZ=1000 # not compulsory but strongly recommended
media by default. Instead it displays it when the
flag is given. &merged;
+ &man.ifconfig.8; now has the ability to set promiscuous mode
+ on an interface, via the new
+ flag. &merged;
+
The syntax of &man.inetd.8;'s support for &man.faithd.8; is
now compatible with that of other BSDs. &merged;
@@ -2479,6 +2487,10 @@ options HZ=1000 # not compulsory but strongly recommended
inetd_enable="YES"
+ &man.inetd.8; now has the capability for limiting the
+ maximum number of simultaneous invocations of each service from
+ a single IP address. &merged;
+
&man.install.1; has a number of new features, including the
and options for backing up
existing target files and the option for
@@ -3706,7 +3718,7 @@ options HZ=1000 # not compulsory but strongly recommended
standard &os; installation (because &man.inetd.8; already
incorporates this functionality), this may be useful for
&man.inetd.8; replacements such as
- xinetd.
+ xinetd. &merged;
texinfo has been updated to
4.2. &merged;
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 6ea8862a93ad..7214d8153d1d 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -358,7 +358,7 @@
console. &merged;
The uaudio driver, for USB audio devices, has been
- added.
+ added. &merged;
The &man.umodem.4; driver for USB modems
has been added. Support is provided for the 3Com 5605 and
@@ -998,6 +998,10 @@ options HZ=1000 # not compulsory but strongly recommended
packets into the main IP input processing code, has been
added.
+ A new &man.ng.l2tp.4; netgraph node type, which implements
+ the encapsulation layer of the L2TP protocol as described in
+ RFC 2661, has been added. &merged;
+
The &man.ng.mppc.4; and &man.ng.bridge.4; node types have
been added to the &man.netgraph.4; subsystem. The
&man.ng.ether.4; node is now dynamically loadable.
@@ -2210,7 +2214,7 @@ options HZ=1000 # not compulsory but strongly recommended
&man.daemon.3;, has been added. It detaches itself from its
controlling terminal and executes a program specified on the
command line. This allows the user to run an arbitrary program
- as if it were written to be a daemon.
+ as if it were written to be a daemon. &merged;
&man.devinfo.8;, a simple tool to print the device tree and resource
usage by devices, has been added.
@@ -2462,6 +2466,10 @@ options HZ=1000 # not compulsory but strongly recommended
media by default. Instead it displays it when the
flag is given. &merged;
+ &man.ifconfig.8; now has the ability to set promiscuous mode
+ on an interface, via the new
+ flag. &merged;
+
The syntax of &man.inetd.8;'s support for &man.faithd.8; is
now compatible with that of other BSDs. &merged;
@@ -2479,6 +2487,10 @@ options HZ=1000 # not compulsory but strongly recommended
inetd_enable="YES"
+ &man.inetd.8; now has the capability for limiting the
+ maximum number of simultaneous invocations of each service from
+ a single IP address. &merged;
+
&man.install.1; has a number of new features, including the
and options for backing up
existing target files and the option for
@@ -3706,7 +3718,7 @@ options HZ=1000 # not compulsory but strongly recommended
standard &os; installation (because &man.inetd.8; already
incorporates this functionality), this may be useful for
&man.inetd.8; replacements such as
- xinetd.
+ xinetd. &merged;
texinfo has been updated to
4.2. &merged;