[src/trunk]: src/doc Whoops, merge two lines about iscsi initiator.

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f93b14668ac4
branches:  trunk
changeset: 763645:f93b14668ac4
user:      riz <riz%NetBSD.org@localhost>
date:      Tue Mar 29 18:07:14 2011 +0000

description:
Whoops, merge two lines about iscsi initiator.

diffstat:

 doc/NetBSD-6 |  3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diffs (20 lines):

diff -r 6e026bbb99ef -r f93b14668ac4 doc/NetBSD-6
--- a/doc/NetBSD-6      Tue Mar 29 17:29:20 2011 +0000
+++ b/doc/NetBSD-6      Tue Mar 29 18:07:14 2011 +0000
@@ -7,7 +7,7 @@
 Will be in 6.0
 --------------
 + ZFS - need an update on viability, needs work
-+ in-kernel iSCSI initiator, and userland tools - libisns in repo and in build
++ in-kernel iSCSI initiator, and user tools - libisns done, kernel portion near
 + 64-bit time_t
 + rump - pooka has declared interfaces stable
 + LVM/dmapper and tools
@@ -40,7 +40,6 @@
 + kernel modules need work
 + Xen suspend/resume - jym working on it
 + TNF funding for release engineering
-+ in-kernel iscsi initiator - excellent progress being made
 
 May not make 6.0
 ----------------