diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index cdf6b8c1db9..1432adde3d3 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -129,7 +129,7 @@
The kernel message buffer is now accessible by the
(machine-independent) kern.msgbuf sysctl
variable; &man.dmesg.8; no longer needs to be SGID
- kmem.
+ kmem. &merged;
The &man.kqueue.2; event notification facility was added to
the &os; kernel. This is a new interface which is able to
@@ -260,13 +260,13 @@
The umodem driver for USB modems has been added.
Support is provided for the 3Com 5605 and Metricom Ricochet GS
- wireless USB modems.
+ wireless USB modems. &merged;The &man.uscanner.4; driver for basic USB scanner support
using SANE has been added. See the SANE home page for
supported scanners. The HP ScanJet 4100C, 5200C and 6300C are
- known to be working.
+ known to be working. &merged;
The USER_LDT kernel option is now
activated by default.
@@ -286,9 +286,6 @@
Support for threads under Linux emulation has been
added.
- A number of cleanups and enhancements have been applied to
- the PCI subsystem.
-
The buildkernel target now gets the
name of the configuration(s) to build from the
KERNCONF variable, not
@@ -560,7 +557,7 @@
PC-Cards has been added back in the &man.fe.4; driver. &merged;The &man.fpa.4; driver now supports Digital's
- DEFPA FDDI adaptors on the Alpha.
+ DEFPA FDDI adaptors on the Alpha. &merged;
The &man.fxp.4; driver now requires a device
miibus entry in the kernel configuration file. &merged;
@@ -713,7 +710,7 @@ options HZ=1000 # not compulsory but strongly recommended
option. The only keyword
has been added to the and
flags, to be used in creating
- proxy-only published entries.
+ proxy-only published entries. &merged;
The read timeout feature of &man.bpf.4; now works more
correctly with &man.select.2;/&man.poll.2;, and therefore with
@@ -745,8 +742,6 @@ options HZ=1000 # not compulsory but strongly recommended
&man.ipfw.4; now filters correctly in the presence of ECN bits in TCP
segments. &merged;
- &man.netgraph.4; has received some updates and bugfixes.
-
A new &man.ng.eth.4; netgraph node allows Ethernet type
packets to be filtered to different hooks depending on
ethertype.
@@ -800,7 +795,7 @@ options HZ=1000 # not compulsory but strongly recommended
faster. &merged;The TCP_COMPAT_42 kernel option has
- been removed.
+ been removed. &merged;
The TCP_RESTRICT_RST kernel option has
been removed. Similar functionality can be achieved with the
@@ -1168,11 +1163,11 @@ options HZ=1000 # not compulsory but strongly recommended
memory allocation have been made. Bugs in &man.devfs.5; when
unloading and reloading have been fixed.
Support for new Hauppauge Model 44xxx WinTV Cards (the ones with
- no audio mux) has been added.
+ no audio mux) has been added. &merged;
When sound modules are built, one can now load all the
drivers and infrastructure by kldload
- snd.
+ snd. &merged;
A new API has been added for sound cards with hardware
volume control.
@@ -1598,7 +1593,7 @@ options HZ=1000 # not compulsory but strongly recommended
changing the mode of a symbolic link.
&man.chown.8; now correctly follows symbolic links named as
- command line arguments if run without .
+ command line arguments if run without . &merged;
&man.chown.8; no longer takes . as a
user/group delimeter. This change was made to support usernames
@@ -1866,7 +1861,7 @@ options HZ=1000 # not compulsory but strongly recommended
&man.perl.1;. &merged;&man.killall.1; now allows non-root users to kill SUID root
- processes that they started, the same as the Perl version did.
+ processes that they started, the same as the Perl version did. &merged;
The &man.kldconfig.8; utility has been added to make it easier to
manipulate the kernel module search path. &merged;
@@ -2265,7 +2260,7 @@ options HZ=1000 # not compulsory but strongly recommended
moved to <sys/selinfo.h>.
The &man.strnstr.3; and &man.strcasestr.3; variants of
- &man.strstr.3; have been implemented.
+ &man.strstr.3; have been implemented. &merged;
&man.stty.1; now has support for an
erase2 control character, so that, for example,
@@ -2273,7 +2268,7 @@ options HZ=1000 # not compulsory but strongly recommended
keys can be used to erase characters. &merged;&man.style.perl.7;, a style guide for Perl code in the &os;
- base system, has been added.
+ base system, has been added. &merged;
&man.su.1; now uses PAM for
authentication.
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 cdf6b8c1db9..1432adde3d3 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -129,7 +129,7 @@
The kernel message buffer is now accessible by the
(machine-independent) kern.msgbuf sysctl
variable; &man.dmesg.8; no longer needs to be SGID
- kmem.
+ kmem. &merged;
The &man.kqueue.2; event notification facility was added to
the &os; kernel. This is a new interface which is able to
@@ -260,13 +260,13 @@
The umodem driver for USB modems has been added.
Support is provided for the 3Com 5605 and Metricom Ricochet GS
- wireless USB modems.
+ wireless USB modems. &merged;The &man.uscanner.4; driver for basic USB scanner support
using SANE has been added. See the SANE home page for
supported scanners. The HP ScanJet 4100C, 5200C and 6300C are
- known to be working.
+ known to be working. &merged;
The USER_LDT kernel option is now
activated by default.
@@ -286,9 +286,6 @@
Support for threads under Linux emulation has been
added.
- A number of cleanups and enhancements have been applied to
- the PCI subsystem.
-
The buildkernel target now gets the
name of the configuration(s) to build from the
KERNCONF variable, not
@@ -560,7 +557,7 @@
PC-Cards has been added back in the &man.fe.4; driver. &merged;The &man.fpa.4; driver now supports Digital's
- DEFPA FDDI adaptors on the Alpha.
+ DEFPA FDDI adaptors on the Alpha. &merged;
The &man.fxp.4; driver now requires a device
miibus entry in the kernel configuration file. &merged;
@@ -713,7 +710,7 @@ options HZ=1000 # not compulsory but strongly recommended
option. The only keyword
has been added to the and
flags, to be used in creating
- proxy-only published entries.
+ proxy-only published entries. &merged;
The read timeout feature of &man.bpf.4; now works more
correctly with &man.select.2;/&man.poll.2;, and therefore with
@@ -745,8 +742,6 @@ options HZ=1000 # not compulsory but strongly recommended
&man.ipfw.4; now filters correctly in the presence of ECN bits in TCP
segments. &merged;
- &man.netgraph.4; has received some updates and bugfixes.
-
A new &man.ng.eth.4; netgraph node allows Ethernet type
packets to be filtered to different hooks depending on
ethertype.
@@ -800,7 +795,7 @@ options HZ=1000 # not compulsory but strongly recommended
faster. &merged;The TCP_COMPAT_42 kernel option has
- been removed.
+ been removed. &merged;
The TCP_RESTRICT_RST kernel option has
been removed. Similar functionality can be achieved with the
@@ -1168,11 +1163,11 @@ options HZ=1000 # not compulsory but strongly recommended
memory allocation have been made. Bugs in &man.devfs.5; when
unloading and reloading have been fixed.
Support for new Hauppauge Model 44xxx WinTV Cards (the ones with
- no audio mux) has been added.
+ no audio mux) has been added. &merged;
When sound modules are built, one can now load all the
drivers and infrastructure by kldload
- snd.
+ snd. &merged;
A new API has been added for sound cards with hardware
volume control.
@@ -1598,7 +1593,7 @@ options HZ=1000 # not compulsory but strongly recommended
changing the mode of a symbolic link.
&man.chown.8; now correctly follows symbolic links named as
- command line arguments if run without .
+ command line arguments if run without . &merged;
&man.chown.8; no longer takes . as a
user/group delimeter. This change was made to support usernames
@@ -1866,7 +1861,7 @@ options HZ=1000 # not compulsory but strongly recommended
&man.perl.1;. &merged;&man.killall.1; now allows non-root users to kill SUID root
- processes that they started, the same as the Perl version did.
+ processes that they started, the same as the Perl version did. &merged;
The &man.kldconfig.8; utility has been added to make it easier to
manipulate the kernel module search path. &merged;
@@ -2265,7 +2260,7 @@ options HZ=1000 # not compulsory but strongly recommended
moved to <sys/selinfo.h>.
The &man.strnstr.3; and &man.strcasestr.3; variants of
- &man.strstr.3; have been implemented.
+ &man.strstr.3; have been implemented. &merged;
&man.stty.1; now has support for an
erase2 control character, so that, for example,
@@ -2273,7 +2268,7 @@ options HZ=1000 # not compulsory but strongly recommended
keys can be used to erase characters. &merged;&man.style.perl.7;, a style guide for Perl code in the &os;
- base system, has been added.
+ base system, has been added. &merged;
&man.su.1; now uses PAM for
authentication.