summaryrefslogtreecommitdiffstats
path: root/release/doc
diff options
context:
space:
mode:
authorbmah <bmah@FreeBSD.org>2008-03-31 05:06:00 +0000
committerbmah <bmah@FreeBSD.org>2008-03-31 05:06:00 +0000
commitb4b0aede1a33c2ea1df81c978b163b4eb958a429 (patch)
tree4a8c8dbef1ea3825a6f0622bb2640b54d2172f90 /release/doc
parente0aea08fdaeefb1fef485f5603b75a7e53e09672 (diff)
downloadFreeBSD-src-b4b0aede1a33c2ea1df81c978b163b4eb958a429.zip
FreeBSD-src-b4b0aede1a33c2ea1df81c978b163b4eb958a429.tar.gz
MFCs noted: BTX real mode, TCP options processing fix, hptrr 1.2.
Diffstat (limited to 'release/doc')
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/article.sgml6
1 files changed, 3 insertions, 3 deletions
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index e86ebe3..5204ce8 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -190,7 +190,7 @@
<para>[&arch.amd64;, &arch.i386;] The BTX kernel used by the boot
loader has been changed to invoke BIOS routines from real
mode. This change makes it possible to boot &os; from USB
- devices.</para>
+ devices. &merged;</para>
<para>[&arch.amd64;, &arch.i386;] A new gptboot boot loader has
been added to support booting from a GPT labeled disk. A
@@ -264,7 +264,7 @@
variable to <literal>1</literal>.</para>
<para>A bug in TCP options padding, where the wrong padding
- bytes were used, has been fixed.</para>
+ bytes were used, has been fixed. &merged;</para>
</sect3>
@@ -279,7 +279,7 @@
this feature.</para>
<para>The &man.hptrr.4; driver has been updated to version 1.2
- from Highpoint.</para>
+ from Highpoint. &merged;</para>
</sect3>
OpenPOWER on IntegriCloud