* Replace Linuxish bits with per-port entities in "What is Debian GNU/Linux?"

22 files changed, 102 insertions, 102 deletions

diff --git a/ca/welcome/what-is-debian-linux.xml b/ca/welcome/what-is-debian-linux.xml
index d3918c6ae..8b2efe4fe 100644
--- a/ca/welcome/what-is-debian-linux.xml
+++ b/ca/welcome/what-is-debian-linux.xml
@@ -2,12 +2,12 @@
 <!-- original version: 25496 -->
 
  <sect1 id="what-is-debian-linux">
- <title>Què és &debian;?</title>
+ <title>Què és Debian GNU/Linux?</title>
 <para>
 
 De la combinació de la filosofia i metodologia Debian amb les
 utilitats de GNU, el nucli Linux i altre programari lliure, n'esdevé
-una distribució única anomenada Debian &debian;. Aquesta distribució
+una distribució única anomenada Debian Debian GNU/Linux. Aquesta distribució
 es basa en una quantitat enorme de <emphasis>paquets</emphasis> de
 programari. Cada paquet de la distribució té executables, seqüències,
 documentació, i informació de la configuració, així com un
diff --git a/cs/welcome/what-is-debian-linux.xml b/cs/welcome/what-is-debian-linux.xml
index 9cd0db43b..1901315e8 100644
--- a/cs/welcome/what-is-debian-linux.xml
+++ b/cs/welcome/what-is-debian-linux.xml
@@ -7,7 +7,7 @@
 
 Kombinace filosofie a metodologie Debianu spolu s nástroji GNU,
 jádrem Linux a dalším svobodným softwarem vyústila do unikátní
-softwarové distribuce, která je známá pod názvem &debian;.
+softwarové distribuce, která je známá pod názvem Debian GNU/Linux.
 Distribuci Debian tvoří množství softwarových
 <emphasis>balíků</emphasis>. Jednotlivé balíky sestávají ze
 spustitelných souborů, skriptů, dokumentace a konfiguračních
@@ -67,7 +67,7 @@ přes Internet.
 
 </para><para>
 
-Pokud chcete získat podporu pro svůj systém s &debian;em, nebo
+Pokud chcete získat podporu pro svůj systém s Debian GNU/Linuxem, nebo
 jen chcete komunikovat s vývojáři distribuce, můžete tak učinit pomocí
 více jak &num-of-debian-maillists; diskusních klubů, které Debian spravuje.
 Pro přihlášení do některého z nich stačí vyplnit formulář na
diff --git a/de/welcome/what-is-debian-linux.xml b/de/welcome/what-is-debian-linux.xml
index f3b5a6771..4f6fa0f0d 100644
--- a/de/welcome/what-is-debian-linux.xml
+++ b/de/welcome/what-is-debian-linux.xml
@@ -2,12 +2,12 @@
 <!-- original version: 25496 -->
 
  <sect1 id="what-is-debian-linux">
- <title>Was ist &debian;?</title>
+ <title>Was ist Debian GNU/Linux?</title>
 <para>
 
 Die Philosophie und Methoden von Debian kombiniert mit den
 GNU-Werkzeuge, dem Linux-Kernel und anderer wichtiger freier Software
-bildet eine einzigartige Software-Distribution, genannt &debian;.
+bildet eine einzigartige Software-Distribution, genannt Debian GNU/Linux.
 Diese Distribution setzt sich aus einer großen Anzahl von
 Software-<emphasis>Paketen</emphasis> zusammen.
 Jedes Paket in der Distribution enthält ausführbare Dateien,
@@ -79,7 +79,7 @@ automatisch aus dem Internet heruntergeladen und installiert werden.
 
 </para><para>
 
-Die primäre und beste Methode, Unterstützung für Ihr &debian;-System zu erhalten
+Die primäre und beste Methode, Unterstützung für Ihr Debian GNU/Linux-System zu erhalten
 und mit Debian-Entwicklern zu kommunizieren, sind die vom Debian-Projekt
 verwalteten Mailinglisten (während dieses Dokument geschrieben wurde, gab
 es mehr als &num-of-debian-maillists; davon). Der einfachste Weg, sich bei einer
diff --git a/en/welcome/what-is-debian-linux.xml b/en/welcome/what-is-debian-linux.xml
index db2cd2306..ef172281b 100644
--- a/en/welcome/what-is-debian-linux.xml
+++ b/en/welcome/what-is-debian-linux.xml
@@ -2,12 +2,12 @@
 <!-- $Id$ -->
 
  <sect1 id="what-is-debian-linux">
- <title>What is &debian;?</title>
+ <title>What is Debian GNU/Linux?</title>
 <para>
 
 The combination of Debian's philosophy and methodology and the GNU
 tools, the Linux kernel, and other important free software, form a
-unique software distribution called &debian;. This
+unique software distribution called Debian GNU/Linux. This
 distribution is made up of a large number of software
 <emphasis>packages</emphasis>.  Each package in the distribution
 contains executables, scripts, documentation, and configuration
@@ -68,7 +68,7 @@ be downloaded and installed automatically across the Internet.
 
 </para><para>
 
-The primary, and best, method of getting support for your &debian;
+The primary, and best, method of getting support for your Debian GNU/Linux
 system and communicating with Debian Developers is through
 the many mailing lists maintained by the Debian Project (there are
 more than &num-of-debian-maillists; at this writing).  The easiest
diff --git a/es/welcome/what-is-debian-linux.xml b/es/welcome/what-is-debian-linux.xml
index 5665153a9..65c9bd796 100644
--- a/es/welcome/what-is-debian-linux.xml
+++ b/es/welcome/what-is-debian-linux.xml
@@ -4,12 +4,12 @@
 <!-- revisado por Rudy Godoy, 22 feb. 2005 -->
 
  <sect1 id="what-is-debian-linux">
- <title>�Qu� es &debian;?</title>
+ <title>�Qu� es Debian GNU/Linux?</title>
 <para>
 
 La combinaci�n de la filosof�a y metodolog�a de Debian, las herramientas
 GNU, el n�cleo Linux, y otro software libre importante, forman una
-distribuci�n de software �nica llamada &debian;.
+distribuci�n de software �nica llamada Debian GNU/Linux.
 Esta distribuci�n est� formada por un gran n�mero de
 <emphasis>paquetes</emphasis>. Cada paquete en la distribuci�n contiene
 ejecutables, scripts, documentaci�n e informaci�n de configuraci�n, y
