summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolger Wansing <linux@wansing-online.de>2010-10-12 19:31:35 +0000
committerHolger Wansing <linux@wansing-online.de>2010-10-12 19:31:35 +0000
commit921b8a1308006976c4a554a020b77b882e10fdbf (patch)
treed93b007e1764ad5624923fbfda8de9198b6e4116
parent3526c138c5f83f1b21186c84e9e2f7782634f483 (diff)
downloadinstallation-guide-921b8a1308006976c4a554a020b77b882e10fdbf.zip
In administrivia.xml, 'Debian' was changed to &debian;, but in that
cases this was in error, should remain 'Debian' there. Reverting with this commit for en, de, fr, it.
-rw-r--r--de/administrivia/administrivia.xml8
-rw-r--r--en/administrivia/administrivia.xml4
-rw-r--r--fr/administrivia/administrivia.xml4
-rw-r--r--it/administrivia/administrivia.xml8
4 files changed, 12 insertions, 12 deletions
diff --git a/de/administrivia/administrivia.xml b/de/administrivia/administrivia.xml
index f532b60c7..3d6c78731 100644
--- a/de/administrivia/administrivia.xml
+++ b/de/administrivia/administrivia.xml
@@ -10,9 +10,9 @@
<para>
-Dieses Handbuch wurde ursprünglich erstellt für Sarge's &debian;-Installer
+Dieses Handbuch wurde ursprünglich erstellt für Sarge's Debian-Installer
und basiert auf dem Woody-Installations-Handbuch für Boot-Floppies
-(was wiederum auf älteren &debian;-Installationsanleitungen beruht) sowie auf
+(was wiederum auf älteren Debian-Installationsanleitungen beruht) sowie auf
dem Progeny-Distributions-Handbuch, das 2003 unter der GPL herausgegeben
wurde.
@@ -106,13 +106,13 @@ Installations-HowTo.
</para><para>
Miroslav Kuře hat Dokumentation über eine Reihe neuer Funktionen in Sarges
-&debian;-Installer geschrieben. Frans Pop war während der Veröffentlichungsphasen
+Debian-Installer geschrieben. Frans Pop war während der Veröffentlichungsphasen
von Etch, Lenny und Squeeze hauptsächlicher Autor der englischen Originalversion
dieses Handbuchs und verantwortlich für die Veröffentlichung.
</para><para>
-Viele, viele &debian;-Nutzer und -Entwickler waren an diesem
+Viele, viele Debian-Nutzer und -Entwickler waren an diesem
Handbuch beteiligt. Speziell müssen wir erwähnen: Michael Schmitz
(m68k-Support), Frank Neumann (ursprünglicher Autor des <ulink
url="&url-m68k-old-amiga-install;">Amiga Install Manuals</ulink>),
diff --git a/en/administrivia/administrivia.xml b/en/administrivia/administrivia.xml
index 6ae98728d..914b9a536 100644
--- a/en/administrivia/administrivia.xml
+++ b/en/administrivia/administrivia.xml
@@ -12,7 +12,7 @@
This manual was created for Sarge's debian-installer, based on
the Woody installation manual for boot-floppies, which was based
-on earlier &debian; installation manuals, and on the Progeny
+on earlier Debian installation manuals, and on the Progeny
distribution manual which was released under GPL in 2003.
</para><para>
@@ -112,7 +112,7 @@ the Etch, Lenny and Squeeze releases.
</para><para>
-Many, many &debian; users and developers contributed to this document.
+Many, many Debian users and developers contributed to this document.
Particular note must be made of Michael Schmitz (m68k support), Frank
Neumann (original author of the <ulink
url="&url-m68k-old-amiga-install;">Amiga install manual</ulink>),
diff --git a/fr/administrivia/administrivia.xml b/fr/administrivia/administrivia.xml
index 67d5059a0..77b1b8fb8 100644
--- a/fr/administrivia/administrivia.xml
+++ b/fr/administrivia/administrivia.xml
@@ -72,7 +72,7 @@ sources.
</para><para>
Veuillez <emphasis>ne pas</emphasis> contacter les auteurs de ce document
-directement. Il existe une liste de diffusion pour l'installateur &debian; qui
+directement. Il existe une liste de diffusion pour l'installateur Debian qui
discute de ce document. L'adresse de la liste de diffusion est
<email>debian-boot@lists.debian.org</email>. Les instructions pour s'abonner
sont disponibles à la page
@@ -122,7 +122,7 @@ Que les auteurs de ces sources d'informations riches et librement accessibles
soient remerciés.
</para>
<para>
-La section de ce manuel <quote>Installer &debian; à partir d'un système Unix/Linux</quote>
+La section de ce manuel <quote>Installer Debian à partir d'un système Unix/Linux</quote>
(<xref linkend="linux-upgrade"/>) est partiellement reprise d'un document
avec copyright Karsten M. Self.
</para>
diff --git a/it/administrivia/administrivia.xml b/it/administrivia/administrivia.xml
index 7ab0b5498..86b93d938 100644
--- a/it/administrivia/administrivia.xml
+++ b/it/administrivia/administrivia.xml
@@ -13,13 +13,13 @@
<!--
This manual was created for Sarge's debian-installer, based on
the Woody installation manual for boot-floppies, which was based
-on earlier &debian; installation manuals, and on the Progeny
+on earlier Debian installation manuals, and on the Progeny
distribution manual which was released under GPL in 2003.
-->
Questo manuale è stato creato per l'Installatore Debian di Sarge basandosi
sul manuale d'installazione di boot-floppies per Woody, che a sua volta si
-basava sui manuali d'installazione delle precedenti versioni di &debian;, e
+basava sui manuali d'installazione delle precedenti versioni di Debian, e
sul manuale della distribuzione Progeny che è stato rilasciato sotto GPL
nel 2003.
@@ -194,7 +194,7 @@ del rilascio per Etch, Lenny e Squeeze.
</para><para>
<!--
-Many, many &debian; users and developers contributed to this document.
+Many, many Debian users and developers contributed to this document.
Particular note must be made of Michael Schmitz (m68k support), Frank
Neumann (original author of the <ulink
url="&url-m68k-old-amiga-install;">Amiga install manual</ulink>),
@@ -205,7 +205,7 @@ from USB memory sticks.
-->
Sono davvero molti gli utenti e sviluppatori di
-&debian; che hanno contribuito a questo documento; in particolare vanno
+Debian che hanno contribuito a questo documento; in particolare vanno
ricordati Michael Schmitz (supporto per m68k), Frank Neumann (l'autore
originale dell'<ulink url="&url-m68k-old-amiga-install;">Amiga install
manual</ulink>), Arto Astala, Eric Delaunay/Ben Collins (informazioni