25 files changed, 41 insertions, 40 deletions

diff --git a/ca/preface.xml b/ca/preface.xml
index 919b56b5a..ff29b1525 100644
--- a/ca/preface.xml
+++ b/ca/preface.xml
@@ -6,7 +6,7 @@
 <para>
 
 Ens alegrem que us hàgiu decidit a provar Debian i estem segurs que
-trobareu que la distribució Debian de GNU/Linux és única. &debian;
+trobareu que la distribució Debian de GNU/&arch-kernel; és única. &debian;
 aporta l'alta qualitat del programari lliure d'arreu del món,
 integrat en un conjunt coherent. Creiem que descobrireu que els
 seus resultats són, veritablement, quelcom més que una simple
diff --git a/da/preface.xml b/da/preface.xml
index 1c7e59f4b..31a242c22 100644
--- a/da/preface.xml
+++ b/da/preface.xml
@@ -6,7 +6,7 @@
 <para>
 
 Det glæder os, at du har valgt at prøve Debian, og vi er sikre på,
-at du vil finde Debians GNU/Linux-distribution unik. &debian; samler
+at du vil finde Debians GNU/&arch-kernel;-distribution unik. &debian; samler
 fri software af høj kvalitet fra rundt omkring i verden for så at
 integrere det hele i ét sammenhængende system. Vi er sikre på, at du
 vil finde, at resultatet i sandhed er større end summen af alle de
diff --git a/de/preface.xml b/de/preface.xml
index 241217342..dbb3c2afb 100644
--- a/de/preface.xml
+++ b/de/preface.xml
@@ -6,7 +6,7 @@
 <para>
 
 Wir freuen uns, dass Sie sich entschieden haben, Debian auszuprobieren;
-Sie werden feststellen, dass Debian's GNU/Linux-Distribution
+Sie werden feststellen, dass Debian's GNU/&arch-kernel;-Distribution
 einzigartig ist. &debian; vereint hochqualitative, freie Software aus
 aller Welt in einem schlüssigen Gesamtkonzept. Wie wir glauben, werden Sie
 merken, dass das Ergebnis durchaus mehr ist als die Summe der einzelnen Teile.