@@ -75,7 +75,7 @@ e instalar parches de seguridad autom�ticamente a trav�s de Internet.
 </para><para>
 
 El m�todo principal, y el mejor, para obtener soporte para su sistema
-&debian; y comunicarse con los desarrolladores de Debian, es a trav�s de
+Debian GNU/Linux y comunicarse con los desarrolladores de Debian, es a trav�s de
 las diversas listas de correo mantenidas por el proyecto Debian
 (existen m�s de &num-of-debian-maillists; al momento de escribir este
 documento).
diff --git a/eu/welcome/what-is-debian-linux.xml b/eu/welcome/what-is-debian-linux.xml
index 9f78f6f26..ac2fc364f 100644
--- a/eu/welcome/what-is-debian-linux.xml
+++ b/eu/welcome/what-is-debian-linux.xml
@@ -2,11 +2,11 @@
 <!-- original version: 14388 -->
 
  <sect1 id="what-is-debian-linux">
- <title>&debian; zer da?</title>
+ <title>Debian GNU/Linux zer da?</title>
 <para>
 
 Debian filosofia eta metodologia, GNU lanabesak, Linux Kernela eta
-beste zenbait sfotware libre garrantzitsua bateratzea da &debian;
+beste zenbait sfotware libre garrantzitsua bateratzea da Debian GNU/Linux
 banaketa. Banaketa hau software <emphasis>pakete</emphasis> 
 askoz osatzen da. Banaketaren pakete bakiotzak abiarazgarriak, 
 skripak dokumentazioa eta konfigurazio argibideak osatzen dute, 
@@ -65,7 +65,7 @@ ohi da.. Debianen eguneraketaren bidez ziurtasun eguneraketak
 oso era errazean egin daitezke interneten bidez.
 
 </para><para>
-Zure &debian; sistemarako laguntza bilatzeko eta garatzaileekin 
+Zure Debian GNU/Linux sistemarako laguntza bilatzeko eta garatzaileekin 
 harremanetan jartzeko lehentsitako modua, eta oberena  Debian
 proiektuan dauden ePosta zerrenda multzoa da (oraintxe 
 &num-of-debian-maillists; aino zerrenda gehiago daude). Zerrenda
diff --git a/it/welcome/what-is-debian-linux.xml b/it/welcome/what-is-debian-linux.xml
index b046ad978..aedec0d49 100644
--- a/it/welcome/what-is-debian-linux.xml
+++ b/it/welcome/what-is-debian-linux.xml
@@ -3,14 +3,14 @@
 
 
  <sect1 id="what-is-debian-linux">
- <!-- <title>What is &debian;?</title> -->
- <title>Cosa è &debian;?</title>
+ <!-- <title>What is Debian GNU/Linux?</title> -->
+ <title>Cosa è Debian GNU/Linux?</title>
 <para>
 
 <!--
 The combination of Debian's philosophy and methodology and the GNU
 tools, the Linux kernel, and other important free software, form a
-unique software distribution called &debian;. This
+unique software distribution called Debian GNU/Linux. This
 distribution is made up of a large number of software
 <emphasis>packages</emphasis>.  Each package in the distribution
 contains executables, scripts, documentation, and configuration
@@ -23,7 +23,7 @@ tracking system ensures that problems are found and fixed quickly.
 
 La combinazione della filosofia e della metodologia di Debian con
 gli strumenti di GNU, il kernel Linux e altri importanti software liberi,
-formano una distribuzione unica chiamata &debian;. Questa
+formano una distribuzione unica chiamata Debian GNU/Linux. Questa
 distribuzione è composta da un grande numero di
 <emphasis>pacchetti</emphasis> software. Ogni pacchetto nella
 distribuzione contiene eseguibili, script, documentazione e informazioni
@@ -144,7 +144,7 @@ installate da Internet.
 </para><para>
 
 <!--
-The primary, and best, method of getting support for your &debian;
+The primary, and best, method of getting support for your Debian GNU/Linux
 system and communicating with Debian Developers is through
 the many mailing lists maintained by the Debian Project (there are
 more than &num-of-debian-maillists; at this writing).  The easiest
@@ -155,7 +155,7 @@ you'll find there.
 -->
 
 Il metodo principale e migliore per ottenere supporto per
-un sistema &debian; e comunicare con gli sviluppatori
+un sistema Debian GNU/Linux e comunicare con gli sviluppatori
 Debian è usando le molte mailing list gestite dal
 progetto Debian (ce ne sono più di &num-of-debian-maillists;
 al momento in cui questo documento è scritto). La maniera
diff --git a/nl/welcome/what-is-debian-linux.xml b/nl/welcome/what-is-debian-linux.xml
index c92db24e5..f7e2978e1 100644
--- a/nl/welcome/what-is-debian-linux.xml
+++ b/nl/welcome/what-is-debian-linux.xml
@@ -1,13 +1,13 @@
 <!-- original version: 25496 -->
 
  <sect1 id="what-is-debian-linux">
- <title>Wat is &debian;?</title>
+ <title>Wat is Debian GNU/Linux?</title>
 
 <para>
 
 De combinatie van de filosofie en methodologie van Debian met de hulpprogramma's
 van GNU, de Linux kernel en andere belangrijke vrije software, vormt een
-unieke softwaredistributie die &debian; wordt genoemd. Deze
+unieke softwaredistributie die Debian GNU/Linux wordt genoemd. Deze
 distributie is opgebouwd uit een groot aantal <emphasis>pakketten</emphasis>.
 Elk pakket in de distributie bevat uitvoerbare programma's, scripts,
 documentatie en configuratie-informatie. Ook heeft elk pakket een
@@ -73,7 +73,7 @@ geïnstalleerd worden.
 </para><para>
 
 De voornaamste (en beste) methode om ondersteuning te krijgen voor uw
-&debian; systeem en om te communiceren met Debian ontwikkelaars, is
+Debian GNU/Linux systeem en om te communiceren met Debian ontwikkelaars, is
 via de vele mailinglijsten die door het Debian Project worden beheerd
 (op dit moment meer dan &num-of-debian-maillists;). De meest eenvoudige
 manier om u aan te melden voor één of meerdere van deze mailinglijsten
diff --git a/po/el/welcome.po b/po/el/welcome.po
index e04e954e3..28ebadaf2 100644
--- a/po/el/welcome.po
+++ b/po/el/welcome.po
@@ -397,8 +397,8 @@ msgstr ""
 #. Tag: title
 #: welcome.xml:231
 #, no-c-format
