summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorbmah <bmah@FreeBSD.org>2001-09-10 20:41:39 +0000
committerbmah <bmah@FreeBSD.org>2001-09-10 20:41:39 +0000
commit786d3f851180d861352082e39d54a10a64f07c53 (patch)
treee275a3617d9a651c7a611c862013ae4476b40507 /release
parentd0a67ff6c2155286a9a1c16887efc1d94710cd94 (diff)
downloadFreeBSD-src-786d3f851180d861352082e39d54a10a64f07c53.zip
FreeBSD-src-786d3f851180d861352082e39d54a10a64f07c53.tar.gz
According to message-id <yfk7kv6rj15.fsf@vader.clickarray.com> on
freebsd-ports, ports/packages will be re-frozen and re-rolled before 4.4-RELEASE, so we can (imprecisely) mark the CVSup bugfix as being MFC-ed.
Diffstat (limited to 'release')
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/article.sgml2
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/common/new.sgml2
2 files changed, 2 insertions, 2 deletions
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index b26f190..902fde3 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -1946,7 +1946,7 @@ hw.pcic.irq="0"</programlisting>
<port>net/cvsup</port>. This update fixes a long-standing
(but only recently encountered) bug which affects the
timestamps on all files after Sun Sep 9 01:46:40 UTC 2001
- (1,000,000,000 seconds after the UNIX epoch).</para>
+ (1,000,000,000 seconds after the UNIX epoch). &merged;</para>
</sect4>
<sect4 id="kame-userland">
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 b26f190..902fde3 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -1946,7 +1946,7 @@ hw.pcic.irq="0"</programlisting>
<port>net/cvsup</port>. This update fixes a long-standing
(but only recently encountered) bug which affects the
timestamps on all files after Sun Sep 9 01:46:40 UTC 2001
- (1,000,000,000 seconds after the UNIX epoch).</para>
+ (1,000,000,000 seconds after the UNIX epoch). &merged;</para>
</sect4>
<sect4 id="kame-userland">
OpenPOWER on IntegriCloud