diff options
| author | bmah <bmah@FreeBSD.org> | 2006-09-07 23:41:11 +0000 |
|---|---|---|
| committer | bmah <bmah@FreeBSD.org> | 2006-09-07 23:41:11 +0000 |
| commit | 925615500697341c0528822997a1297880d17294 (patch) | |
| tree | 1855343afc255f65d382cde15e766cdabe405bd7 /release | |
| parent | 6fcacdf9ef0cd1da2c15286183384942aeb86acf (diff) | |
| download | FreeBSD-src-925615500697341c0528822997a1297880d17294.zip FreeBSD-src-925615500697341c0528822997a1297880d17294.tar.gz | |
MFC noted: lukemftpd from NetBSD snapshot.
Diffstat (limited to 'release')
| -rw-r--r-- | release/doc/en_US.ISO8859-1/relnotes/article.sgml | 2 | ||||
| -rw-r--r-- | release/doc/en_US.ISO8859-1/relnotes/common/new.sgml | 2 |
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 3d187f7..b358693 100644 --- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml +++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml @@ -1627,7 +1627,7 @@ mdconfig_md1="-t vnode -f /var/foo.img"</programlisting> <para><application>lukemftpd</application> has been updated from a snapshot from NetBSD as of 9 August 2004 to a snapshot from - NetBSD as of 31 August 2006.</para> + NetBSD as of 31 August 2006. &merged;</para> <para><application>OpenSSH</application> has been updated from 4.2p1 to 4.3p1.</para> 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 3d187f7..b358693 100644 --- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml +++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml @@ -1627,7 +1627,7 @@ mdconfig_md1="-t vnode -f /var/foo.img"</programlisting> <para><application>lukemftpd</application> has been updated from a snapshot from NetBSD as of 9 August 2004 to a snapshot from - NetBSD as of 31 August 2006.</para> + NetBSD as of 31 August 2006. &merged;</para> <para><application>OpenSSH</application> has been updated from 4.2p1 to 4.3p1.</para> |