-msgid "What is &debian;?"
-msgstr "Τι είναι το &debian;?"
+msgid "What is Debian GNU/Linux?"
+msgstr "Τι είναι το Debian GNU/Linux?"
 
 #. Tag: para
 #: welcome.xml:232
@@ -406,7 +406,7 @@ msgstr "Τι είναι το &debian;?"
 msgid ""
 "The combination of Debian's philosophy and methodology and the GNU tools, "
 "the Linux kernel, and other important free software, form a unique software "
-"distribution called &debian;. This distribution is made up of a large number "
+"distribution called Debian GNU/Linux. This distribution is made up of a large number "
 "of software <emphasis>packages</emphasis>. Each package in the distribution "
 "contains executables, scripts, documentation, and configuration information, "
 "and has a <emphasis>maintainer</emphasis> who is primarily responsible for "
@@ -418,7 +418,7 @@ msgstr ""
 "Ο συνδυασμός της φιλοσοφίας και της μεθοδολογίας του Debian και των "
 "εργαλείων του GNU, του πυρήνα του Linux, και άλλου σημαντικού ελεύθερου "
 "λογισμικού, σχηματίζουν μια μοναδική διανομή λογισμικού που ονομάζεται "
-"&debian;. Αυτή η διανομή αποτελείται από μεγάλο αριθμό<emphasis>πακέτων</"
+"Debian GNU/Linux. Αυτή η διανομή αποτελείται από μεγάλο αριθμό<emphasis>πακέτων</"
 "emphasis>.  Κάθε πακέτο στη διανομή περιέχει εκτελέσιμα, σενάρια, "
 "τεκμηρίωση, πληροφορίες για ρυθμίσεις, και έχει ένα <emphasis>συντηρητή</"
 "emphasis> που είναι ο κυρίως υπεύθυνος ώστε το πακέτο να διατηρείται πάντα "
@@ -531,7 +531,7 @@ msgstr ""
 #: welcome.xml:295
 #, no-c-format
 msgid ""
-"The primary, and best, method of getting support for your &debian; system "
+"The primary, and best, method of getting support for your Debian GNU/Linux system "
 "and communicating with Debian Developers is through the many mailing lists "
 "maintained by the Debian Project (there are more than &num-of-debian-"
 "maillists; at this writing). The easiest way to subscribe to one or more of "
@@ -539,7 +539,7 @@ msgid ""
 "mailing list subscription page</ulink> and fill out the form you'll find "
 "there."
 msgstr ""
-"Ο κύριος, και καλίτερος, τρόπος για να έχετε υποστήριξη για το &debian;"
+"Ο κύριος, και καλίτερος, τρόπος για να έχετε υποστήριξη για το Debian GNU/Linux"
 "σύστημά σας και να επικοινωνήσετε με τους Προγραμματιστές του Debian είναι "
 "μέσω των πολυάριθμων λιστών αλληλογραφίας που συντηρεί το Debian Project "
 "(υπάρχουν περισσότερες από &num-of-debian-maillists; τη στιγμή που γράφεται "
diff --git a/po/fi/welcome.po b/po/fi/welcome.po
index 835e55aca..1e4a4036c 100644
--- a/po/fi/welcome.po
+++ b/po/fi/welcome.po
@@ -375,8 +375,8 @@ msgstr ""
 #. Tag: title
 #: welcome.xml:231
 #, no-c-format
-msgid "What is &debian;?"
-msgstr "Mitä on &debian;?"
+msgid "What is Debian GNU/Linux?"
+msgstr "Mitä on Debian GNU/Linux?"
 
 #. Tag: para
 #: welcome.xml:232
@@ -384,7 +384,7 @@ msgstr "Mitä on &debian;?"
 msgid ""
 "The combination of Debian's philosophy and methodology and the GNU tools, "
 "the Linux kernel, and other important free software, form a unique software "
-"distribution called &debian;. This distribution is made up of a large number "
+"distribution called Debian GNU/Linux. This distribution is made up of a large number "
 "of software <emphasis>packages</emphasis>. Each package in the distribution "
 "contains executables, scripts, documentation, and configuration information, "
 "and has a <emphasis>maintainer</emphasis> who is primarily responsible for "
@@ -505,7 +505,7 @@ msgstr ""
 #: welcome.xml:295
 #, no-c-format
 msgid ""
-"The primary, and best, method of getting support for your &debian; system "
+"The primary, and best, method of getting support for your Debian GNU/Linux system "
 "and communicating with Debian Developers is through the many mailing lists "
 "maintained by the Debian Project (there are more than &num-of-debian-"
 "maillists; at this writing). The easiest way to subscribe to one or more of "
@@ -513,7 +513,7 @@ msgid ""
 "mailing list subscription page</ulink> and fill out the form you'll find "
 "there."
 msgstr ""
-"Ensisijainen ja paras tapa saada tukea &debian; -järjestelmälle ja tietojen "
+"Ensisijainen ja paras tapa saada tukea Debian GNU/Linux -järjestelmälle ja tietojen "
 "vaihtoon Debianin kehittäjien kanssa ovat Debian-projektin ylläpitämät "
 "lukuisat sähköpostilistat (tätä kirjoitettaessa listoja on yli &num-of-"
 "debian-maillists;). Yhden tai useamman listan tilaaminen sujuu helpoimmin "
diff --git a/po/hu/welcome.po b/po/hu/welcome.po
index 90142cb21..de9b49a4a 100644
--- a/po/hu/welcome.po
+++ b/po/hu/welcome.po
@@ -384,8 +384,8 @@ msgstr ""
 #. Tag: title
 #: welcome.xml:231
 #, no-c-format
-msgid "What is &debian;?"
-msgstr "Mi a &debian;?"
+msgid "What is Debian GNU/Linux?"
+msgstr "Mi a Debian GNU/Linux?"
 
 #. Tag: para
 #: welcome.xml:232
@@ -393,7 +393,7 @@ msgstr "Mi a &debian;?"
 msgid ""
 "The combination of Debian's philosophy and methodology and the GNU tools, "
 "the Linux kernel, and other important free software, form a unique software "
-"distribution called &debian;. This distribution is made up of a large number "
+"distribution called Debian GNU/Linux. This distribution is made up of a large number "
 "of software <emphasis>packages</emphasis>. Each package in the distribution "
 "contains executables, scripts, documentation, and configuration information, "
 "and has a <emphasis>maintainer</emphasis> who is primarily responsible for "
@@ -403,7 +403,7 @@ msgid ""
 "and fixed quickly."
 msgstr ""
 "A Debian elvei és módszerei és a GNU eszközök, illetve a Linux kernel és más "
