summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2007-10-08 16:17:42 +0000
committerdelphij <delphij@FreeBSD.org>2007-10-08 16:17:42 +0000
commitcee6fe7563d96f028c6e9343a81e24f9c7f70296 (patch)
treea5e1c28b8d2c6768b8b27fa4e866fa91cd86f8b9 /release
parentde40ea14af9f01e8574114a8b793148ba1910638 (diff)
downloadFreeBSD-src-cee6fe7563d96f028c6e9343a81e24f9c7f70296.zip
FreeBSD-src-cee6fe7563d96f028c6e9343a81e24f9c7f70296.tar.gz
Resolve conflicts to complete less v408 import.
Approved by: re (kensmith)
Diffstat (limited to 'release')
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/article.sgml2
1 files changed, 1 insertions, 1 deletions
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index 6d4b39a..60a65d2 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -2314,7 +2314,7 @@ mdconfig_md1="-t vnode -f /var/foo.img"</programlisting>
4.1.8 to 4.1.23.</para>
<para><application>less</application> has been updated from v381
- to v406. &merged;</para>
+ to v408.</para>
<para><application>libpcap</application> has been updated from
0.9.1 to 0.9.4. &merged;</para>
OpenPOWER on IntegriCloud