13 files changed, 40 insertions, 1 deletions
diff --git a/ca/welcome/welcome.xml b/ca/welcome/welcome.xml
index ee6fdf2d6..a52b843c6 100644
--- a/ca/welcome/welcome.xml
+++ b/ca/welcome/welcome.xml
@@ -14,6 +14,7 @@ següent capítol.
 &what-is-debian.xml;
 &what-is-linux.xml;
 &what-is-debian-linux.xml;
+&what-is-debian-kfreebsd.xml;
 &what-is-debian-hurd.xml;
 &getting-newest-inst.xml;
 &getting-newest-doc.xml;
diff --git a/cs/welcome/welcome.xml b/cs/welcome/welcome.xml
index c20067d98..34c2739cb 100644
--- a/cs/welcome/welcome.xml
+++ b/cs/welcome/welcome.xml
@@ -13,6 +13,7 @@ rovnou k instalaci, přeskočte klidně na následující kapitolu.
 &what-is-debian.xml;
 &what-is-linux.xml;
 &what-is-debian-linux.xml;
+&what-is-debian-kfreebsd.xml;
 &what-is-debian-hurd.xml;
 &getting-newest-inst.xml;
 &getting-newest-doc.xml;
diff --git a/da/welcome/welcome.xml b/da/welcome/welcome.xml
index c824dc817..c3b0beeb7 100644
--- a/da/welcome/welcome.xml
+++ b/da/welcome/welcome.xml
@@ -14,6 +14,7 @@ vel gå videre til næste kapitel.
 &what-is-debian.xml;
 &what-is-linux.xml;
 &what-is-debian-linux.xml;
+&what-is-debian-kfreebsd.xml;
 &what-is-debian-hurd.xml;
 &getting-newest-inst.xml;
 &getting-newest-doc.xml;
diff --git a/de/welcome/welcome.xml b/de/welcome/welcome.xml
index 40d36e6ab..89aff7cba 100644
--- a/de/welcome/welcome.xml
+++ b/de/welcome/welcome.xml
@@ -13,6 +13,7 @@ Dieses Kapitel bietet eine Übersicht über das Debian-Projekt und
 &what-is-debian.xml;
 &what-is-linux.xml;
 &what-is-debian-linux.xml;
+&what-is-debian-kfreebsd.xml;
 &what-is-debian-hurd.xml;
 &getting-newest-inst.xml;
 &getting-newest-doc.xml;
diff --git a/debian/changelog b/debian/changelog
index 0527a2be2..481a5e6af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,8 +17,9 @@ installation-guide (2010xxxx) UNRELEASED; urgency=low
   * Replace Linuxish bits with per-port entities.
   * Rephrase Hurd-specific paragraph explaining that Debian GNU/Hurd is not
     Linux.
+  * Add a "What is Debian GNU/kFreeBSD" section.
 
- -- Samuel Thibault <sthibault@debian.org>  Mon, 06 Sep 2010 00:44:42 +0200
+ -- Samuel Thibault <sthibault@debian.org>  Mon, 06 Sep 2010 00:47:14 +0200
 
 installation-guide (20100518) unstable; urgency=low
 
diff --git a/en/welcome/welcome.xml b/en/welcome/welcome.xml
index ee3a90c8c..5d20fbbc0 100644
--- a/en/welcome/welcome.xml
+++ b/en/welcome/welcome.xml
@@ -14,6 +14,7 @@ the next chapter.
 &what-is-debian.xml;
 &what-is-linux.xml;
 &what-is-debian-linux.xml;
+&what-is-debian-kfreebsd.xml;
 &what-is-debian-hurd.xml;
 &getting-newest-inst.xml;
 &getting-newest-doc.xml;