-"fontos szoftverek alkotják a &debian; egyedülálló szoftver terjesztést. Ezt "
+"fontos szoftverek alkotják a Debian GNU/Linux egyedülálló szoftver terjesztést. Ezt "
 "a terjesztést sok szoftver <emphasis>csomag</emphasis> alkotja. E terjesztés "
 "egyes csomagjai futtatható programokat, parancsfájlokat, dokumentációt és "
 "beállító információkat tartalmaznak, és mindegyikhez tartozik egy "
@@ -513,7 +513,7 @@ msgstr ""
 #: welcome.xml:295
 #, no-c-format
 msgid ""
-"The primary, and best, method of getting support for your &debian; system "
+"The primary, and best, method of getting support for your Debian GNU/Linux system "
 "and communicating with Debian Developers is through the many mailing lists "
 "maintained by the Debian Project (there are more than &num-of-debian-"
 "maillists; at this writing). The easiest way to subscribe to one or more of "
@@ -521,7 +521,7 @@ msgid ""
 "mailing list subscription page</ulink> and fill out the form you'll find "
 "there."
 msgstr ""
-"A legkiválóbb módszer a &debian; rendszer támogatásához és a fejlesztőkkel "
+"A legkiválóbb módszer a Debian GNU/Linux rendszer támogatásához és a fejlesztőkkel "
 "való párbeszédre a Debian Projekt által nyújtott levelezőlistákon nyílik "
 "(amikor ezt írjuk, több, mint &num-of-debian-maillists; ilyen elérhető). A "
 "legkönnyebb mód feliratkozni ezekre a <ulink url=\"&url-debian-lists-"
diff --git a/po/ja/welcome.po b/po/ja/welcome.po
index 0129e79b7..4769b118a 100644
--- a/po/ja/welcome.po
+++ b/po/ja/welcome.po
@@ -367,8 +367,8 @@ msgstr ""
 #. Tag: title
 #: welcome.xml:231
 #, no-c-format
-msgid "What is &debian;?"
-msgstr "&debian; とは?"
+msgid "What is Debian GNU/Linux?"
+msgstr "Debian GNU/Linux とは?"
 
 #. Tag: para
 #: welcome.xml:232
@@ -376,7 +376,7 @@ msgstr "&debian; とは?"
 msgid ""
 "The combination of Debian's philosophy and methodology and the GNU tools, "
 "the Linux kernel, and other important free software, form a unique software "
-"distribution called &debian;. This distribution is made up of a large number "
+"distribution called Debian GNU/Linux. This distribution is made up of a large number "
 "of software <emphasis>packages</emphasis>. Each package in the distribution "
 "contains executables, scripts, documentation, and configuration information, "
 "and has a <emphasis>maintainer</emphasis> who is primarily responsible for "
@@ -386,7 +386,7 @@ msgid ""
 "and fixed quickly."
 msgstr ""
 "Debian の哲学や方法論と、GNU ツール・Linux カーネル・その他の重要なフリーソフ"
-"トウェアとを組み合わせることにより、&debian; と呼ばれるユニークなディストリ"
+"トウェアとを組み合わせることにより、Debian GNU/Linux と呼ばれるユニークなディストリ"
 "ビューションが形成されています。このディストリビューションは、多数のソフト"
 "ウェア <emphasis>パッケージ</emphasis>から構成されています。ディストリビュー"
 "ションに含まれる個々のパッケージは、実行ファイル・スクリプト・ドキュメント・"
@@ -493,7 +493,7 @@ msgstr ""
 #: welcome.xml:295
 #, no-c-format
 msgid ""
-"The primary, and best, method of getting support for your &debian; system "
+"The primary, and best, method of getting support for your Debian GNU/Linux system "
 "and communicating with Debian Developers is through the many mailing lists "
 "maintained by the Debian Project (there are more than &num-of-debian-"
 "maillists; at this writing). The easiest way to subscribe to one or more of "
@@ -501,7 +501,7 @@ msgid ""
 "mailing list subscription page</ulink> and fill out the form you'll find "
 "there."
 msgstr ""
-"あなたの &debian; システムについてサポートを受けたり、Debian の開発者たちと連"
+"あなたの Debian GNU/Linux システムについてサポートを受けたり、Debian の開発者たちと連"
 "絡したりする第一の、そして最良の方法は、Debian プロジェクトが運営する多数の"
 "メーリングリストを用いることです (この文章の執筆時点で &num-of-debian-"
 "maillists; 以上のメーリングリストがあります)。メーリングリストを簡単に講読す"
diff --git a/po/ko/welcome.po b/po/ko/welcome.po
index 7e120c189..e8a9388a4 100644
--- a/po/ko/welcome.po
+++ b/po/ko/welcome.po
@@ -383,8 +383,8 @@ msgstr ""
 #. Tag: title
 #: welcome.xml:231
 #, no-c-format
-msgid "What is &debian;?"
-msgstr "&debian;란?"
+msgid "What is Debian GNU/Linux?"
+msgstr "Debian GNU/Linux란?"
 
 # &debian; => 데비안 GNU/리눅스, 조사 구분에 주의
 #. Tag: para
@@ -393,7 +393,7 @@ msgstr "&debian;란?"
 msgid ""
 "The combination of Debian's philosophy and methodology and the GNU tools, "
 "the Linux kernel, and other important free software, form a unique software "
-"distribution called &debian;. This distribution is made up of a large number "
+"distribution called Debian GNU/Linux. This distribution is made up of a large number "
 "of software <emphasis>packages</emphasis>. Each package in the distribution "
 "contains executables, scripts, documentation, and configuration information, "
 "and has a <emphasis>maintainer</emphasis> who is primarily responsible for "
@@ -403,7 +403,7 @@ msgid ""
 "and fixed quickly."
 msgstr ""
 "데비안의 철학 및 방법론과 GNU 도구, 리눅스 커널, 그리고 기타 중요한 자유소프"
-"트웨어가 모여 &debian;라는 독특한 배포판을 만듭니다. 이 배포판은 수많은 소프"
+"트웨어가 모여 Debian GNU/Linux라는 독특한 배포판을 만듭니다. 이 배포판은 수많은 소프"
 "트웨어 <emphasis>패키지</emphasis>로 구성됩니다. 배포판의 각 패키지는 실행파"
 "일, 스크립트, 문서, 설정 정보가 들어 있으며 <emphasis>메인테이너</emphasis>"
 "가 관리합니다. 메인테이너는 각 패키지를 항상 최신으로 유지하고, 버그 리포트"