diff --git a/debian/changelog b/debian/changelog
index 37302bfc4..da2b4720d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,9 @@ installation-guide (2010xxxx) UNRELEASED; urgency=low
   * Document booting from DOS (Closes: Bug#518808).
   * Add non-Linux infrastructure to the build system.
   * Add kFreeBSD infrastructure.
+  * Replace Linuxish bits with per-port entities.
 
- -- Samuel Thibault <sthibault@debian.org>  Mon, 06 Sep 2010 00:06:36 +0200
+ -- Samuel Thibault <sthibault@debian.org>  Mon, 06 Sep 2010 00:26:59 +0200
 
 installation-guide (20100518) unstable; urgency=low
 
diff --git a/en/preface.xml b/en/preface.xml
index b5ffe44b3..bd422ffe2 100644
--- a/en/preface.xml
+++ b/en/preface.xml
@@ -6,7 +6,7 @@
 <para>
 
 We are delighted that you have decided to try Debian, and are
-sure that you will find that Debian's GNU/Linux distribution is
+sure that you will find that Debian's GNU/&arch-kernel; distribution is
 unique. &debian; brings together high-quality free software
 from around the world, integrating it into a coherent whole. We
 believe that you will find that the result is truly more than the sum
diff --git a/es/preface.xml b/es/preface.xml
index 3640ce0a6..67c1c6acf 100644
--- a/es/preface.xml
+++ b/es/preface.xml
@@ -8,7 +8,7 @@
 <para>
 
 Estamos encantados de que haya decidido probar Debian, le aseguramos que
-encontrar� que la distribuci�n GNU/Linux de Debian es �nica. &debian; re�ne
+encontrar� que la distribuci�n GNU/&arch-kernel; de Debian es �nica. &debian; re�ne
 software libre de alta calidad de diferentes partes del mundo, integr�ndolo
 en un todo coherente. Estamos seguros que encontrar� que el resultado es
 mucho m�s que la suma de las partes.
diff --git a/fr/preface.xml b/fr/preface.xml
index f56646a94..75d9da0b4 100644
--- a/fr/preface.xml
+++ b/fr/preface.xml
@@ -1,12 +1,12 @@
 <!-- original version: 24750 -->
 
 <preface>
-<title>Installer Debian GNU/Linux &release; sur &architecture;</title>
+<title>Installer &debian; &release; sur &architecture;</title>
 
 <para>
 Nous sommes enchantés que vous ayez choisi Debian. Nous sommes sûrs
-que vous trouverez cette distribution GNU/Linux de Debian remarquable.
-Debian GNU/Linux rassemble des logiciels libres de qualité, faits par des gens
+que vous trouverez cette distribution GNU/&arch-kernel; de Debian remarquable.
+&debian; rassemble des logiciels libres de qualité, faits par des gens
 disséminés aux quatre coins du monde, et les intègre en un tout cohérent.
 Nous croyons que vous trouverez ce tout réellement supérieur à la simple somme
 des parties.
diff --git a/it/preface.xml b/it/preface.xml
index 492987383..4279d4a63 100644
--- a/it/preface.xml
+++ b/it/preface.xml
@@ -16,7 +16,7 @@ of the parts.
 -->
 
 Siamo felicissimi che abbiate deciso di provare Debian e siamo sicuri che
-troverete la distribuzione GNU/Linux di Debian unica. &debian;
+troverete la distribuzione GNU/&arch-kernel; di Debian unica. &debian;
 mette insieme software libero di alta qualità proveniente da tutto il
 mondo integrandolo in un insieme coerente. Crediamo che scoprirete che il
 risultato è veramente maggiore della somma delle parti.
diff --git a/nl/preface.xml b/nl/preface.xml
index e4a65457f..b69200d7d 100644
--- a/nl/preface.xml
+++ b/nl/preface.xml
@@ -5,7 +5,7 @@
 <para>
 
 Wij zijn verheugd dat u heeft besloten om Debian te proberen en weten
-zeker dat u zult ontdekken dat de GNU/Linux distributie van Debian uniek
+zeker dat u zult ontdekken dat de GNU/&arch-kernel; distributie van Debian uniek
 is. &debian; brengt vrije software van over de hele wereld samen en integreert
 deze tot een samenhangend geheel. Wij zijn ervan overtuigd dat u zult
 ontdekken dat het resultaat werkelijk meer is dan de som der delen.
diff --git a/po/el/preface.po b/po/el/preface.po
index e2fd9b4f8..4fad198c1 100644
--- a/po/el/preface.po
+++ b/po/el/preface.po
@@ -29,13 +29,13 @@ msgstr ""
 #, no-c-format
 msgid ""
 "We are delighted that you have decided to try Debian, and are sure that you "
-"will find that Debian's GNU/Linux distribution is unique. &debian; brings "
+"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian; brings "
 "together high-quality free software from around the world, integrating it "
 "into a coherent whole. We believe that you will find that the result is "
 "truly more than the sum of the parts."
 msgstr ""
 "Είμαστε ενθουσιασμένοι που αποφασίσατε να δοκιμάσετε το Debian και είμαστε "
-"βέβαιοι ότι θα διαπιστώσετε ότι η διανομή Debian GNU/Linux είναι μοναδική.Το "
+"βέβαιοι ότι θα διαπιστώσετε ότι η διανομή Debian GNU/&arch-kernel; είναι μοναδική.Το "
 "&debian; φέρνει μαζί υψηλής ποιότητας ελεύθερο λογισμικό από ολόκληροτον "
 "κόσμο συνδυάζοντας το σε ένα συνεκτικό σύνολο. Πιστεύουμε ότι θα βρείτε "
 "ότιτο αποτέλεσμα είναι πραγματικά κάτι περισσότερο από το άθροισμα των μερών."
diff --git a/po/fi/preface.po b/po/fi/preface.po
index 3d26155fc..f49722a45 100644
--- a/po/fi/preface.po
+++ b/po/fi/preface.po
@@ -28,13 +28,13 @@ msgstr "&debian; version &release; asentaminen laitealustalle  &architecture;"
 #, no-c-format
 msgid ""
 "We are delighted that you have decided to try Debian, and are sure that you "
-"will find that Debian's GNU/Linux distribution is unique. &debian; brings "
+"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian; brings "
 "together high-quality free software from around the world, integrating it "
 "into a coherent whole. We believe that you will find that the result is "
 "truly more than the sum of the parts."
 msgstr ""
 "Päätöksesi kokeilla Debiania ilahduttaa, ja olemme varmoja Debianin GNU/"
-"Linux-jakelun osoittautuvan ainutlaatuiseksi. &debian; on koostanut "
+"&arch-kernel;-jakelun osoittautuvan ainutlaatuiseksi. &debian; on koostanut "
 "yhteneväisen kokonaisuuden korkealaatuisista vapaista ohjelmista kaikilta "
 "maailman kulmilta. Uskomme tämän kokonaisuuden olevan enemmän kuin osiensa "
 "summa."
diff --git a/po/hu/preface.po b/po/hu/preface.po
index 0b5025747..a2484618d 100644
--- a/po/hu/preface.po
+++ b/po/hu/preface.po
@@ -27,13 +27,13 @@ msgstr "A &debian; &release; telepítése &architecture;-felépítésű gépre"
 #, no-c-format
 msgid ""
 "We are delighted that you have decided to try Debian, and are sure that you "
-"will find that Debian's GNU/Linux distribution is unique. &debian; brings "
+"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian; brings "
 "together high-quality free software from around the world, integrating it "
 "into a coherent whole. We believe that you will find that the result is "
 "truly more than the sum of the parts."
 msgstr ""
 "Örülünk annak, hogy úgy döntöttél, kipróbálod a Debian-t, és biztosak "
-"vagyunk benne, hogy a Debian alkotta GNU/Linux terjesztést egyedülállónak "
+"vagyunk benne, hogy a Debian alkotta GNU/&arch-kernel; terjesztést egyedülállónak "
 "fogod találni. A &debian; összehozza a világ legjobb szabad szoftvereit, és "
 "egy egységes egészbe fogja őket. Így az eredmény sokkal több, mint az egyes "
 "részek összege."
diff --git a/po/ja/preface.po b/po/ja/preface.po
index 2942a2229..4f0fa4e4b 100644
--- a/po/ja/preface.po
+++ b/po/ja/preface.po
@@ -25,12 +25,12 @@ msgstr "&architecture; 用 &debian; &release; のインストール"
 #, no-c-format
 msgid ""
 "We are delighted that you have decided to try Debian, and are sure that you "
-"will find that Debian's GNU/Linux distribution is unique. &debian; brings "
+"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian; brings "
 "together high-quality free software from around the world, integrating it "
 "into a coherent whole. We believe that you will find that the result is "
 "truly more than the sum of the parts."
 msgstr ""
-"Debian を試していただきありがとうございます。Debian の GNU/Linux ディストリ"
+"Debian を試していただきありがとうございます。Debian の GNU/&arch-kernel; ディストリ"
 "ビューションは、他に類を見ないものであることを分かっていただけることでしょ"
 "う。&debian; は、世界中から質の高い「自由なソフトウェア」をよりすぐり、首尾一"
 "貫したディストリビューションとしてまとめあげられています。こうして集められた"
diff --git a/po/ko/preface.po b/po/ko/preface.po
index 70b2f0287..9ea62fec2 100644
--- a/po/ko/preface.po
+++ b/po/ko/preface.po
@@ -29,7 +29,7 @@ msgstr "&architecture;용 &debian; &release; 설치하기"
 #, no-c-format
 msgid ""
 "We are delighted that you have decided to try Debian, and are sure that you "
-"will find that Debian's GNU/Linux distribution is unique. &debian; brings "
+"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian; brings "
 "together high-quality free software from around the world, integrating it "
 "into a coherent whole. We believe that you will find that the result is "
 "truly more than the sum of the parts."
diff --git a/po/nn/preface.po b/po/nn/preface.po
index 1b7320089..7a12051a8 100644
--- a/po/nn/preface.po
+++ b/po/nn/preface.po
@@ -26,13 +26,13 @@ msgstr "Installasjon av &debian; &release; for &architecture;"
 #, no-c-format
 msgid ""
 "We are delighted that you have decided to try Debian, and are sure that you "
-"will find that Debian's GNU/Linux distribution is unique. &debian; brings "
+"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian; brings "
 "together high-quality free software from around the world, integrating it "
 "into a coherent whole. We believe that you will find that the result is "
 "truly more than the sum of the parts."
 msgstr ""
 "Vi er glade for at du har valt å prøve Debian og vi er sikre på at du kjem "
-"til å synes at Debian sin GNU/Linux distribusjon er unik. &debian; fører "
+"til å synes at Debian sin GNU/&arch-kernel; distribusjon er unik. &debian; fører "
 "saman høgkvalitets fri programvare frå heile verda, og integrerer det i ein "
 "samanhengande heilskap. Vi trur at du vil finne at resultatet er meir enn "
 "summen av delane."
diff --git a/po/pot/preface.pot b/po/pot/preface.pot
index 40e4faba0..b0758f529 100644
--- a/po/pot/preface.pot
+++ b/po/pot/preface.pot
@@ -23,7 +23,7 @@ msgstr ""
 #. Tag: para
 #: preface.xml:6
 #, no-c-format
-msgid "We are delighted that you have decided to try Debian, and are sure that you will find that Debian's GNU/Linux distribution is unique. &debian; brings together high-quality free software from around the world, integrating it into a coherent whole. We believe that you will find that the result is truly more than the sum of the parts."
+msgid "We are delighted that you have decided to try Debian, and are sure that you will find that Debian's GNU/&arch-kernel; distribution is unique. &debian; brings together high-quality free software from around the world, integrating it into a coherent whole. We believe that you will find that the result is truly more than the sum of the parts."
 msgstr ""
 
 #. Tag: para
diff --git a/po/pt/preface.po b/po/pt/preface.po
index 7ba71cd34..76adc826d 100644
--- a/po/pt/preface.po
+++ b/po/pt/preface.po
@@ -23,13 +23,13 @@ msgstr "Instalar &debian; &release; para &architecture;"
 #, no-c-format
 msgid ""
 "We are delighted that you have decided to try Debian, and are sure that you "
-"will find that Debian's GNU/Linux distribution is unique. &debian; brings "
+"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian; brings "
 "together high-quality free software from around the world, integrating it "
 "into a coherent whole. We believe that you will find that the result is "
 "truly more than the sum of the parts."
 msgstr ""
 "Nós estamos deliciados que você tenha decidido experimentar Debian, e temos "
-"a certeza que você vai achar a distribuição Debian GNU/Linux única. &debian; "
+"a certeza que você vai achar a distribuição Debian GNU/&arch-kernel; única. &debian; "
 "junta software livre de alta qualidade de todo o mundo, integrando-o como um "
 "todo coerente. Nós acreditamos que você vai achar que o resultado é "
 "verdadeiramente mais que a soma das partes."
diff --git a/po/ro/preface.po b/po/ro/preface.po
index cf2cf1760..bee9940b2 100644
--- a/po/ro/preface.po
+++ b/po/ro/preface.po
@@ -27,13 +27,13 @@ msgstr "Instalarea &debian; &release; pentru &architecture;"
 #, no-c-format
 msgid ""
 "We are delighted that you have decided to try Debian, and are sure that you "
-"will find that Debian's GNU/Linux distribution is unique. &debian; brings "
+"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian; brings "
 "together high-quality free software from around the world, integrating it "
 "into a coherent whole. We believe that you will find that the result is "
 "truly more than the sum of the parts."
 msgstr ""
 "Suntem încântaţi că v-aţi decis să încercaţi Debian, şi suntem siguri că "
-"veţi alfa că distribuiţia Debian GNU/Linux este unică. &debian; aduce "
+"veţi alfa că distribuiţia Debian GNU/&arch-kernel; este unică. &debian; aduce "
 "laolaltă software liber de înaltă calitate de peste tot din lume, întegrându-"
 "l într-un tot coerent. Credem că veţi considera că rezultatul este, într-"
 "adevăr, mai bun decât părţile însumate."
diff --git a/po/ru/preface.po b/po/ru/preface.po
index 94b575c0d..9af271f56 100644
--- a/po/ru/preface.po
+++ b/po/ru/preface.po
@@ -25,13 +25,13 @@ msgstr "Установка &debian; &release; на &architecture;"
 #, no-c-format
 msgid ""
 "We are delighted that you have decided to try Debian, and are sure that you "
-"will find that Debian's GNU/Linux distribution is unique. &debian; brings "
+"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian; brings "
 "together high-quality free software from around the world, integrating it "
 "into a coherent whole. We believe that you will find that the result is "
 "truly more than the sum of the parts."
 msgstr ""
 "Мы рады, что вы решили попробовать Debian. Мы уверены, что дистрибутив "
-"Debian GNU/Linux покажется вам уникальным. &debian; собирает "
+"Debian GNU/&arch-kernel; покажется вам уникальным. &debian; собирает "
 "высококачественное свободное ПО со всего света, объединяя его в единое "
 "целое. Мы верим, вы признаете, что получившийся результат &mdash; это "
 "действительно больше, чем сумма частей."
diff --git a/po/sv/preface.po b/po/sv/preface.po
index e8f078de3..784172ecd 100644
--- a/po/sv/preface.po
+++ b/po/sv/preface.po
@@ -25,13 +25,13 @@ msgstr "Installation av &debian; &release; för &architecture;"
 #, no-c-format
 msgid ""
 "We are delighted that you have decided to try Debian, and are sure that you "
-"will find that Debian's GNU/Linux distribution is unique. &debian; brings "
+"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian; brings "
 "together high-quality free software from around the world, integrating it "
 "into a coherent whole. We believe that you will find that the result is "
 "truly more than the sum of the parts."
 msgstr ""
 "Vi är glada att du har valt att prova Debian och är säkra på att du kommer "
-"att tycka att utgåvan av Debian GNU/Linux är unik. &debian; sammanför "
+"att tycka att utgåvan av Debian GNU/&arch-kernel; är unik. &debian; sammanför "
 "högkvalitativa fria programvaror från hela världen och integrerar dem i en "
 "sammanhängande helhet. Vi tror att du kommer att tycka att resultatet "
 "verkligen är mer än summan av delarna."
diff --git a/po/tl/preface.po b/po/tl/preface.po
index 2a7b1a48f..bde5a0b93 100644
--- a/po/tl/preface.po
+++ b/po/tl/preface.po
@@ -33,13 +33,13 @@ msgstr "Ang pagluklok ng &debian; &release; para sa &architecture;"
 #, no-c-format
 msgid ""
 "We are delighted that you have decided to try Debian, and are sure that you "
-"will find that Debian's GNU/Linux distribution is unique. &debian; brings "
+"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian; brings "
 "together high-quality free software from around the world, integrating it "
 "into a coherent whole. We believe that you will find that the result is "
 "truly more than the sum of the parts."
 msgstr ""
 "Nagagalak kami na nagpasiya kayong subukan ang Debian, at tiyak na "
-"matatagpuan niyo na ang pamudmod na GNU/Linux ng Debian ay kakaiba at "
+"matatagpuan niyo na ang pamudmod na GNU/&arch-kernel; ng Debian ay kakaiba at "
 "natatangi. Pinagsasama-sama ng &debian; ang de kalidad na malayang software "
 "mula sa iba't ibang dako ng daigdig at pinag-iisa sa magkaugnay na kabuuan. "
 "Naniniwala kami na matatagpuan niyo na ang bunga ay siya ngang higit pa sa "
diff --git a/po/vi/preface.po b/po/vi/preface.po
index 43c68a55d..ff9f8ce82 100644
--- a/po/vi/preface.po
+++ b/po/vi/preface.po
@@ -27,13 +27,13 @@ msgstr "Cài đặt &release; &debian; trên &architecture;"
 #, no-c-format
 msgid ""
 "We are delighted that you have decided to try Debian, and are sure that you "
-"will find that Debian's GNU/Linux distribution is unique. &debian; brings "
+"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian; brings "
 "together high-quality free software from around the world, integrating it "
 "into a coherent whole. We believe that you will find that the result is "
 "truly more than the sum of the parts."
 msgstr ""
 "Chúng tôi rất vui thích thấy biết rằng bạn chọn thử sử dụng Debian; chúng "
-"tôi chắc chắn là bạn sẽ tìm thấy bản phát hành GNU/LInux của Debian là độc "
+"tôi chắc chắn là bạn sẽ tìm thấy bản phát hành GNU/&arch-kernel; của Debian là độc "
 "nhất. &debian; tập hợp phần mềm có chất lượng cao từ trên khắp thế giới, hợp "
 "nhất nó vào một toàn bộ mạch lạc. Chúng tôi cho rằng bạn sẽ tìm biết kết quả "
 "này thật sự là lớn hơn tổng các phần."
diff --git a/po/zh_CN/preface.po b/po/zh_CN/preface.po
index 4d1e2f784..29907b799 100644
--- a/po/zh_CN/preface.po
+++ b/po/zh_CN/preface.po
@@ -22,12 +22,12 @@ msgstr "在 &architecture; 上安装 &debian; &release;"
 #, no-c-format
 msgid ""
 "We are delighted that you have decided to try Debian, and are sure that you "
-"will find that Debian's GNU/Linux distribution is unique. &debian; brings "
+"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian; brings "
 "together high-quality free software from around the world, integrating it "
 "into a coherent whole. We believe that you will find that the result is "
 "truly more than the sum of the parts."
 msgstr ""
-"我们非常高兴地看到您决定试用 Debian，并确信您将发现 Debian 的 GNU/Linux 发行"
+"我们非常高兴地看到您决定试用 Debian，并确信您将发现 Debian 的 GNU/&arch-kernel; 发行"
 "版是独一无二的。&debian; 将带给您来自世界各地的高质量的自由软件，并将它们整合"
 "成一个紧密的整体。您会发现整合后的结果一定会大于将各部分简单地相加。"
 
diff --git a/po/zh_TW/preface.po b/po/zh_TW/preface.po
index bfcb02b75..8ab07bf3f 100644
--- a/po/zh_TW/preface.po
+++ b/po/zh_TW/preface.po
@@ -22,12 +22,12 @@ msgstr "在 &architecture; 架構上安裝 &debian; &release;"
 #, no-c-format
 msgid ""
 "We are delighted that you have decided to try Debian, and are sure that you "
-"will find that Debian's GNU/Linux distribution is unique. &debian; brings "
+"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian; brings "
 "together high-quality free software from around the world, integrating it "
 "into a coherent whole. We believe that you will find that the result is "
 "truly more than the sum of the parts."
 msgstr ""
-"我們非常高興您決定嘗試 Debian，並確信您將發現 Debian 的 GNU/Linux 發行套件是"
+"我們非常高興您決定嘗試 Debian，並確信您將發現 Debian 的 GNU/&arch-kernel; 發行套件是"
 "獨一無二的。&debian; 集合了來自世界各地的高品質自由軟體，並將它們緊密的整合在"
 "一起。您會發現整合後的效果比單純的程式集合還要更好。"
 
diff --git a/pt_BR/preface.xml b/pt_BR/preface.xml
index bb3dc47ac..ece604d86 100644
--- a/pt_BR/preface.xml
+++ b/pt_BR/preface.xml
@@ -7,7 +7,7 @@
 <para>
 
 Nós estamos felizes que você tenha decidido experimentar o Debian e
-temos certeza que descobrirá que a distribuição GNU/Linux do Debian
+temos certeza que descobrirá que a distribuição GNU/&arch-kernel; do Debian
 é única. O &debian; vem acompanhado com software livre de alta
 qualidade desenvolvido ao redor do mundo, integrado em um conjunto
 coerente. Nós acreditamos que você descobrirá que o resultado é