diff --git a/en/welcome/what-is-debian-kfreebsd.xml b/en/welcome/what-is-debian-kfreebsd.xml
new file mode 100644
index 000000000..ee6a383a0
--- /dev/null
+++ b/en/welcome/what-is-debian-kfreebsd.xml
@@ -0,0 +1,27 @@
+<!-- retain these comments for translator revision tracking -->
+<!-- $Id$ -->
+
+ <sect1 id="what-is-debian-kfreebsd">
+ <title>What is Debian GNU/kFreeBSD?</title>
+
+<para>
+
+Debian GNU/kFreeBSD is a Debian GNU system with the kFreeBSD kernel.
+
+This port of Debian is currently only being developed for the i386 and amd64
+architectures, although ports to other architectures is possible.
+
+Please note that Debian GNU/kFreeBSD is not a Linux system, and thus some
+information on Linux system may not apply to it.
+
+</para><para>
+
+For more information, see the
+<ulink url="http://www.debian.org/ports/kfreebsd-gnu/">
+Debian GNU/kFreeBSD ports page</ulink>
+and the <email>debian-bsd@lists.debian.org</email>
+mailing list.
+
+</para>
+
+ </sect1>
diff --git a/es/welcome/welcome.xml b/es/welcome/welcome.xml
index 5d5e111cd..9937ede2b 100644
--- a/es/welcome/welcome.xml
+++ b/es/welcome/welcome.xml
@@ -13,6 +13,7 @@ distribuci�n Debian GNU/Linux, puede pasar al siguiente cap�tulo.
 &what-is-debian.xml;
 &what-is-linux.xml;
 &what-is-debian-linux.xml;
+&what-is-debian-kfreebsd.xml;
 &what-is-debian-hurd.xml;
 &getting-newest-inst.xml;
 &getting-newest-doc.xml;
diff --git a/eu/welcome/welcome.xml b/eu/welcome/welcome.xml
index dc591b657..7969680cc 100644
--- a/eu/welcome/welcome.xml
+++ b/eu/welcome/welcome.xml
@@ -24,6 +24,7 @@ dezakezu.
 &what-is-debian.xml;
 &what-is-linux.xml;
 &what-is-debian-linux.xml;
+&what-is-debian-kfreebsd.xml;
 &what-is-debian-hurd.xml;
 &getting-newest-inst.xml;
 &getting-newest-doc.xml;
diff --git a/fr/welcome/welcome.xml b/fr/welcome/welcome.xml
index d1769e170..3caae187c 100644
--- a/fr/welcome/welcome.xml
+++ b/fr/welcome/welcome.xml
@@ -11,6 +11,7 @@ Si vous connaissez déjà l'histoire du projet Debian et de la distribution
 &what-is-debian.xml;
 &what-is-linux.xml;
 &what-is-debian-linux.xml;
+&what-is-debian-kfreebsd.xml;
 &what-is-debian-hurd.xml;
 &getting-newest-inst.xml;
 &getting-newest-doc.xml;
diff --git a/it/welcome/welcome.xml b/it/welcome/welcome.xml
index e75626814..5a6027d89 100644
--- a/it/welcome/welcome.xml
+++ b/it/welcome/welcome.xml
@@ -23,6 +23,7 @@ e la distribuzione &debian; si può passare al prossimo capitolo.
 &what-is-debian.xml;
 &what-is-linux.xml;
 &what-is-debian-linux.xml;
+&what-is-debian-kfreebsd.xml;
 &what-is-debian-hurd.xml;
 &getting-newest-inst.xml;
 &getting-newest-doc.xml;
diff --git a/nl/welcome/welcome.xml b/nl/welcome/welcome.xml
index 95f3b5aaa..90939bcc2 100644
--- a/nl/welcome/welcome.xml
+++ b/nl/welcome/welcome.xml
@@ -13,6 +13,7 @@ hoofdstuk desgewenst overslaan.
 &what-is-debian.xml;
 &what-is-linux.xml;
 &what-is-debian-linux.xml;
+&what-is-debian-kfreebsd.xml;
 &what-is-debian-hurd.xml;
 &getting-newest-inst.xml;
 &getting-newest-doc.xml;
diff --git a/pt_BR/welcome/welcome.xml b/pt_BR/welcome/welcome.xml
index 9e9a1e96e..a5ecc53ee 100644
--- a/pt_BR/welcome/welcome.xml
+++ b/pt_BR/welcome/welcome.xml
@@ -15,6 +15,7 @@ próximo capítulo.
 &what-is-debian.xml;
 &what-is-linux.xml;
 &what-is-debian-linux.xml;
+&what-is-debian-kfreebsd.xml;
 &what-is-debian-hurd.xml;
 &getting-newest-inst.xml;
 &getting-newest-doc.xml;