@@ -506,7 +506,7 @@ msgstr ""
 #: welcome.xml:295
 #, no-c-format
 msgid ""
-"The primary, and best, method of getting support for your &debian; system "
+"The primary, and best, method of getting support for your Debian GNU/Linux system "
 "and communicating with Debian Developers is through the many mailing lists "
 "maintained by the Debian Project (there are more than &num-of-debian-"
 "maillists; at this writing). The easiest way to subscribe to one or more of "
@@ -514,7 +514,7 @@ msgid ""
 "mailing list subscription page</ulink> and fill out the form you'll find "
 "there."
 msgstr ""
-"여러분의 &debian; 시스템에 대한 지원을 받고 데비안 개발자와 연락을 할 수 있"
+"여러분의 Debian GNU/Linux 시스템에 대한 지원을 받고 데비안 개발자와 연락을 할 수 있"
 "는 많이 사용하는 방법이면서 가장 좋은 방법은, 데비안 프로젝트에서 관리하는 여"
 "러가지 메일링 리스트(이 글이 작성된 시점에 약 &num-of-debian-maillists;개 이"
 "상)를 이용하는 것입니다. 메일링 리스트에 가입하려면, <ulink url=\"&url-"
diff --git a/po/pot/welcome.pot b/po/pot/welcome.pot
index 317586094..6a3342f31 100644
--- a/po/pot/welcome.pot
+++ b/po/pot/welcome.pot
@@ -167,13 +167,13 @@ msgstr ""
 #. Tag: title
 #: welcome.xml:231
 #, no-c-format
-msgid "What is &debian;?"
+msgid "What is Debian GNU/Linux?"
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:232
 #, no-c-format
-msgid "The combination of Debian's philosophy and methodology and the GNU tools, the Linux kernel, and other important free software, form a unique software distribution called &debian;. This distribution is made up of a large number of software <emphasis>packages</emphasis>. Each package in the distribution contains executables, scripts, documentation, and configuration information, and has a <emphasis>maintainer</emphasis> who is primarily responsible for keeping the package up-to-date, tracking bug reports, and communicating with the upstream author(s) of the packaged software. Our extremely large user base, combined with our bug tracking system ensures that problems are found and fixed quickly."
+msgid "The combination of Debian's philosophy and methodology and the GNU tools, the Linux kernel, and other important free software, form a unique software distribution called Debian GNU/Linux. This distribution is made up of a large number of software <emphasis>packages</emphasis>. Each package in the distribution contains executables, scripts, documentation, and configuration information, and has a <emphasis>maintainer</emphasis> who is primarily responsible for keeping the package up-to-date, tracking bug reports, and communicating with the upstream author(s) of the packaged software. Our extremely large user base, combined with our bug tracking system ensures that problems are found and fixed quickly."
 msgstr ""
 
 #. Tag: para
@@ -215,7 +215,7 @@ msgstr ""
 #. Tag: para
 #: welcome.xml:295
 #, no-c-format
-msgid "The primary, and best, method of getting support for your &debian; system and communicating with Debian Developers is through the many mailing lists maintained by the Debian Project (there are more than &num-of-debian-maillists; at this writing). The easiest way to subscribe to one or more of these lists is visit <ulink url=\"&url-debian-lists-subscribe;\"> Debian's mailing list subscription page</ulink> and fill out the form you'll find there."
+msgid "The primary, and best, method of getting support for your Debian GNU/Linux system and communicating with Debian Developers is through the many mailing lists maintained by the Debian Project (there are more than &num-of-debian-maillists; at this writing). The easiest way to subscribe to one or more of these lists is visit <ulink url=\"&url-debian-lists-subscribe;\"> Debian's mailing list subscription page</ulink> and fill out the form you'll find there."
 msgstr ""
 
 #. Tag: title
diff --git a/po/pt/welcome.po b/po/pt/welcome.po
index cefdcd0f3..594f233f6 100644
--- a/po/pt/welcome.po
+++ b/po/pt/welcome.po
@@ -379,8 +379,8 @@ msgstr ""
 #. Tag: title
 #: welcome.xml:231
 #, no-c-format
-msgid "What is &debian;?"
-msgstr "O que é &debian;?"
+msgid "What is Debian GNU/Linux?"
+msgstr "O que é Debian GNU/Linux?"
 
 #. Tag: para
 #: welcome.xml:232
@@ -388,7 +388,7 @@ msgstr "O que é &debian;?"
 msgid ""
 "The combination of Debian's philosophy and methodology and the GNU tools, "
 "the Linux kernel, and other important free software, form a unique software "
-"distribution called &debian;. This distribution is made up of a large number "
+"distribution called Debian GNU/Linux. This distribution is made up of a large number "
 "of software <emphasis>packages</emphasis>. Each package in the distribution "
 "contains executables, scripts, documentation, and configuration information, "
 "and has a <emphasis>maintainer</emphasis> who is primarily responsible for "
@@ -399,7 +399,7 @@ msgid ""
 msgstr ""
 "A combinação da filosofia e metodologia Debian e as ferramentas GNU, o "
 "kernel Linux, e outro importante software livre, formam uma distribuição de "
-"software única chamada &debian;. Esta distribuição é feita de um grande "
+"software única chamada Debian GNU/Linux. Esta distribuição é feita de um grande "
 "número de <emphasis>pacotes</emphasis> de software. Cada pacote da "
 "distribuição contém executáveis, scripts, documentação, e informação de "
 "configuração, e tem um <emphasis>maintainer</emphasis> que é o primeiro "
@@ -512,7 +512,7 @@ msgstr ""
 #: welcome.xml:295
 #, no-c-format
 msgid ""
-"The primary, and best, method of getting support for your &debian; system "
+"The primary, and best, method of getting support for your Debian GNU/Linux system "
 "and communicating with Debian Developers is through the many mailing lists "
 "maintained by the Debian Project (there are more than &num-of-debian-"
 "maillists; at this writing). The easiest way to subscribe to one or more of "
@@ -520,7 +520,7 @@ msgid ""
 "mailing list subscription page</ulink> and fill out the form you'll find "
 "there."
 msgstr ""
-"O principal, e melhor, método para obter suporte para o seu sistema &debian; "
+"O principal, e melhor, método para obter suporte para o seu sistema Debian GNU/Linux "
 "é comunicar com Debian Developers através das muitas mailing lists mantidas "
 "pelo Debian Project (mais de &num-of-debian-maillists; quando isto foi "
 "escrito). A forma mais fácil de subscrever uma ou mais destas mailing lists "
diff --git a/po/ro/welcome.po b/po/ro/welcome.po
index cd420f611..683e45a4c 100644
--- a/po/ro/welcome.po
+++ b/po/ro/welcome.po
@@ -401,8 +401,8 @@ msgstr ""
 #. Tag: title
 #: welcome.xml:231
 #, no-c-format
-msgid "What is &debian;?"
-msgstr "Ce este &debian;?"
+msgid "What is Debian GNU/Linux?"
+msgstr "Ce este Debian GNU/Linux?"
 
 #. Tag: para
 #: welcome.xml:232
@@ -410,7 +410,7 @@ msgstr "Ce este &debian;?"
 msgid ""
 "The combination of Debian's philosophy and methodology and the GNU tools, "
 "the Linux kernel, and other important free software, form a unique software "
-"distribution called &debian;. This distribution is made up of a large number "
+"distribution called Debian GNU/Linux. This distribution is made up of a large number "
 "of software <emphasis>packages</emphasis>. Each package in the distribution "
 "contains executables, scripts, documentation, and configuration information, "
 "and has a <emphasis>maintainer</emphasis> who is primarily responsible for "
@@ -421,7 +421,7 @@ msgid ""
 msgstr ""
 "Combinaţia dintre filosofia şi metodologia Debian, uneltele GNU, nucleul "
 "Linux şi alte programe libere importante formează o distribuiţie unică "
-"numită &debian;.Această distribuţie este formată dintr-un număr mare de "
+"numită Debian GNU/Linux.Această distribuţie este formată dintr-un număr mare de "
 "<emphasis>pachete</emphasis> de software. Fiecare pachet din distribuţie "
 "conţine executabile, script-uri, documentaţie şi informaţii de configurare "
 "şi au un <emphasis>responabil</emphasis> care este în special delegat să "
@@ -531,7 +531,7 @@ msgstr ""
 #: welcome.xml:295
 #, no-c-format
 msgid ""
-"The primary, and best, method of getting support for your &debian; system "
+"The primary, and best, method of getting support for your Debian GNU/Linux system "
 "and communicating with Debian Developers is through the many mailing lists "
 "maintained by the Debian Project (there are more than &num-of-debian-"
 "maillists; at this writing). The easiest way to subscribe to one or more of "
@@ -540,7 +540,7 @@ msgid ""
 "there."
 msgstr ""
 "Metoda primordială, şi cea mai bună, de a primi suport pentru sistemul "
-"dumeavoastră &debian; şi de a comunica cu dezvoltatorii Debian este prin "
+"dumeavoastră Debian GNU/Linux şi de a comunica cu dezvoltatorii Debian este prin "
 "intermediul listelor de discuţii care sunt întreţinute de Proiectul Debian "
 "(existând mai mult de &num-of-debian-maillists; la momentul scrierii acestui "
 "document). Cel mai uşor mod de a vă înscrie pe una sau mai multe dintre "
diff --git a/po/ru/welcome.po b/po/ru/welcome.po
index cd81749b4..b6622c40d 100644
--- a/po/ru/welcome.po
+++ b/po/ru/welcome.po
@@ -385,8 +385,8 @@ msgstr ""
 #. Tag: title
 #: welcome.xml:231
 #, no-c-format
-msgid "What is &debian;?"
-msgstr "Что такое &debian;?"
+msgid "What is Debian GNU/Linux?"
+msgstr "Что такое Debian GNU/Linux?"
 
 #. Tag: para
 #: welcome.xml:232
@@ -394,7 +394,7 @@ msgstr "Что такое &debian;?"
 msgid ""
 "The combination of Debian's philosophy and methodology and the GNU tools, "
 "the Linux kernel, and other important free software, form a unique software "
-"distribution called &debian;. This distribution is made up of a large number "
+"distribution called Debian GNU/Linux. This distribution is made up of a large number "
 "of software <emphasis>packages</emphasis>. Each package in the distribution "
 "contains executables, scripts, documentation, and configuration information, "
 "and has a <emphasis>maintainer</emphasis> who is primarily responsible for "
@@ -404,7 +404,7 @@ msgid ""
 "and fixed quickly."
 msgstr ""
 "Комбинация философии и методологии Debian, средств GNU, ядра Linux и других "
-"важных программ, составляют уникальный дистрибутив под названием &debian;. "
+"важных программ, составляют уникальный дистрибутив под названием Debian GNU/Linux. "
 "Этот дистрибутив собран из большого количества <emphasis>пакетов</emphasis> "
 "программ. Каждый пакет в дистрибутиве содержит исполняемые файлы, скрипты, "
 "документацию, конфигурационную информацию и имеет <emphasis>сопровождающего</"
@@ -516,7 +516,7 @@ msgstr ""
 #: welcome.xml:295
 #, no-c-format
 msgid ""
-"The primary, and best, method of getting support for your &debian; system "
+"The primary, and best, method of getting support for your Debian GNU/Linux system "
 "and communicating with Debian Developers is through the many mailing lists "
 "maintained by the Debian Project (there are more than &num-of-debian-"
 "maillists; at this writing). The easiest way to subscribe to one or more of "
@@ -524,7 +524,7 @@ msgid ""
 "mailing list subscription page</ulink> and fill out the form you'll find "
 "there."
 msgstr ""
-"Основным и самым лучшим способом получения поддержки системы &debian; и "
+"Основным и самым лучшим способом получения поддержки системы Debian GNU/Linux и "
 "общения с разработчиками Debian является множество списков рассылки проекта "
 "Debian (на момент написания этих строк их было более &num-of-debian-"
 "maillists;). Самый простой способ подписаться на один из этих списков "
diff --git a/po/sv/welcome.po b/po/sv/welcome.po
index 7660d8576..addf60e7a 100644
--- a/po/sv/welcome.po
+++ b/po/sv/welcome.po
@@ -376,8 +376,8 @@ msgstr ""
 #. Tag: title
 #: welcome.xml:231
 #, no-c-format
-msgid "What is &debian;?"
-msgstr "Vad är &debian;?"
+msgid "What is Debian GNU/Linux?"
+msgstr "Vad är Debian GNU/Linux?"
 
 #. Tag: para
 #: welcome.xml:232
@@ -385,7 +385,7 @@ msgstr "Vad är &debian;?"
 msgid ""
 "The combination of Debian's philosophy and methodology and the GNU tools, "
 "the Linux kernel, and other important free software, form a unique software "
-"distribution called &debian;. This distribution is made up of a large number "
+"distribution called Debian GNU/Linux. This distribution is made up of a large number "
 "of software <emphasis>packages</emphasis>. Each package in the distribution "
 "contains executables, scripts, documentation, and configuration information, "
 "and has a <emphasis>maintainer</emphasis> who is primarily responsible for "
@@ -396,7 +396,7 @@ msgid ""
 msgstr ""
 "Kombinationen av Debians filosofi, metodik, GNU-verktygen, Linux-kärnan och "
 "andra viktiga fria programvaror formar en unik utgåva av programvaror kallad "
-"&debian;. Den här utgåvan är uppbyggd av ett större antal av "
+"Debian GNU/Linux. Den här utgåvan är uppbyggd av ett större antal av "
 "programvaru<emphasis>paket</emphasis>. Varje paket i utgåvan innehåller "
 "exekverbara filer, skript, dokumentation och konfigurationsinformation och "
 "har en <emphasis>paketansvarig</emphasis> som är primärt ansvarig för att "
@@ -506,7 +506,7 @@ msgstr ""
 #: welcome.xml:295
 #, no-c-format
 msgid ""
-"The primary, and best, method of getting support for your &debian; system "
+"The primary, and best, method of getting support for your Debian GNU/Linux system "
 "and communicating with Debian Developers is through the many mailing lists "
 "maintained by the Debian Project (there are more than &num-of-debian-"
 "maillists; at this writing). The easiest way to subscribe to one or more of "
@@ -514,7 +514,7 @@ msgid ""
 "mailing list subscription page</ulink> and fill out the form you'll find "
 "there."
 msgstr ""
-"Den primära, och bästa, metoden att få support för ditt &debian;-system och "
+"Den primära, och bästa, metoden att få support för ditt Debian GNU/Linux-system och "
 "kommunicera med Debians utvecklare är genom de många sändlistor som "
 "underhålls av Debian-projektet (det är mer än &num-of-debian-maillists; "
 "listor när det här skrivs). Det lättaste sättet att prenumerera på en eller "
diff --git a/po/vi/welcome.po b/po/vi/welcome.po
index 0d3530611..bd11e1fd1 100644
--- a/po/vi/welcome.po
+++ b/po/vi/welcome.po
@@ -369,8 +369,8 @@ msgstr ""
 #. Tag: title
 #: welcome.xml:231
 #, no-c-format
-msgid "What is &debian;?"
-msgstr "&debian; là gì vậy?"
+msgid "What is Debian GNU/Linux?"
+msgstr "Debian GNU/Linux là gì vậy?"
 
 #. Tag: para
 #: welcome.xml:232
@@ -378,7 +378,7 @@ msgstr "&debian; là gì vậy?"
 msgid ""
 "The combination of Debian's philosophy and methodology and the GNU tools, "
 "the Linux kernel, and other important free software, form a unique software "
-"distribution called &debian;. This distribution is made up of a large number "
+"distribution called Debian GNU/Linux. This distribution is made up of a large number "
 "of software <emphasis>packages</emphasis>. Each package in the distribution "
 "contains executables, scripts, documentation, and configuration information, "
 "and has a <emphasis>maintainer</emphasis> who is primarily responsible for "
@@ -389,7 +389,7 @@ msgid ""
 msgstr ""
 "Kết hợp triết lý và phương pháp luận của Debian với những công cụ GNU, hạt "
 "nhân Linux, và phần mềm tự do quan trọng khác, các điều này thành lập một "
-"bản phát hành phần mềm duy nhất được gọi là &debian;. Bản phát hành này gồm "
+"bản phát hành phần mềm duy nhất được gọi là Debian GNU/Linux. Bản phát hành này gồm "
 "có rất nhiều <emphasis>gói</emphasis> phần mềm. Trong bản phát hành này, mỗi "
 "gói chứa chương trình chạy được, tập lệnh, tài liệu hướng dẫn và thông tin "
 "cấu hình, cũng có một <emphasis>nhà bảo trì</emphasis> nhận trách nhiệm "
@@ -492,7 +492,7 @@ msgstr ""
 #: welcome.xml:295
 #, no-c-format
 msgid ""
-"The primary, and best, method of getting support for your &debian; system "
+"The primary, and best, method of getting support for your Debian GNU/Linux system "
 "and communicating with Debian Developers is through the many mailing lists "
 "maintained by the Debian Project (there are more than &num-of-debian-"
 "maillists; at this writing). The easiest way to subscribe to one or more of "
@@ -500,7 +500,7 @@ msgid ""
 "mailing list subscription page</ulink> and fill out the form you'll find "
 "there."
 msgstr ""
-"Phương pháp chính và tốt nhất để được sự hỗ trợ cho hệ thống &debian; của "
+"Phương pháp chính và tốt nhất để được sự hỗ trợ cho hệ thống Debian GNU/Linux của "
 "bạn, cũng để liên lạc với Nhà Phát Triển Debian là bằng những hộp thư chung "
 "do Dự Án Debian bảo trì (có hơn &num-of-debian-maillists; hộp thư vào lúc "
 "viết câu này). Cách dễ nhất để đăng ký tham gia một hay nhiều hộp thư chung "
diff --git a/po/zh_CN/welcome.po b/po/zh_CN/welcome.po
index aa64f56b6..727cf6ca8 100644
--- a/po/zh_CN/welcome.po
+++ b/po/zh_CN/welcome.po
@@ -341,8 +341,8 @@ msgstr ""
 #. Tag: title
 #: welcome.xml:231
 #, no-c-format
-msgid "What is &debian;?"
-msgstr "什么是 &debian;?"
+msgid "What is Debian GNU/Linux?"
+msgstr "什么是 Debian GNU/Linux?"
 
 #. Tag: para
 #: welcome.xml:232
@@ -350,7 +350,7 @@ msgstr "什么是 &debian;?"
 msgid ""
 "The combination of Debian's philosophy and methodology and the GNU tools, "
 "the Linux kernel, and other important free software, form a unique software "
-"distribution called &debian;. This distribution is made up of a large number "
+"distribution called Debian GNU/Linux. This distribution is made up of a large number "
 "of software <emphasis>packages</emphasis>. Each package in the distribution "
 "contains executables, scripts, documentation, and configuration information, "
 "and has a <emphasis>maintainer</emphasis> who is primarily responsible for "
@@ -360,7 +360,7 @@ msgid ""
 "and fixed quickly."
 msgstr ""
 "将 Debian 哲学与方法论，GNU 工具集、Linux 内核，以及其他重要的自由软件 结合在"
-"一起所构成的独特的软件发行版称为 &debian;。该发行版由大量的软件 <emphasis>包"
+"一起所构成的独特的软件发行版称为 Debian GNU/Linux。该发行版由大量的软件 <emphasis>包"
 "</emphasis> 组成。发行版中的每个软件包都包含了执行文件、脚本、文档和配置信"
 "息，并拥有一位<emphasis>维护者</emphasis>，其职责是保持软件包更新、跟踪 bug "
 "报告，并与软件源作者保持联络。我们巨大的用户群，结合 bug 跟踪系统可以确保问题"
@@ -454,7 +454,7 @@ msgstr ""
 #: welcome.xml:295
 #, no-c-format
 msgid ""
-"The primary, and best, method of getting support for your &debian; system "
+"The primary, and best, method of getting support for your Debian GNU/Linux system "
 "and communicating with Debian Developers is through the many mailing lists "
 "maintained by the Debian Project (there are more than &num-of-debian-"
 "maillists; at this writing). The easiest way to subscribe to one or more of "
@@ -462,7 +462,7 @@ msgid ""
 "mailing list subscription page</ulink> and fill out the form you'll find "
 "there."
 msgstr ""
-"为您的 &debian; 系统寻求技术支持和联络 Debian 开发人员的主要的，也是最好的方"
+"为您的 Debian GNU/Linux 系统寻求技术支持和联络 Debian 开发人员的主要的，也是最好的方"
 "法是通过 Debian 计划的邮件列表(书写本文时已有 &num-of-debian-maillists; 个邮"
 "件列表)进行沟通。订阅这些列表的最简单方法是访问 <ulink url=\"&url-debian-"
 "lists-subscribe;\"> Debian 邮件列表订阅页</ulink> 并填写相应表单。"
diff --git a/po/zh_TW/welcome.po b/po/zh_TW/welcome.po
index 893485b65..113ed1b6a 100644
--- a/po/zh_TW/welcome.po
+++ b/po/zh_TW/welcome.po
@@ -351,8 +351,8 @@ msgstr ""
 #. Tag: title
 #: welcome.xml:231
 #, no-c-format
-msgid "What is &debian;?"
-msgstr "什麼是 &debian;?"
+msgid "What is Debian GNU/Linux?"
+msgstr "什麼是 Debian GNU/Linux?"
 
 #. Tag: para
 #: welcome.xml:232
@@ -360,7 +360,7 @@ msgstr "什麼是 &debian;?"
 msgid ""
 "The combination of Debian's philosophy and methodology and the GNU tools, "
 "the Linux kernel, and other important free software, form a unique software "
-"distribution called &debian;. This distribution is made up of a large number "
+"distribution called Debian GNU/Linux. This distribution is made up of a large number "
 "of software <emphasis>packages</emphasis>. Each package in the distribution "
 "contains executables, scripts, documentation, and configuration information, "
 "and has a <emphasis>maintainer</emphasis> who is primarily responsible for "
@@ -369,7 +369,7 @@ msgid ""
 "base, combined with our bug tracking system ensures that problems are found "
 "and fixed quickly."
 msgstr ""
-"&debian; 是將 Debian 哲學與方法論、GNU 工具集、Linux 核心，以及其他重要的自由"
+"Debian GNU/Linux 是將 Debian 哲學與方法論、GNU 工具集、Linux 核心，以及其他重要的自由"
 "軟體結合在一起所構成的獨特的軟體發行套件。該發行套件由大量的軟體<emphasis>套"
 "件</emphasis>組成。發行套件中的每個軟體套件都包含了執行檔、腳本、文件和設定資"
 "訊，並且擁有一位<emphasis>維護者</emphasis>，其主要職責是保持軟體套件更新、追"
@@ -465,7 +465,7 @@ msgstr ""
 #: welcome.xml:295
 #, no-c-format
 msgid ""
-"The primary, and best, method of getting support for your &debian; system "
+"The primary, and best, method of getting support for your Debian GNU/Linux system "
 "and communicating with Debian Developers is through the many mailing lists "
 "maintained by the Debian Project (there are more than &num-of-debian-"
 "maillists; at this writing). The easiest way to subscribe to one or more of "
@@ -473,7 +473,7 @@ msgid ""
 "mailing list subscription page</ulink> and fill out the form you'll find "
 "there."
 msgstr ""
-"為您的 &debian; 系統尋求技術支援和聯絡 Debian 開發人員，最主要、也是最好的方"
+"為您的 Debian GNU/Linux 系統尋求技術支援和聯絡 Debian 開發人員，最主要、也是最好的方"
 "法是透過 Debian 計畫的通信論壇 (撰寫本文時已有&num-of-debian-maillists;個通信"
 "論壇) 進行溝通。訂閱這些論壇的最簡單方法是透過 <ulink url=\"&url-debian-"
 "lists-subscribe;\"> Debian 通訊論壇訂閱網頁</ulink>並填寫相關表單。"
diff --git a/pt_BR/welcome/what-is-debian-linux.xml b/pt_BR/welcome/what-is-debian-linux.xml
index 5dd9d8ce1..8dd5e79a0 100644
--- a/pt_BR/welcome/what-is-debian-linux.xml
+++ b/pt_BR/welcome/what-is-debian-linux.xml
@@ -3,12 +3,12 @@
 <!-- reviewed by Felipe Augusto van de Wiel (faw) 2006.04.10 -->
 
  <sect1 id="what-is-debian-linux">
- <title>O que é o &debian;?</title>
+ <title>O que é o Debian GNU/Linux?</title>
 <para>
 
 A combinação da filosofia da Debian e metodologia e das ferramentas
 GNU, o kernel do Linux e outros softwares livres importantes, formam
-a única distribução de software chamada &debian;. Esta
+a única distribução de software chamada Debian GNU/Linux. Esta
 distribuição é feita de um grande número de <emphasis>pacotes</emphasis>
 de softwares. Cada pacote na distribuição contém programas
 executáveis, scripts, documentação e informações de configuração,
@@ -77,7 +77,7 @@ da Internet.
 </para><para>
 
 O método primário, e melhor, de se obter suporte ao seu sistema
-&debian; e se comunicar com os desenvolvedores do Debian
+Debian GNU/Linux e se comunicar com os desenvolvedores do Debian
 é através das muitas listas de discussão mantidas pelo projeto
 Debian (existem mais de &num-of-debian-maillists; quando este documento
 foi escrito). O método masi fácil de se inscrever em uma destas lista é visitar