diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index 0fb5a474965..b1c2a847436 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -416,7 +416,7 @@
net.inet.ip.portrange.randomtime
seconds. The default values for these two sysctl variables
are 10 and 45,
- respectively.
+ respectively. &merged;
Fine-grained locking has been applied to many of the data
structures in the IPX/SPX protocol stack. While not fully
@@ -549,6 +549,12 @@
Device nodes have been managed by the &man.devfs.5; device file
system since &os; 5.0.
+ The &man.moused.8; daemon now supports virtual
+ scrolling, in which mouse motions made while holding
+ down the middle mouse button are interpreted as scrolling. This
+ feature is enabled with the
+ flag. &merged;
+
For years, &os; has used Makefile
variables of the form
NOFOO and
@@ -582,13 +588,13 @@
The &man.syslogd.8; utility now opens an additional domain
socket /var/run/logpriv by default,
with 0600 permissions to be used
- by privileged programs. This prevents the privileged
+ by privileged programs. This prevents privileged
programs from locking when the domain sockets
- run out of the buffer space due to
- local denial-of-service attack.
+ run out of buffer space due to a
+ local denial-of-service attack. &merged;The option of &man.tail.1; utility
- now supports more than one file at a time.
+ now supports more than one file at a time. &merged;
The &man.telnet.1; and &man.telnetd.8; programs now support
the option for specifying a numeric TOS
@@ -613,20 +619,20 @@
/etc/rc.d Scripts
- &man.rc.conf.5; now supports change of the interface name
- on boot time. For example:
+ &man.rc.conf.5; now supports changes of network interface names
+ at boot time. For example:ifconfig_fxp0_name="net0"
ifconfig_net0="inet 10.0.0.1/16"The rc.d/moused script now
- start/stop/check on a specific device when
- the device name as the second argument to the script:
+ starts/stops/checks a specific device when
+ the device name is given as the second argument to the script:&prompt.root; /etc/rc.d/moused start ums0To use different &man.rc.conf.5; knobs with different
- mice use the device name as part of the knob.
+ mice, use the device name as part of the knob.
For example, if the mouse device is /dev/ums0
the following lines can be used:
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 0fb5a474965..b1c2a847436 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -416,7 +416,7 @@
net.inet.ip.portrange.randomtime
seconds. The default values for these two sysctl variables
are 10 and 45,
- respectively.
+ respectively. &merged;
Fine-grained locking has been applied to many of the data
structures in the IPX/SPX protocol stack. While not fully
@@ -549,6 +549,12 @@
Device nodes have been managed by the &man.devfs.5; device file
system since &os; 5.0.
+ The &man.moused.8; daemon now supports virtual
+ scrolling, in which mouse motions made while holding
+ down the middle mouse button are interpreted as scrolling. This
+ feature is enabled with the
+ flag. &merged;
+
For years, &os; has used Makefile
variables of the form
NOFOO and
@@ -582,13 +588,13 @@
The &man.syslogd.8; utility now opens an additional domain
socket /var/run/logpriv by default,
with 0600 permissions to be used
- by privileged programs. This prevents the privileged
+ by privileged programs. This prevents privileged
programs from locking when the domain sockets
- run out of the buffer space due to
- local denial-of-service attack.
+ run out of buffer space due to a
+ local denial-of-service attack. &merged;The option of &man.tail.1; utility
- now supports more than one file at a time.
+ now supports more than one file at a time. &merged;
The &man.telnet.1; and &man.telnetd.8; programs now support
the option for specifying a numeric TOS
@@ -613,20 +619,20 @@
/etc/rc.d Scripts
- &man.rc.conf.5; now supports change of the interface name
- on boot time. For example:
+ &man.rc.conf.5; now supports changes of network interface names
+ at boot time. For example:ifconfig_fxp0_name="net0"
ifconfig_net0="inet 10.0.0.1/16"The rc.d/moused script now
- start/stop/check on a specific device when
- the device name as the second argument to the script:
+ starts/stops/checks a specific device when
+ the device name is given as the second argument to the script:&prompt.root; /etc/rc.d/moused start ums0To use different &man.rc.conf.5; knobs with different
- mice use the device name as part of the knob.
+ mice, use the device name as part of the knob.
For example, if the mouse device is /dev/ums0
the following lines can be used: