Index: english/po/ports.pot
===================================================================
RCS file: /cvs/webwml/webwml/english/po/ports.pot,v
retrieving revision 1.13
diff -u -r1.13 ports.pot
--- english/po/ports.pot	2 Nov 2006 03:19:27 -0000	1.13
+++ english/po/ports.pot	13 Apr 2007 14:59:35 -0000
@@ -109,11 +120,11 @@
 msgstr ""
 
 #: ../../english/ports/netbsd/menu.inc:6
-msgid "Debian GNU/NetBSD for i386"
+msgid "Debian GNU/kNetBSD for i386"
 msgstr ""
 
 #: ../../english/ports/netbsd/menu.inc:10
-msgid "Debian GNU/NetBSD for Alpha"
+msgid "Debian GNU/kNetBSD for Alpha"
 msgstr ""
 
 #: ../../english/ports/netbsd/menu.inc:14
Index: english/ports/index.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/ports/index.wml,v
retrieving revision 1.68
diff -u -r1.68 index.wml
--- english/ports/index.wml	10 Apr 2007 20:23:26 -0000	1.68
+++ english/ports/index.wml	13 Apr 2007 14:59:35 -0000
@@ -175,13 +175,13 @@
  others to follow soon.
 </p>
 
-<h3><a href="netbsd/">Debian GNU/NetBSD (<q>netbsd-i386</q> and <q>netbsd-alpha</q>)</a></h3>
+<h3><a href="netbsd/">Debian GNU/kNetBSD (<q>netbsd-i386</q> and <q>netbsd-alpha</q>)</a></h3>
 <p>
  This is a port of the Debian operating system, complete with apt, dpkg,
  and GNU userland, to the NetBSD kernel. It is currently in a very
  preliminary stage, but since NetBSD is a production-level kernel, the
- usability of Debian GNU/NetBSD should increase rapidly. Currently Debian
- GNU/NetBSD for Intel x86 is the most advanced flavor, but work has also
+ usability of Debian GNU/kNetBSD should increase rapidly. Currently Debian
+ GNU/kNetBSD for Intel x86 is the most advanced flavor, but work has also
  begun on supporting Alpha-based computers.
 </p>
 
Index: english/ports/freebsd/bsd-libc-based.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/ports/freebsd/bsd-libc-based.wml,v
retrieving revision 1.3
diff -u -r1.3 bsd-libc-based.wml
--- english/ports/freebsd/bsd-libc-based.wml	11 Jun 2003 15:40:42 -0000	1.3
+++ english/ports/freebsd/bsd-libc-based.wml	13 Apr 2007 14:59:35 -0000
@@ -1,9 +1,9 @@
-#use wml::debian::template title="libc5-based Debian GNU/FreeBSD" BARETITLE="true" NOHEADER="yes"
+#use wml::debian::template title="libc5-based Debian GNU/kFreeBSD" BARETITLE="true" NOHEADER="yes"
 #include "$(ENGLISHDIR)/ports/freebsd/menu.inc"
 
-<h1>libc5-based Debian GNU/FreeBSD</h1>
+<h1>libc5-based Debian GNU/kFreeBSD</h1>
 
-<p>libc5-based Debian GNU/FreeBSD is a port that consists of a
+<p>libc5-based Debian GNU/kFreeBSD is a port that consists of a
 <a href="http://www.freebsd.org/">FreeBSD</a> kernel, kernel-related
 utilities, C Library and a few specific utilities, coupled with the
 "regular" Debian (GNU) userland. The port is currently based on Intel
@@ -16,7 +16,7 @@
 in fire</a>. Due to this and some other unfortunate circumstances,
 the progress on the port is presently stalled.</p>
 
-<p>Please refer to the closely related <a href="../netbsd/">NetBSD</a> port
+<p>Please refer to the closely related <a href="../netbsd/">kNetBSD</a> port
 page for more historic information.</p>
 
 <h2>Status</h2>
Index: english/ports/netbsd/alpha.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/ports/netbsd/alpha.wml,v
retrieving revision 1.8
diff -u -r1.8 alpha.wml
--- english/ports/netbsd/alpha.wml	24 Jan 2004 02:07:58 -0000	1.8
+++ english/ports/netbsd/alpha.wml	13 Apr 2007 14:59:35 -0000
@@ -1,4 +1,4 @@
-#use wml::debian::template title="Debian GNU/NetBSD for Alpha" BARETITLE="yes" NOHEADER="yes"
+#use wml::debian::template title="Debian GNU/kNetBSD for Alpha" BARETITLE="yes" NOHEADER="yes"
 #use wml::fmt::verbatim
 #include "$(ENGLISHDIR)/ports/netbsd/menu.inc"
 {#style#:
@@ -9,7 +9,7 @@
 </style>
 :##}
 
-<h1>Debian GNU/NetBSD for Alpha</h1>
+<h1>Debian GNU/kNetBSD for Alpha</h1>
 
 
 <h2>Status</h2>
@@ -103,7 +103,7 @@
 <h2>Contact</h2>
 
 <p>For further information please contact <a
-href="mailto:michaelw@debian.org?subject=Debian%20GNU/NetBSD%20Alpha">
+href="mailto:michaelw@debian.org?subject=Debian%20GNU/kNetBSD%20Alpha">
 Michael Weber</a>.</p>
 
 ## Local variables:
Index: english/ports/netbsd/index.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/ports/netbsd/index.wml,v
retrieving revision 1.19
diff -u -r1.19 index.wml
--- english/ports/netbsd/index.wml	10 Feb 2005 17:02:05 -0000	1.19
+++ english/ports/netbsd/index.wml	13 Apr 2007 14:59:35 -0000
@@ -1,4 +1,4 @@
-#use wml::debian::template title="Debian GNU/NetBSD" BARETITLE="yes" NOHEADER="yes"
+#use wml::debian::template title="Debian GNU/kNetBSD" BARETITLE="yes" NOHEADER="yes"
 #use wml::fmt::verbatim
 #include "$(ENGLISHDIR)/ports/netbsd/menu.inc"
 {#style#:
@@ -20,11 +20,11 @@
 
 #############################################################################
 <h1>
-Debian GNU/NetBSD
+Debian GNU/kNetBSD
 </h1>
 
 <p>
-Debian GNU/NetBSD is a port of the Debian Operating System to the
+Debian GNU/kNetBSD is a port of the Debian Operating System to the
 NetBSD kernel. It is currently in an early stage of development - however, it
 can now be installed from scratch.
 </p>
@@ -36,7 +36,7 @@
 </p>
 
 <p>
-<a href="why">Why Debian GNU/NetBSD?</a>
+<a href="why">Why Debian GNU/kNetBSD?</a>
 </p>
 
 <h2>
@@ -106,7 +106,7 @@
   like Debian with a single runlevel without too much trouble)
   <update>
     sysvinit is up and running, Matthew has managed to boot natively
-    into Debian GNU/NetBSD on i386!  There are still some glitches
+    into Debian GNU/kNetBSD on i386!  There are still some glitches
     wrt. boot scripts, but it's an important step
     towards a fully working system.
   </update>
@@ -166,7 +166,7 @@
 
 <li>
 <a href="http://debian-bsd.lightbearer.com/">Joel's apt-gettable archive</a>
-of packages for FreeBSD and NetBSD
+of packages for kFreeBSD and kNetBSD
 </li>
 
 # link dead <li>
@@ -198,7 +198,7 @@
 
 <hr />
 <p>
-To contact the Debian GNU/NetBSD team, send email to 
+To contact the Debian GNU/kNetBSD team, send email to 
 <email "debian-bsd@lists.debian.org" />.
 Comments, questions, or suggestions regarding our section of Debian's
 website are also welcome at that address.
Index: english/ports/netbsd/menu.inc
===================================================================
RCS file: /cvs/webwml/webwml/english/ports/netbsd/menu.inc,v
retrieving revision 1.6
diff -u -r1.6 menu.inc
--- english/ports/netbsd/menu.inc	1 Nov 2002 13:00:10 -0000	1.6
+++ english/ports/netbsd/menu.inc	13 Apr 2007 14:59:35 -0000
@@ -3,11 +3,11 @@
 
 
 <define-menu-item name="netbsd-i386">
-  <gettext domain="ports">Debian GNU/NetBSD for i386</gettext>
+  <gettext domain="ports">Debian GNU/kNetBSD for i386</gettext>
 </define-menu-item>
 
 <define-menu-item name="netbsd-alpha">
-  <gettext domain="ports">Debian GNU/NetBSD for Alpha</gettext>
+  <gettext domain="ports">Debian GNU/kNetBSD for Alpha</gettext>
 </define-menu-item>
 
 <define-menu-item name="why">
Index: english/ports/netbsd/news.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/ports/netbsd/news.wml,v
retrieving revision 1.14
diff -u -r1.14 news.wml
--- english/ports/netbsd/news.wml	13 Oct 2005 19:43:38 -0000	1.14
+++ english/ports/netbsd/news.wml	13 Apr 2007 14:59:35 -0000
@@ -8,7 +8,7 @@
   <dt class="new">2002-10-06:</dt>
   <dd>
       Experimental install floppies are now available for installing
-      a Debian GNU/NetBSD system.
+      a Debian GNU/kNetBSD system.
   </dd>
   <dt>2002-03-06:</dt>
   <dd>
@@ -17,15 +17,15 @@
   </dd>
   <dt>2002-02-25:</dt>
   <dd>
-      Matthew has reported that shadow support and PAM works on NetBSD
+      Matthew has reported that shadow support and PAM works on kNetBSD
       now.  <a href="http://packages.debian.org/fakeroot">fakeroot</a>
-      seems to work on FreeBSD, but still has issues on NetBSD.
+      seems to work on kFreeBSD, but still has issues on kNetBSD.
   </dd>
   <dt>2002-02-07:</dt>
   <dd>
       Nathan has just <a
       href="http://lists.debian.org/debian-bsd/2002/debian-bsd-200202/msg00091.html">reported</a>
-      that he got Debian GNU/FreeBSD to boot multiuser.  Also, he's
+      that he got Debian GNU/kFreeBSD to boot multiuser.  Also, he's
       working on a packages-only install (using a hacked debootstrap)
       featuring a considerably smaller tarball.
   </dd>
@@ -35,17 +35,17 @@
       is packaged.
   </dd>
   <dt>2002-02-06:</dt>
-  <dd>X11 works on NetBSD!  Again, kudos to Joel Baker
+  <dd>X11 works on kNetBSD!  Again, kudos to Joel Baker
   </dd>
   <dt>2002-02-04:</dt> 
   <dd>First step towards a Debian/*BSD archive: <br />
     <a href="mailto:lucifer@lightbearer.com">Joel Baker</a>
     <a href="http://lists.debian.org/debian-bsd/2002/debian-bsd-200202/msg00067.html">
-     announced</a> a <kbd>dupload</kbd>able archive for FreeBSD and
-     NetBSD Debian packages.
+     announced</a> a <kbd>dupload</kbd>able archive for kFreeBSD and
+     kNetBSD Debian packages.
   </dd>
   <dt>2002-02-03:</dt>
-  <dd>Debian GNU/NetBSD now 
+  <dd>Debian GNU/kNetBSD now 
       <a href="http://lists.debian.org/debian-bsd/2002/debian-bsd-200202/msg00043.html">
         self-hosting</a>!  Note that it still needs a working NetBSD for
 	installation.
Index: english/ports/netbsd/people.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/ports/netbsd/people.wml,v
retrieving revision 1.6
diff -u -r1.6 people.wml
--- english/ports/netbsd/people.wml	20 Apr 2003 20:49:08 -0000	1.6
+++ english/ports/netbsd/people.wml	13 Apr 2007 14:59:35 -0000
@@ -50,11 +50,11 @@
 
 <ul>
 <li><a href="mailto:utsl@debian.org?subject=Debian%20GNU/*BSD%20webpages">
-	Nathan P. Hawkins</a> (FreeBSD port)</li>
+	Nathan P. Hawkins</a> (kFreeBSD port)</li>
 <li><a href="mailto:jimmy@debian.org?subject=Debian%20GNU/*BSD%20webpages">
-	Jimmy Kaplowitz</a> (<a href=".">NetBSD-i386 port</a>, general)</li>
+	Jimmy Kaplowitz</a> (<a href=".">kNetBSD-i386 port</a>, general)</li>
 <li><a href="mailto:michaelw@debian.org?subject=Debian%20GNU/*BSD%20webpages">
-	Michael Weber</a> (<a href="alpha">NetBSD-Alpha port</a>, general)</li>
+	Michael Weber</a> (<a href="alpha">kNetBSD-Alpha port</a>, general)</li>
 </ul>
 
 ## Local variables:
Index: english/ports/netbsd/why.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/ports/netbsd/why.wml,v
retrieving revision 1.6
diff -u -r1.6 why.wml
--- english/ports/netbsd/why.wml	31 Oct 2005 09:36:34 -0000	1.6
+++ english/ports/netbsd/why.wml	13 Apr 2007 14:59:38 -0000
@@ -1,7 +1,7 @@
-#use wml::debian::template title="Debian GNU/NetBSD -- Why?" BARETITLE="yes" NOHEADER="yes"
+#use wml::debian::template title="Debian GNU/kNetBSD -- Why?" BARETITLE="yes" NOHEADER="yes"
 #include "$(ENGLISHDIR)/ports/netbsd/menu.inc"
 
-<h1>Why Debian GNU/NetBSD?</h1>
+<h1>Why Debian GNU/kNetBSD?</h1>
 
 <ul>
 <li>NetBSD runs on hardware unsupported by Linux. Porting Debian to
@@ -10,7 +10,7 @@
 
 <li>The Debian GNU/Hurd project demonstrates that Debian is not tied
 to one specific kernel. However, the Hurd kernel is still relatively
-immature - a Debian GNU/NetBSD system would be usable at a production
+immature - a Debian GNU/kNetBSD system would be usable at a production
 level.</li>
 
 <li>Lessons learned from the porting of Debian to NetBSD can be used
@@ -20,19 +20,19 @@
 
 <li>In contrast to projects like <a href="http://fink.sf.net/">Fink</a>
 or <a href="http://debian-cygwin.sf.net/">Debian GNU/w32</a>, Debian
-GNU/NetBSD does not exist in order to provide extra software or a
+GNU/kNetBSD does not exist in order to provide extra software or a
 Unix-style environment to an existing OS (the *BSD ports trees are
 already comprehensive, and they unarguably provide a Unix-style
 environment). Instead, a user or administrator used to a more
 traditional Debian system should feel comfortable with a Debian
-GNU/NetBSD system immediately and competent in a relatively short
+GNU/kNetBSD system immediately and competent in a relatively short
 period of time.</li>
 
 <li>Not everybody likes the *BSD ports tree or the *BSD userland (this
 is a personal preference thing, rather than any sort of comment on
 quality). Linux distributions have been produced which provide *BSD
 style ports or a *BSD style userland for those who like the BSD user
-environment but also wish to use the Linux kernel - Debian GNU/NetBSD
+environment but also wish to use the Linux kernel - Debian GNU/kNetBSD
 is the logical reverse of this, allowing people who like the GNU
 userland or a Linux-style packaging system to use the NetBSD
 kernel.</li>
