summaryrefslogtreecommitdiff
path: root/nl
diff options
context:
space:
mode:
Diffstat (limited to 'nl')
-rw-r--r--nl/appendix/chroot-install.xml32
-rw-r--r--nl/appendix/graphical.xml4
-rw-r--r--nl/appendix/plip.xml4
-rw-r--r--nl/appendix/preseed.xml10
-rw-r--r--nl/bookinfo.xml2
-rw-r--r--nl/boot-installer/arm.xml4
-rw-r--r--nl/boot-installer/ia64.xml18
-rw-r--r--nl/boot-installer/intro-cd.xml4
-rw-r--r--nl/boot-installer/mips.xml2
-rw-r--r--nl/boot-installer/parameters.xml6
-rw-r--r--nl/boot-installer/powerpc.xml4
-rw-r--r--nl/boot-installer/trouble.xml6
-rw-r--r--nl/boot-installer/x86.xml4
-rw-r--r--nl/boot-new/boot-new.xml12
-rw-r--r--nl/hardware/buying-hardware.xml2
-rw-r--r--nl/hardware/hardware-supported.xml30
-rw-r--r--nl/hardware/hardware.xml2
-rw-r--r--nl/hardware/installation-media.xml12
-rw-r--r--nl/hardware/network-cards.xml2
-rw-r--r--nl/hardware/supported/arm.xml12
-rw-r--r--nl/hardware/supported/i386.xml10
-rw-r--r--nl/hardware/supported/mips.xml8
-rw-r--r--nl/hardware/supported/mipsel.xml6
-rw-r--r--nl/hardware/supported/powerpc.xml10
-rw-r--r--nl/hardware/supported/sparc.xml2
-rw-r--r--nl/howto/installation-howto.xml14
-rw-r--r--nl/install-methods/automatic-install.xml8
-rw-r--r--nl/install-methods/boot-drive-files.xml8
-rw-r--r--nl/install-methods/boot-usb-files.xml2
-rw-r--r--nl/install-methods/create-floppy.xml2
-rw-r--r--nl/install-methods/download/arm.xml4
-rw-r--r--nl/install-methods/downloading-files.xml6
-rw-r--r--nl/install-methods/floppy/i386.xml2
-rw-r--r--nl/install-methods/floppy/powerpc.xml2
-rw-r--r--nl/install-methods/install-tftp.xml6
-rw-r--r--nl/install-methods/official-cdrom.xml8
-rw-r--r--nl/install-methods/tftp/bootp.xml2
-rw-r--r--nl/install-methods/usb-setup/powerpc.xml4
-rw-r--r--nl/install-methods/usb-setup/x86.xml4
-rw-r--r--nl/partitioning/partition-programs.xml6
-rw-r--r--nl/partitioning/partition/x86.xml6
-rw-r--r--nl/partitioning/partitioning.xml2
-rw-r--r--nl/partitioning/schemes.xml4
-rw-r--r--nl/partitioning/sizing.xml2
-rw-r--r--nl/partitioning/tree.xml4
-rw-r--r--nl/post-install/further-reading.xml2
-rw-r--r--nl/post-install/kernel-baking.xml10
-rw-r--r--nl/post-install/mail-setup.xml10
-rw-r--r--nl/post-install/new-to-unix.xml2
-rw-r--r--nl/post-install/orientation.xml12
-rw-r--r--nl/preface.xml8
-rw-r--r--nl/preparing/bios-setup/i386.xml4
-rw-r--r--nl/preparing/bios-setup/s390.xml4
-rw-r--r--nl/preparing/install-overview.xml14
-rw-r--r--nl/preparing/minimum-hardware-reqts.xml4
-rw-r--r--nl/preparing/needed-info.xml4
-rw-r--r--nl/preparing/non-debian-partitioning.xml26
-rw-r--r--nl/preparing/nondeb-part/sparc.xml4
-rw-r--r--nl/preparing/nondeb-part/x86.xml16
-rw-r--r--nl/preparing/pre-install-bios-setup.xml2
-rw-r--r--nl/preparing/preparing.xml2
-rw-r--r--nl/using-d-i/components.xml4
-rw-r--r--nl/using-d-i/modules/finish-install.xml2
-rw-r--r--nl/using-d-i/modules/ia64/elilo-installer.xml6
-rw-r--r--nl/using-d-i/modules/iso-scan.xml4
-rw-r--r--nl/using-d-i/modules/localechooser.xml2
-rw-r--r--nl/using-d-i/modules/os-prober.xml2
-rw-r--r--nl/using-d-i/modules/partman.xml2
-rw-r--r--nl/using-d-i/modules/save-logs.xml2
-rw-r--r--nl/using-d-i/modules/x86/lilo-installer.xml6
-rw-r--r--nl/using-d-i/using-d-i.xml14
-rw-r--r--nl/welcome/about-copyright.xml12
-rw-r--r--nl/welcome/doc-organization.xml14
-rw-r--r--nl/welcome/getting-newest-inst.xml8
-rw-r--r--nl/welcome/welcome.xml6
-rw-r--r--nl/welcome/what-is-debian-hurd.xml4
-rw-r--r--nl/welcome/what-is-debian-kfreebsd.xml8
-rw-r--r--nl/welcome/what-is-debian-linux.xml34
78 files changed, 279 insertions, 279 deletions
diff --git a/nl/appendix/chroot-install.xml b/nl/appendix/chroot-install.xml
index 09f75791c..8b9e72476 100644
--- a/nl/appendix/chroot-install.xml
+++ b/nl/appendix/chroot-install.xml
@@ -14,11 +14,11 @@ Red Hat, Mandrake, and SUSE. In this section some familiarity with
entering *nix commands and navigating the file system is assumed. In
this section, <prompt>$</prompt> symbolizes a command to be entered in
the user's current system, while <prompt>#</prompt> refers to a
-command entered in the Debian chroot.
+command entered in the &debian; chroot.
</para><para>
-Once you've got the new Debian system configured to your preference,
+Once you've got the new &debian; system configured to your preference,
you can migrate your existing user data (if any) to it, and keep on
rolling. This is therefore a <quote>zero downtime</quote> &debian-gnu;
install. It's also a clever way for dealing with hardware that
@@ -31,7 +31,7 @@ media.
As this is a mostly manual procedure, you should bear in mind that you
will need to do a lot of basic configuration of the system yourself,
-which will also require more knowledge of Debian and of &arch-kernel; in general
+which will also require more knowledge of &debian; and of &arch-kernel; in general
than performing a regular installation. You cannot expect this procedure
to result in a system that is identical to a system from a regular
installation. You should also keep in mind that this procedure only
@@ -65,7 +65,7 @@ To create an ext2 file system instead, omit <userinput>-j</userinput>.
</para><para>
Initialize and activate swap (substitute the partition number for
-your intended Debian swap partition):
+your intended &debian; swap partition):
<informalexample><screen>
# mkswap /dev/<replaceable>hda5</replaceable>
@@ -97,8 +97,8 @@ manually before proceding with the next stage.
<title>Install <command>debootstrap</command></title>
<para>
-The utility used by the Debian installer, and recognized as the
-official way to install a Debian base system, is
+The utility used by the &debian; installer, and recognized as the
+official way to install a &debian; base system, is
<command>debootstrap</command>. It uses <command>wget</command> and
<command>ar</command>, but otherwise depends only on
<classname>/bin/sh</classname> and basic Unix/Linux tools<footnote>
@@ -135,7 +135,7 @@ manually. Make a work folder for extracting the .deb into:
# cd work
</screen></informalexample>
-The <command>debootstrap</command> binary is located in the Debian
+The <command>debootstrap</command> binary is located in the &debian;
archive (be sure to select the proper file for your
architecture). Download the <command>debootstrap</command> .deb from
the <ulink url="http://ftp.debian.org/debian/pool/main/d/debootstrap/">
@@ -157,7 +157,7 @@ the files.
<para>
<command>debootstrap</command> can download the needed files directly
-from the archive when you run it. You can substitute any Debian
+from the archive when you run it. You can substitute any &debian;
archive mirror for <userinput>&archive-mirror;/debian</userinput> in
the command example below, preferably a mirror close to you
network-wise. Mirrors are listed at
@@ -200,7 +200,7 @@ in the <command>debootstrap</command> command:
<title>Configure The Base System</title>
<para>
-Now you've got a real Debian system, though rather lean, on disk.
+Now you've got a real &debian; system, though rather lean, on disk.
<command>chroot</command> into it:
<informalexample><screen>
@@ -208,7 +208,7 @@ Now you've got a real Debian system, though rather lean, on disk.
</screen></informalexample>
After chrooting you may need to set the terminal definition to be
-compatible with the Debian base system, for example:
+compatible with the &debian; base system, for example:
<informalexample><screen>
# export TERM=<replaceable>xterm-color</replaceable>
@@ -298,7 +298,7 @@ file systems individually, use:
# mount /path # e.g.: mount /usr
</screen></informalexample>
-Current Debian systems have mountpoints for removable media under
+Current &debian; systems have mountpoints for removable media under
<filename>/media</filename>, but keep compatibility symlinks in
<filename>/</filename>. Create these as as needed, for example:
@@ -545,14 +545,14 @@ its installation that refer to it.
To make your &debian-gnu; system bootable, set up your boot loader to load
the installed kernel with your new root partition. Note that
<command>debootstrap</command> does not install a boot loader, though you
-can use <command>aptitude</command> inside your Debian chroot to do so.
+can use <command>aptitude</command> inside your &debian; chroot to do so.
</para><para arch="any-x86">
Check <userinput>info grub</userinput> or <userinput>man
lilo.conf</userinput> for instructions on setting up the
-bootloader. If you are keeping the system you used to install Debian, just
-add an entry for the Debian install to your existing grub
+bootloader. If you are keeping the system you used to install &debian;, just
+add an entry for the &debian; install to your existing grub
<filename>menu.lst</filename> or <filename>lilo.conf</filename>. For
<filename>lilo.conf</filename>, you could also copy it to the new system and
edit it there. After you are done editing, call <command>lilo</command>
@@ -604,7 +604,7 @@ additional changes in <filename>/etc/kernel-img.conf</filename>.
For the <classname>grub</classname> bootloader, you should
set the <literal>do_bootloader</literal> option to <quote>no</quote>.
And to automatically update your <filename>/boot/grub/menu.lst</filename>
-on installation or removal of Debian kernels, add the following lines:
+on installation or removal of &debian; kernels, add the following lines:
<informalexample><screen>
postinst_hook = update-grub
@@ -618,7 +618,7 @@ For the <classname>lilo</classname> bootloader, the value of
Check <userinput>man yaboot.conf</userinput> for instructions on
setting up the bootloader. If you are keeping the system you used to
-install Debian, just add an entry for the Debian install to your
+install &debian;, just add an entry for the &debian; install to your
existing <filename>yaboot.conf</filename>. You could also copy it to
the new system and
edit it there. After you are done editing, call ybin (remember it will
diff --git a/nl/appendix/graphical.xml b/nl/appendix/graphical.xml
index ff85e0320..1b875377e 100644
--- a/nl/appendix/graphical.xml
+++ b/nl/appendix/graphical.xml
@@ -37,7 +37,7 @@ There is also a graphical installer image that can be netbooted. And there
is a special <quote>mini</quote> ISO image<footnote id="gtk-miniiso">
<para>
-The mini ISO image can be downloaded from a Debian mirror as described
+The mini ISO image can be downloaded from a &debian; mirror as described
in <xref linkend="downloading-files"/>.
Look for <filename>netboot/gtk/mini.iso</filename>.
</para>
@@ -50,7 +50,7 @@ For &arch-title;, currently only an experimental <quote>mini</quote> ISO
image is available<footnote id="gtk-miniiso">
<para>
-The mini ISO image can be downloaded from a Debian mirror as described
+The mini ISO image can be downloaded from a &debian; mirror as described
in <xref linkend="downloading-files"/>.
Look for <filename>netboot/gtk/mini.iso</filename>.
</para>
diff --git a/nl/appendix/plip.xml b/nl/appendix/plip.xml
index 7f9253f3a..830d75232 100644
--- a/nl/appendix/plip.xml
+++ b/nl/appendix/plip.xml
@@ -9,7 +9,7 @@
This section explains how to install &debian-gnu; on a computer without an
Ethernet card, but with just a remote gateway computer attached via
a Null-Modem cable (also called Null-Printer cable). The gateway
-computer should be connected to a network that has a Debian mirror
+computer should be connected to a network that has a &debian; mirror
on it (e.g. to the Internet).
</para><para>
@@ -40,7 +40,7 @@ systems. The most common values are <literal>io=0x378</literal>,
<itemizedlist>
<listitem><para>
-A target computer, called <emphasis>target</emphasis>, where Debian will be
+A target computer, called <emphasis>target</emphasis>, where &debian; will be
installed.
</para></listitem>
diff --git a/nl/appendix/preseed.xml b/nl/appendix/preseed.xml
index afa5227d3..58608478a 100644
--- a/nl/appendix/preseed.xml
+++ b/nl/appendix/preseed.xml
@@ -162,7 +162,7 @@ partitions.
<para>
Preseeding makes use of the <classname>debconf</classname> framework. This
-framework is the preferred mechanism used in Debian to interact with the user
+framework is the preferred mechanism used in &debian; to interact with the user
when configuring packages and also forms the heart of &d-i;.
In the <classname>debconf</classname> framework questions or dialogs are
based on <firstterm>templates</firstterm>. There are different types of
@@ -387,7 +387,7 @@ parameters, even if you delimit them with quotes.
<title>Auto mode</title>
<para>
-There are several features of Debian Installer that combine to allow
+There are several features of &debian; Installer that combine to allow
fairly simple command lines at the boot prompt to result in
arbitrarily complex customized automatic installs. To illustrate
this, here are some examples that can be used at the boot prompt:
@@ -554,7 +554,7 @@ from the network. DHCP allows specifying a filename. Normally this is a file
to netboot, but if it appears to be an URL then installation media that
support network preseeding will download the file from the URL and use it as a
preconfiguration file. Here is an example of how to set it up in the dhcpd.conf
-for version 3 of the ISC DHCP server (the dhcp3-server Debian package).
+for version 3 of the ISC DHCP server (the dhcp3-server &debian; package).
</para>
@@ -574,10 +574,10 @@ host to avoid preseeding all installs on your network.
</para><para>
A good way to use the DHCP preseeding is to only preseed values specific to
-your network, such as the Debian mirror to use. This way installs on your
+your network, such as the &debian; mirror to use. This way installs on your
network will automatically get a good mirror selected, but the rest of the
installation can be performed interactively. Using DHCP preseeding to fully
-automate Debian installs should only be done with care.
+automate &debian; installs should only be done with care.
</para>
</sect2>
diff --git a/nl/bookinfo.xml b/nl/bookinfo.xml
index 0436d17e7..f552ec536 100644
--- a/nl/bookinfo.xml
+++ b/nl/bookinfo.xml
@@ -9,7 +9,7 @@ Dit document bevat instructies voor de installatie van het &debian-gnu;
&release; systeem (codenaam <quote>&releasename;</quote>),
voor het &arch-title; (<quote>&architecture;</quote>)
platform. Verder bevat het verwijzingen naar aanvullende informatie en
-informatie over hoe u het meeste uit uw nieuwe Debian systeem kunt halen.
+informatie over hoe u het meeste uit uw nieuwe &debian; systeem kunt halen.
</para>
<para>
diff --git a/nl/boot-installer/arm.xml b/nl/boot-installer/arm.xml
index fedd0b0c5..d295d0894 100644
--- a/nl/boot-installer/arm.xml
+++ b/nl/boot-installer/arm.xml
@@ -43,7 +43,7 @@ and confirm again. The system will then boot straight into the installer.
You can use <command>upslug2</command> from any Linux or Unix machine to
upgrade the machine via the network. This software is packaged for
-Debian.
+&debian;.
First, you have to put your NSLU2 in upgrade mode:
@@ -141,7 +141,7 @@ serial ports.
To boot the SS4000-E, use your serial nullmodem cable and the ribbon
cable to connect to the serial port of the SS4000-E, and reboot the
machine. You need to use a serial terminal application to communicate
-with the machine; a good option on a Debian GNU/Linux is to use the
+with the machine; a good option on a &debian; GNU/Linux is to use the
<command>cu</command> program, in the package of the same name. Assuming
the serial port on your computer is to be found on
<filename>/dev/ttyS0</filename>, use the following command line:
diff --git a/nl/boot-installer/ia64.xml b/nl/boot-installer/ia64.xml
index cca48290e..17104727e 100644
--- a/nl/boot-installer/ia64.xml
+++ b/nl/boot-installer/ia64.xml
@@ -10,16 +10,16 @@
<para>
-There are three basic variations of Debian Install CDs.
+There are three basic variations of &debian; Install CDs.
The <emphasis>Business Card</emphasis> CD has a minimal installation
that will fit on the small form factor CD media.
It requires a network connection in order to install the rest of the
base installation and make a usable system.
The <emphasis>Network Install</emphasis> CD has all of the packages
-for a base install but requires a network connection to a Debian
+for a base install but requires a network connection to a &debian;
mirror site in order to install the
extra packages one would want for a complete system .
-The set of Debian CDs can install a complete system from the wide
+The set of &debian; CDs can install a complete system from the wide
range of packages without needing access to the network.
</para>
</note>
@@ -42,7 +42,7 @@ block on more conventional systems.
</para><para>
-The Debian Installer CD contains a small EFI partition where the
+The &debian; Installer CD contains a small EFI partition where the
<command>ELILO</command> bootloader, its configuration file, the installer's
kernel, and initial filesystem (initrd) are located.
The running system also contains an EFI partition where the necessary
@@ -148,7 +148,7 @@ This will start the boot load sequence.
<para>
-These steps start the Debian boot loader which will display a
+These steps start the &debian; boot loader which will display a
menu page for you to select a boot kernel and options.
Proceed to selecting the boot kernel and options.
@@ -162,7 +162,7 @@ Proceed to selecting the boot kernel and options.
If, for some reason, option 1 is not successful, reboot the machine
and when the EFI Boot Manager screen appears there should be
one option called <command>EFI Shell [Built-in]</command>.
-Boot the Debian Installer CD with the following steps:
+Boot the &debian; Installer CD with the following steps:
</para>
@@ -211,7 +211,7 @@ This will start the boot load sequence.
<para>
-As with option 1, these steps start the Debian boot loader which will
+As with option 1, these steps start the &debian; boot loader which will
display a menu page for you to select a boot kernel and options.
You can also enter the shorter
<command>fs<replaceable>n</replaceable>:elilo</command> command at
@@ -320,7 +320,7 @@ settings) are specified.
Press <command>ENTER</command>. This will load and start the
kernel.
The kernel will display its usual initialization messages followed
-by the first screen of the Debian Installer.
+by the first screen of the &debian; Installer.
</para></listitem>
</itemizedlist>
@@ -452,7 +452,7 @@ processed its configuration file.
At this point, the installation proceeds with the same steps as a
CD install. Select a boot option as in above and when the kernel
has completed installing itself from the network, it will start the
-Debian Installer.
+&debian; Installer.
</para><para>
diff --git a/nl/boot-installer/intro-cd.xml b/nl/boot-installer/intro-cd.xml
index 5ef26b58f..4c00e2593 100644
--- a/nl/boot-installer/intro-cd.xml
+++ b/nl/boot-installer/intro-cd.xml
@@ -3,7 +3,7 @@
<para>
-The easiest route for most people will be to use a set of Debian CDs.
+The easiest route for most people will be to use a set of &debian; CDs.
If you have a CD set, and if your machine supports booting directly off
the CD, great! Simply
<phrase arch="x86">
@@ -23,7 +23,7 @@ methods which may work for you.
</para><para>
Even if you cannot boot from CD-ROM, you can probably install the
-Debian system components and any packages you want from CD-ROM.
+&debian; system components and any packages you want from CD-ROM.
Simply boot using a different media, such as floppies. When it's
time to install the operating system, base system, and any additional
packages, point the installation system at the CD-ROM drive.
diff --git a/nl/boot-installer/mips.xml b/nl/boot-installer/mips.xml
index 59a04e664..d1ef4d252 100644
--- a/nl/boot-installer/mips.xml
+++ b/nl/boot-installer/mips.xml
@@ -14,7 +14,7 @@ After entering the command monitor use
bootp():
</screen></informalexample>
-on SGI machines to boot linux and to begin installation of the Debian
+on SGI machines to boot linux and to begin installation of the &debian;
Software. In order to make this
work you may have to unset the <envar>netaddr</envar> environment
variable. Type
diff --git a/nl/boot-installer/parameters.xml b/nl/boot-installer/parameters.xml
index 71243ade1..c4ef66769 100644
--- a/nl/boot-installer/parameters.xml
+++ b/nl/boot-installer/parameters.xml
@@ -78,7 +78,7 @@ Alternatively, set the <envar>input-device</envar> and
</para>
- <sect2 id="installer-args"><title>Debian Installer Parameters</title>
+ <sect2 id="installer-args"><title>&debian; Installer Parameters</title>
<para>
The installation system recognizes a few additional boot parameters<footnote>
@@ -204,7 +204,7 @@ debugging. Exit the shell to continue the boot.
<listitem><para>
The value of the parameter is the path to the device to load the
-Debian installer from. For example,
+&debian; installer from. For example,
<userinput>INSTALL_MEDIA_DEV=/dev/floppy/0</userinput>
</para><para>
@@ -580,7 +580,7 @@ force static network configuration.
<listitem><para>
By default the installer will use the http protocol to download files from
-Debian mirrors and changing that to ftp is not possible during installations
+&debian; mirrors and changing that to ftp is not possible during installations
at normal priority. By setting this parameter to <userinput>ftp</userinput>,
you can force the installer to use that protocol instead. Note that you
cannot select an ftp mirror from a list, you have to enter the hostname
diff --git a/nl/boot-installer/powerpc.xml b/nl/boot-installer/powerpc.xml
index 585ccb984..c11cbc4ba 100644
--- a/nl/boot-installer/powerpc.xml
+++ b/nl/boot-installer/powerpc.xml
@@ -16,7 +16,7 @@ keys together while booting to boot from the CD-ROM.
</para><para>
-OldWorld PowerMacs will not boot a Debian CD, because OldWorld
+OldWorld PowerMacs will not boot a &debian; CD, because OldWorld
computers relied on a Mac OS ROM CD boot driver to be present on the CD,
and a free-software version of this driver is not available. All
OldWorld systems have floppy drives, so use the floppy drive to launch
@@ -104,7 +104,7 @@ At yaboot's <prompt>boot:</prompt> prompt, type either
followed by a &enterkey;. The
<userinput>video=ofonly</userinput> argument is for maximum
compatibility; you can try it if <userinput>install</userinput>
-doesn't work. The Debian installation program should start.
+doesn't work. The &debian; installation program should start.
</para>
</sect3>
diff --git a/nl/boot-installer/trouble.xml b/nl/boot-installer/trouble.xml
index aa0338748..392e7f1f0 100644
--- a/nl/boot-installer/trouble.xml
+++ b/nl/boot-installer/trouble.xml
@@ -223,7 +223,7 @@ reliably.
<para>
-The biggest problem for people using floppy disks to install Debian
+The biggest problem for people using floppy disks to install &debian;
seems to be floppy disk reliability.
</para><para>
@@ -505,13 +505,13 @@ number of hardware configurations.
</para><para>
-Note that your installation report will be published in the Debian Bug
+Note that your installation report will be published in the &debian; Bug
Tracking System (BTS) and forwarded to a public mailing list. Make sure that
you use an e-mail address that you do not mind being made public.
</para><para>
-If you have a working Debian system, the easiest way to send an installation
+If you have a working &debian; system, the easiest way to send an installation
report is to install the <classname>installation-report</classname> and
<classname>reportbug</classname> packages
(<command>aptitude install installation-report reportbug</command>),
diff --git a/nl/boot-installer/x86.xml b/nl/boot-installer/x86.xml
index a45ba1404..e090058db 100644
--- a/nl/boot-installer/x86.xml
+++ b/nl/boot-installer/x86.xml
@@ -7,7 +7,7 @@
<!-- We'll comment the following section until we know exact layout -->
<!--
-CD #1 of official Debian CD-ROM sets for &arch-title; will present a
+CD #1 of official &debian; CD-ROM sets for &arch-title; will present a
<prompt>boot:</prompt> prompt on most hardware. Press
<keycap>F4</keycap> to see the list of kernel options available
from which to boot. Just type your chosen flavor name (idepci,
@@ -338,7 +338,7 @@ provides bootdiskettes and even bootroms that do a TFTPboot.
<para>
When the installer boots, you should be presented with a friendly graphical
-screen showing the Debian logo and a menu:
+screen showing the &debian; logo and a menu:
<informalexample><screen>
Installer boot menu
diff --git a/nl/boot-new/boot-new.xml b/nl/boot-new/boot-new.xml
index 0e7b08c61..7338c558e 100644
--- a/nl/boot-new/boot-new.xml
+++ b/nl/boot-new/boot-new.xml
@@ -1,12 +1,12 @@
<!-- original version: 61133 -->
<chapter id="boot-new">
- <title>De computer opstarten met uw nieuwe Debian systeem</title>
+ <title>De computer opstarten met uw nieuwe &debian; systeem</title>
<sect1 id="base-boot"><title>Het moment van de waarheid</title>
<para>
-De eerste keer dat u uw computer opnieuw opstart met uw nieuwe Debian
+De eerste keer dat u uw computer opnieuw opstart met uw nieuwe &debian;
systeem is een soort <quote>vuurdoop</quote>.
</para><para arch="any-x86">
@@ -15,14 +15,14 @@ Als u een standaard installatie heeft uitgevoerd, is het menu van de
<classname>grub</classname><phrase arch="x86">, of eventueel van de <classname>lilo</classname></phrase>
opstartlader, het eerste dat u behoort te zien nadat het systeem opnieuw
opstart.
-De eerste keuzes in het menu zullen betrekking hebben op uw nieuwe Debian
+De eerste keuzes in het menu zullen betrekking hebben op uw nieuwe &debian;
systeem. Als u ook andere besturingssystemen (zoals Windows) op de computer
had die door het installatiesysteem gedetecteerd zijn, dan zullen deze lager
in het menu zijn opgenomen.
Als het systeem niet juist opstart, raak dan vooral niet in paniek. Als de
installatie successvol is afgerond, dan is de kans groot dat slechts een
-relatief klein probleem het opstarten van het systeem met Debian verhindert.
+relatief klein probleem het opstarten van het systeem met &debian; verhindert.
In de meeste gevallen kunnen zulke problemen worden opgelost zonder de
installatie the hoeven herhalen. Eén van de beschikbare opties om
opstartproblemen te verhelpen is het gebruik van de ingebouwde
@@ -30,7 +30,7 @@ reddingsmodus van het installatiesysteem (zie <xref linkend="rescue"/>).
</para><para>
-Als Debian en &arch-kernel; nieuw zijn voor u, dan kunt u hierbij mogelijk wat hulp
+Als &debian; en &arch-kernel; nieuw zijn voor u, dan kunt u hierbij mogelijk wat hulp
gebruiken van meer ervaren gebruikers.
<phrase arch="x86">Voor directe on-line hulp kunt u de IRC-kanalen #debian of
#debian-boot op het OFTC-netwerk proberen. Of anders kunt u een bericht sturen
@@ -161,7 +161,7 @@ het installatieproces.
De documentatie bij programma's die u heeft geïnstalleerd, kunt u vinden in
submappen onder <filename>/usr/share/doc/</filename>. Merk op dat deze
-submappen de naam hebben van de geïnstalleerde Debian pakketten, niet van de
+submappen de naam hebben van de geïnstalleerde &debian; pakketten, niet van de
programma's zelf.
Meer uitgebreide documentatie is vaak opgenomen in afzonderlijke
documentatiepakketten die in het algemeen niet standaard geïnstalleerd
diff --git a/nl/hardware/buying-hardware.xml b/nl/hardware/buying-hardware.xml
index b0a061db1..367aac515 100644
--- a/nl/hardware/buying-hardware.xml
+++ b/nl/hardware/buying-hardware.xml
@@ -5,7 +5,7 @@
<para arch="linux-any">
-There are several vendors, who ship systems with Debian or other
+There are several vendors, who ship systems with &debian; or other
distributions of GNU/Linux
<ulink url="&url-pre-installed;">pre-installed</ulink>. You might pay more
for the privilege, but it does buy a level of peace of mind, since you can
diff --git a/nl/hardware/hardware-supported.xml b/nl/hardware/hardware-supported.xml
index 152d7f8c3..b7278d846 100644
--- a/nl/hardware/hardware-supported.xml
+++ b/nl/hardware/hardware-supported.xml
@@ -5,11 +5,11 @@
<title>Supported Hardware</title>
<para>
-Debian does not impose hardware requirements beyond the requirements
+&debian; does not impose hardware requirements beyond the requirements
of the Linux kernel and the GNU tool-sets. Therefore, any
architecture or platform to which the Linux kernel, libc,
-<command>gcc</command>, etc. have been ported, and for which a Debian
-port exists, can run Debian. Please refer to the Ports pages at
+<command>gcc</command>, etc. have been ported, and for which a &debian;
+port exists, can run &debian;. Please refer to the Ports pages at
<ulink url="&url-ports;"></ulink> for
more details on &arch-title; architecture systems which have been
tested with &debian-gnu;.
@@ -26,7 +26,7 @@ information can be found.
<sect2><title>Supported Architectures</title>
<para>
-Debian GNU/Linux &release; supports eleven major architectures and several
+&debian; GNU/Linux &release; supports eleven major architectures and several
variations of each architecture known as <quote>flavors</quote>.
</para><para>
@@ -35,7 +35,7 @@ variations of each architecture known as <quote>flavors</quote>.
<tgroup cols="4">
<thead>
<row>
- <entry>Architecture</entry><entry>Debian Designation</entry>
+ <entry>Architecture</entry><entry>&debian; Designation</entry>
<entry>Subarchitecture</entry><entry>Flavor</entry>
</row>
</thead>
@@ -155,7 +155,7 @@ variations of each architecture known as <quote>flavors</quote>.
This document covers installation for the
<emphasis>&arch-title;</emphasis> architecture. If you are looking
-for information on any of the other Debian-supported architectures
+for information on any of the other &debian;-supported architectures
take a look at the
<ulink url="http://www.debian.org/ports/">Debian-Ports</ulink> pages.
@@ -215,7 +215,7 @@ with GNU/Linux, see for example the
<para>
Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</quote>
-or SMP &mdash; is available for this architecture. The standard Debian
+or SMP &mdash; is available for this architecture. The standard &debian;
&release; kernel image has been compiled with SMP support. The standard
kernel is also usable on non-SMP systems, but has a slight overhead which
will cause a small reduction in performance. For normal system use this
@@ -224,7 +224,7 @@ will hardly be noticable.
</para><para>
In order to optimize the kernel for single CPU systems, you'll have to
-replace the standard Debian kernel. <phrase arch="linux-any">You can find a discussion of how
+replace the standard &debian; kernel. <phrase arch="linux-any">You can find a discussion of how
to do this in <xref linkend="kernel-baking"/>. At this time
(kernel version &kernelversion;) the way you disable SMP is to deselect
<quote>&smp-config-option;</quote> in the <quote>&smp-config-section;</quote>
@@ -240,14 +240,14 @@ section of the kernel config.</phrase>
Multiprocessor support &mdash; also called <quote>symmetric
multiprocessing</quote> or SMP &mdash; is available for this architecture.
-The standard Debian &release; kernel image has been compiled with
+The standard &debian; &release; kernel image has been compiled with
<firstterm>SMP-alternatives</firstterm> support. This means that the kernel
will detect the number of processors (or processor cores) and will
automatically deactivate SMP on uniprocessor systems.
</para><para arch="i386">
-The 486 flavour of the Debian kernel image packages for &arch-title;
+The 486 flavour of the &debian; kernel image packages for &arch-title;
is not compiled with SMP support.
</para>
@@ -259,7 +259,7 @@ is not compiled with SMP support.
Multiprocessor support &mdash; also called <quote>symmetric
multiprocessing</quote> or SMP &mdash; is available for this architecture.
-However, the standard Debian &release; kernel image does not support
+However, the standard &debian; &release; kernel image does not support
SMP. This should not prevent installation, since the standard,
non-SMP kernel should boot on SMP systems; the kernel will simply use
the first CPU.
@@ -267,7 +267,7 @@ the first CPU.
</para><para>
In order to take advantage of multiple processors, you'll have to
-replace the standard Debian kernel. <phrase arch="linux-any">You can find a discussion of how
+replace the standard &debian; kernel. <phrase arch="linux-any">You can find a discussion of how
to do this in <xref linkend="kernel-baking"/>. At this time
(kernel version &kernelversion;) the way you enable SMP is to select
<quote>&smp-config-option;</quote> in the <quote>&smp-config-section;</quote>
@@ -282,7 +282,7 @@ section of the kernel config.</phrase>
Multiprocessor support &mdash; also called <quote>symmetric
multiprocessing</quote> or SMP &mdash; is available for this architecture,
-and is supported by a precompiled Debian kernel image. Depending on your
+and is supported by a precompiled &debian; kernel image. Depending on your
install media, this SMP-capable kernel may or may not be installed by
default. This should not prevent installation, since the standard,
non-SMP kernel should boot on SMP systems; the kernel will simply use
@@ -316,11 +316,11 @@ during the installation process described in this document.
</para><para>
-Debian's support for graphical interfaces is determined by the
+&debian;'s support for graphical interfaces is determined by the
underlying support found in X.Org's X11 system. Most AGP, PCI and
PCIe video cards work under X.Org. Details on supported graphics
buses, cards, monitors, and pointing devices can be found at
-<ulink url="&url-xorg;"></ulink>. Debian &release; ships
+<ulink url="&url-xorg;"></ulink>. &debian; &release; ships
with X.Org version &x11ver;.
</para><para arch="mips">
diff --git a/nl/hardware/hardware.xml b/nl/hardware/hardware.xml
index 54eda16ab..781baf139 100644
--- a/nl/hardware/hardware.xml
+++ b/nl/hardware/hardware.xml
@@ -7,7 +7,7 @@
<para>
This section contains information about what hardware you need to get
-started with Debian. You will also find links to further information
+started with &debian;. You will also find links to further information
about hardware supported by GNU and &arch-kernel;.
</para>
diff --git a/nl/hardware/installation-media.xml b/nl/hardware/installation-media.xml
index fb7311362..d8d4f3c52 100644
--- a/nl/hardware/installation-media.xml
+++ b/nl/hardware/installation-media.xml
@@ -7,8 +7,8 @@
<para>
This section will help you determine which different media types you can use to
-install Debian. For example, if you have a floppy disk drive on your machine,
-it can be used to install Debian. There is a whole chapter devoted to media,
+install &debian;. For example, if you have a floppy disk drive on your machine,
+it can be used to install &debian;. There is a whole chapter devoted to media,
<xref linkend="install-methods"/>, which lists the advantages and
disadvantages of each media type. You may want to refer back to this page once
you reach that section.
@@ -99,7 +99,7 @@ Although the &arch-title; does not allow booting from SunOS
<para>
-Many Debian boxes need their floppy and/or CD-ROM drives only for
+Many &debian; boxes need their floppy and/or CD-ROM drives only for
setting up the system and for rescue purposes. If you operate some
servers, you will probably already have thought about omitting those
drives and using an USB memory stick for installing and (when
@@ -153,17 +153,17 @@ linkend="linux-upgrade"/>.
<para>
-The Debian boot disks contain a kernel which is built to maximize the
+The &debian; boot disks contain a kernel which is built to maximize the
number of systems it runs on. Unfortunately, this makes for a larger
kernel, which includes many drivers that won't be used for your
machine<phrase arch="linux-any"> (see <xref linkend="kernel-baking"/> to learn how to
build your own kernel)</phrase>. Support for the widest possible range of
-devices is desirable in general, to ensure that Debian can be
+devices is desirable in general, to ensure that &debian; can be
installed on the widest array of hardware.
</para><para arch="x86">
-Generally, the Debian installation system includes support for floppies,
+Generally, the &debian; installation system includes support for floppies,
IDE (also known as PATA) drives, IDE floppies, parallel port IDE devices, SATA
and SCSI controllers and drives, USB, and FireWire. The supported file systems
include FAT, Win-32 FAT extensions (VFAT) and NTFS.
diff --git a/nl/hardware/network-cards.xml b/nl/hardware/network-cards.xml
index ea47660fb..e03bcb7b8 100644
--- a/nl/hardware/network-cards.xml
+++ b/nl/hardware/network-cards.xml
@@ -118,7 +118,7 @@ your network manually.
</para><para>
-In some cases the driver you need may not be available as a Debian package.
+In some cases the driver you need may not be available as a &debian; package.
You will then have to look if there is source code available in the internet
and compile the driver yourself. How to do this is outside the scope of this
manual.
diff --git a/nl/hardware/supported/arm.xml b/nl/hardware/supported/arm.xml
index c71d45861..eae55aa2d 100644
--- a/nl/hardware/supported/arm.xml
+++ b/nl/hardware/supported/arm.xml
@@ -7,8 +7,8 @@
<para>
Each distinct ARM architecture requires its own kernel. Because of
-this the standard Debian distribution only supports installation on
-a number of the most common platforms. The Debian userland however may be
+this the standard &debian; distribution only supports installation on
+a number of the most common platforms. The &debian; userland however may be
used by <emphasis>any</emphasis> ARM CPU.
</para>
@@ -17,7 +17,7 @@ used by <emphasis>any</emphasis> ARM CPU.
Most ARM CPUs may be run in either endian mode (big or little). However,
the majority of current system implementation uses little-endian mode.
-Debian currently only supports little-endian ARM systems.
+&debian; currently only supports little-endian ARM systems.
</para>
@@ -32,9 +32,9 @@ The supported platforms are:
<listitem><para>
Intel's I/O Processor (IOP) line is found in a number of products related
-to data storage and processing. Debian currently supports the IOP32x
+to data storage and processing. &debian; currently supports the IOP32x
platform, featuring the IOP 80219 and 32x chips commonly found in Network
-Attached Storage (NAS) devices. Debian explicitly supports two such
+Attached Storage (NAS) devices. &debian; explicitly supports two such
devices: the <ulink url="&url-arm-cyrius-glantank;">GLAN Tank</ulink> from
IO-Data and the <ulink url="&url-arm-cyrius-n2100;">Thecus N2100</ulink>.
@@ -93,7 +93,7 @@ TS-409).
<listitem><para>
The Versatile platform is emulated by QEMU and is therefore a nice way to
-test and run Debian on ARM if you don't have the hardware.
+test and run &debian; on ARM if you don't have the hardware.
</para></listitem>
</varlistentry>
diff --git a/nl/hardware/supported/i386.xml b/nl/hardware/supported/i386.xml
index 29bc3ce20..249880cef 100644
--- a/nl/hardware/supported/i386.xml
+++ b/nl/hardware/supported/i386.xml
@@ -21,16 +21,16 @@ processors like the Athlon XP and Intel P4 Xeon.
</para><para>
-However, Debian GNU/Linux &releasename; will <emphasis>not</emphasis> run
+However, &debian; GNU/Linux &releasename; will <emphasis>not</emphasis> run
on 386 or earlier processors. Despite the architecture name "i386", support
for actual 80386 processors (and their clones) was dropped with the Sarge
-(r3.1) release of Debian<footnote>
+(r3.1) release of &debian;<footnote>
<para>
We have long tried to avoid this, but in the end it was necessary due a
unfortunate series of issues with the compiler and the kernel, starting
with an bug in the C++ ABI provided by GCC. You should still be able to
-run Debian GNU/Linux on actual 80386 processors if you compile your own
+run &debian; GNU/Linux on actual 80386 processors if you compile your own
kernel and compile all packages from source, but that is beyond the
scope of this manual.
</para>
@@ -41,11 +41,11 @@ supported<footnote>
<para>
-Many Debian packages will actually run slightly faster on modern computers
+Many &debian; packages will actually run slightly faster on modern computers
as a positive side effect of dropping support for these old chips. The
i486, introduced in 1989, has three opcodes (bswap, cmpxchg, and xadd)
which the i386, introduced in 1986, did not have. Previously, these could not
-be easily used by most Debian packages; now they can.
+be easily used by most &debian; packages; now they can.
</para>
diff --git a/nl/hardware/supported/mips.xml b/nl/hardware/supported/mips.xml
index ff89418d3..91f95d973 100644
--- a/nl/hardware/supported/mips.xml
+++ b/nl/hardware/supported/mips.xml
@@ -5,7 +5,7 @@
<sect2 arch="mips"><title>CPU, Main Boards, and Video Support</title>
<para>
-Debian on &arch-title; supports the following platforms:
+&debian; on &arch-title; supports the following platforms:
<itemizedlist>
<listitem><para>
@@ -23,14 +23,14 @@ SGI IP32: this platform is generally known as SGI O2.
<listitem><para>
MIPS Malta: this platform is emulated by QEMU and is therefore a nice way
-to test and run Debian on MIPS if you don't have the hardware.
+to test and run &debian; on MIPS if you don't have the hardware.
</para></listitem>
</itemizedlist>
Complete information regarding supported mips/mipsel machines can be found
at the <ulink url="&url-linux-mips;">Linux-MIPS homepage</ulink>. In the
-following, only the systems supported by the Debian installer will be
+following, only the systems supported by the &debian; installer will be
covered. If you are looking for support for other subarchitectures, please
contact the <ulink url="&url-list-subscribe;">
debian-&arch-listname; mailing list</ulink>.
@@ -41,7 +41,7 @@ debian-&arch-listname; mailing list</ulink>.
<para>
On SGI IP22, SGI Indy, Indigo 2 and Challenge S with R4000, R4400, R4600 and R5000
-processors are supported by the Debian installation system on big endian
+processors are supported by the &debian; installation system on big endian
MIPS. On SGI IP32, currently only systems based on the R5000 are supported.
</para><para>
diff --git a/nl/hardware/supported/mipsel.xml b/nl/hardware/supported/mipsel.xml
index 001192fe9..4ba800a5c 100644
--- a/nl/hardware/supported/mipsel.xml
+++ b/nl/hardware/supported/mipsel.xml
@@ -5,7 +5,7 @@
<sect2 arch="mipsel"><title>CPU, Main Boards, and Video Support</title>
<para>
-Debian on &arch-title; supports the following platforms:
+&debian; on &arch-title; supports the following platforms:
<itemizedlist>
<listitem><para>
@@ -17,14 +17,14 @@ includes the Cobalt RaQ, Qube2 and RaQ2, and the Gateway Microserver.
<listitem><para>
MIPS Malta: this platform is emulated by QEMU and is therefore a nice way
-to test and run Debian on MIPS if you don't have the hardware.
+to test and run &debian; on MIPS if you don't have the hardware.
</para></listitem>
</itemizedlist>
Complete information regarding supported mips/mipsel machines can be found
at the <ulink url="&url-linux-mips;">Linux-MIPS homepage</ulink>. In the
-following, only the systems supported by the Debian installer will be
+following, only the systems supported by the &debian; installer will be
covered. If you are looking for support for other subarchitectures, please
contact the <ulink url="&url-list-subscribe;">
debian-&arch-listname; mailing list</ulink>.
diff --git a/nl/hardware/supported/powerpc.xml b/nl/hardware/supported/powerpc.xml
index e0dbf72be..bb146b54a 100644
--- a/nl/hardware/supported/powerpc.xml
+++ b/nl/hardware/supported/powerpc.xml
@@ -19,7 +19,7 @@ supporting different CPU variants.
Ports to other <emphasis>&architecture;</emphasis> architectures, such
as the Be-Box and MBX architecture, are underway but not yet supported
-by Debian. We may have a 64-bit port in the future.
+by &debian;. We may have a 64-bit port in the future.
-->
</para>
@@ -28,7 +28,7 @@ by Debian. We may have a 64-bit port in the future.
<para>
-There are two flavours of the powerpc kernel in Debian, based on the
+There are two flavours of the powerpc kernel in &debian;, based on the
CPU type:
<variablelist>
@@ -101,7 +101,7 @@ currently disabled.
Apple (and briefly a few other manufacturers &mdash; Power Computing, for
example) made a series of Macintosh computers based on the PowerPC
processor. For purposes of architecture support, they are categorized
-as NuBus (not supported by Debian), OldWorld, and NewWorld.
+as NuBus (not supported by &debian;), OldWorld, and NewWorld.
</para><para>
@@ -362,10 +362,10 @@ and, for older hardware,
<para>
-NuBus systems are not currently supported by Debian/powerpc. The
+NuBus systems are not currently supported by &debian;/powerpc. The
monolithic Linux/PPC kernel architecture does not have support for
these machines; instead, one must use the MkLinux Mach microkernel,
-which Debian does not yet support. These include the following:
+which &debian; does not yet support. These include the following:
<itemizedlist>
<listitem><para>
diff --git a/nl/hardware/supported/sparc.xml b/nl/hardware/supported/sparc.xml
index 1cd88c0bc..5d02c340b 100644
--- a/nl/hardware/supported/sparc.xml
+++ b/nl/hardware/supported/sparc.xml
@@ -25,7 +25,7 @@ SPARCstation page</ulink>.
</para><para>
-The last Debian release to support sparc32 was Etch, but even then only
+The last &debian; release to support sparc32 was Etch, but even then only
for sun4m systems. Support for the other 32-bits subarchitectures had
already been discontinued after earlier releases.
diff --git a/nl/howto/installation-howto.xml b/nl/howto/installation-howto.xml
index a3c15a5f7..c1be31c23 100644
--- a/nl/howto/installation-howto.xml
+++ b/nl/howto/installation-howto.xml
@@ -51,7 +51,7 @@ Some installation methods require other images than CD images.
The <ulink url="&url-d-i;">&d-i; home page</ulink> has links to
other images.
</phrase>
-<xref linkend="where-files" /> explains how to find images on Debian
+<xref linkend="where-files" /> explains how to find images on &debian;
mirrors.
</para><para>
@@ -93,7 +93,7 @@ To boot a PowerMac from CD, press the <keycap>c</keycap> key while booting. See
<para>
If you can't boot from CD, you can download floppy images to install
-Debian. You need the <filename>floppy/boot.img</filename>, the
+&debian;. You need the <filename>floppy/boot.img</filename>, the
<filename>floppy/root.img</filename> and one or more of the driver disks.
</para><para>
@@ -132,7 +132,7 @@ Since you'll have more than one floppy, it's a good idea to label them.
<para>
It's also possible to install from removable USB storage devices. For
-example a USB keychain can make a handy Debian install medium that you
+example a USB keychain can make a handy &debian; install medium that you
can take with you anywhere.
</para><para>
@@ -142,7 +142,7 @@ The easiest way to prepare your USB memory stick is to download
image from that file. Write this image directly to your memory stick, which
must be at least 256 mb in size. Of course this will destroy anything already
on the memory stick. Then mount the memory stick, which will now have a FAT
-filesystem on it. Next, download a Debian netinst CD image, and copy that file
+filesystem on it. Next, download a &debian; netinst CD image, and copy that file
to the memory stick; any filename is ok as long as it ends in
<literal>.iso</literal>.
@@ -195,7 +195,7 @@ For detailed instructions, see <xref linkend="install-tftp" />.
It's possible to boot the installer using no removable media, but just an
existing hard disk, which can have a different OS on it. Download
<filename>hd-media/initrd.gz</filename>, <filename>hd-media/vmlinuz</filename>,
-and a Debian CD image to the top-level directory of the hard disk. Make sure
+and a &debian; CD image to the top-level directory of the hard disk. Make sure
that the CD image has a filename ending in <literal>.iso</literal>. Now
it's just a matter of booting linux with the initrd.
<phrase arch="x86">
@@ -258,7 +258,7 @@ to autopartition, choose <guimenuitem>Manual</guimenuitem> from the menu.
If you have an existing DOS or Windows partition that you want to preserve,
be very careful with automatic partitioning. If you choose manual partitioning,
you can use the installer to resize existing FAT or NTFS partitions to create
-room for the Debian install: simply select the partition and specify its new size.
+room for the &debian; install: simply select the partition and specify its new size.
</para><para>
@@ -349,7 +349,7 @@ see <xref linkend="problem-report" />.
<title>And finally&hellip;</title>
<para>
-We hope that your Debian installation is pleasant and that you find Debian
+We hope that your &debian; installation is pleasant and that you find &debian;
useful. You might want to read <xref linkend="post-install" />.
</para>
diff --git a/nl/install-methods/automatic-install.xml b/nl/install-methods/automatic-install.xml
index 9410b23fe..6aaddea31 100644
--- a/nl/install-methods/automatic-install.xml
+++ b/nl/install-methods/automatic-install.xml
@@ -6,20 +6,20 @@
<para>
For installing on multiple computers it's possible to do fully
-automatic installations. Debian packages intended for this include
+automatic installations. &debian; packages intended for this include
<classname>fai</classname> (which uses an install server),
<classname>replicator</classname>,
<classname>systemimager</classname>,
<classname>autoinstall</classname>, and
-the Debian Installer itself.
+the &debian; Installer itself.
</para>
<sect2 id="preseed">
- <title>Automatic Installation Using the Debian Installer</title>
+ <title>Automatic Installation Using the &debian; Installer</title>
<para>
-The Debian Installer supports automating installs via preconfiguration
+The &debian; Installer supports automating installs via preconfiguration
files. A preconfiguration file can be loaded from the network or from
removable media, and used to fill in answers to questions asked during the
installation process.
diff --git a/nl/install-methods/boot-drive-files.xml b/nl/install-methods/boot-drive-files.xml
index 3b0542625..22205ddd1 100644
--- a/nl/install-methods/boot-drive-files.xml
+++ b/nl/install-methods/boot-drive-files.xml
@@ -56,7 +56,7 @@ the root file-system by the kernel.
</para><para>
-Copy the following files from the Debian archives to a
+Copy the following files from the &debian; archives to a
convenient location on your hard drive, for instance to
<filename>/boot/newinstall/</filename>.
@@ -92,7 +92,7 @@ The <filename>boot-floppy-hfs</filename> floppy uses
booting. <application>BootX</application>, launched from MacOS,
supports booting from files placed on the hard
disk. <application>BootX</application> can also be used to dual-boot
-MacOS and Linux after your Debian installation is complete. For the
+MacOS and Linux after your &debian; installation is complete. For the
Performa 6360, it appears that <command>quik</command> cannot make the
hard disk bootable. So <application>BootX</application> is required
on that model.
@@ -103,7 +103,7 @@ Download and unstuff the <application>BootX</application>
distribution, available from <ulink url="&url-powerpc-bootx;"></ulink>,
or in the
<filename>dists/woody/main/disks-powerpc/current/powermac</filename>
-directory on Debian http/ftp mirrors and official Debian CDs. Use
+directory on &debian; http/ftp mirrors and official &debian; CDs. Use
<application>Stuffit Expander</application> to extract it from its
archive. Within the package, there is an empty folder called
<filename>Linux Kernels</filename>. Download
@@ -132,7 +132,7 @@ not supported and must not be used on NewWorld PowerMacs.
</para><para>
<emphasis>Copy</emphasis> (not move) the following four files which
-you downloaded earlier from the Debian archives, onto the root level
+you downloaded earlier from the &debian; archives, onto the root level
of your hard drive (this can be accomplished by
<keycap>option</keycap>-dragging each file to the hard drive icon).
diff --git a/nl/install-methods/boot-usb-files.xml b/nl/install-methods/boot-usb-files.xml
index b7211a9e4..afffe991d 100644
--- a/nl/install-methods/boot-usb-files.xml
+++ b/nl/install-methods/boot-usb-files.xml
@@ -117,7 +117,7 @@ After that, mount the USB memory stick
which will now have
<phrase arch="x86">a FAT filesystem</phrase>
<phrase arch="powerpc">an HFS filesystem</phrase>
-on it, and copy a Debian netinst or businesscard ISO image to it.
+on it, and copy a &debian; netinst or businesscard ISO image to it.
Unmount the stick (<userinput>umount /mnt</userinput>) and you are done.
</para>
diff --git a/nl/install-methods/create-floppy.xml b/nl/install-methods/create-floppy.xml
index 19140a496..6722dcde4 100644
--- a/nl/install-methods/create-floppy.xml
+++ b/nl/install-methods/create-floppy.xml
@@ -33,7 +33,7 @@ different platforms.
</para><para>
Before you can create the floppies, you will first need to download them
-from one of the Debian mirrors, as explained in
+from one of the &debian; mirrors, as explained in
<xref linkend="downloading-files"/>. <phrase arch="i386">If you already
have an installation CD-ROM or DVD, the floppy images may also be included
on the CD/DVD.</phrase>
diff --git a/nl/install-methods/download/arm.xml b/nl/install-methods/download/arm.xml
index 1a9dd5664..d4f3650a3 100644
--- a/nl/install-methods/download/arm.xml
+++ b/nl/install-methods/download/arm.xml
@@ -32,7 +32,7 @@ obtained from &n2100-firmware-img;.
<para>
The GLAN Tank requires a kernel and ramdisk on an ext2 partition on the
-disk on which you intend to install Debian. These images can be obtained
+disk on which you intend to install &debian;. These images can be obtained
from &glantank-firmware-img;.
</para>
@@ -43,7 +43,7 @@ from &glantank-firmware-img;.
<para>
The Kurobox Pro requires a kernel and ramdisk on an ext2 partition on the
-disk on which you intend to install Debian. These images can be obtained
+disk on which you intend to install &debian;. These images can be obtained
from &kuroboxpro-firmware-img;.
</para>
diff --git a/nl/install-methods/downloading-files.xml b/nl/install-methods/downloading-files.xml
index 2e7dbbc2d..e799e7354 100644
--- a/nl/install-methods/downloading-files.xml
+++ b/nl/install-methods/downloading-files.xml
@@ -2,7 +2,7 @@
<!-- original version: 61147 untranslated -->
<sect1 id="downloading-files">
- <title>Downloading Files from Debian Mirrors</title>
+ <title>Downloading Files from &debian; Mirrors</title>
<para>
@@ -11,7 +11,7 @@ To find the nearest (and thus probably the fastest) mirror, see the
</para><para>
-When downloading files from a Debian mirror using FTP, be sure to download the
+When downloading files from a &debian; mirror using FTP, be sure to download the
files in <emphasis>binary</emphasis> mode, not text or automatic mode.
</para>
@@ -20,7 +20,7 @@ files in <emphasis>binary</emphasis> mode, not text or automatic mode.
<title>Where to Find Installation Images</title>
<para>
-The installation images are located on each Debian mirror in the directory
+The installation images are located on each &debian; mirror in the directory
<ulink url="&url-debian-installer;images">debian/dists/&releasename;/main/installer-&architecture;/current/images/</ulink>
&mdash; the <ulink url="&url-debian-installer;images/MANIFEST">MANIFEST</ulink>
lists each image and its purpose.
diff --git a/nl/install-methods/floppy/i386.xml b/nl/install-methods/floppy/i386.xml
index 3cd6b77bb..dba3753e2 100644
--- a/nl/install-methods/floppy/i386.xml
+++ b/nl/install-methods/floppy/i386.xml
@@ -28,7 +28,7 @@ diskio.dll in the same directory.
</para><para>
-These tools can be found on the Official Debian CD-ROMs under the
+These tools can be found on the Official &debian; CD-ROMs under the
<filename>/tools</filename> directory.
</para>
diff --git a/nl/install-methods/floppy/powerpc.xml b/nl/install-methods/floppy/powerpc.xml
index 9935bb48c..ffaa8ab70 100644
--- a/nl/install-methods/floppy/powerpc.xml
+++ b/nl/install-methods/floppy/powerpc.xml
@@ -31,7 +31,7 @@ floppy image with these utilities.
If you are creating the floppy image from files which were originally
on the official &debian-gnu; CD, then the Type and Creator are already set
correctly. The following <command>Creator-Changer</command> steps are
-only necessary if you downloaded the image files from a Debian mirror.
+only necessary if you downloaded the image files from a &debian; mirror.
</para>
<orderedlist>
diff --git a/nl/install-methods/install-tftp.xml b/nl/install-methods/install-tftp.xml
index a4f05e822..0717951cc 100644
--- a/nl/install-methods/install-tftp.xml
+++ b/nl/install-methods/install-tftp.xml
@@ -41,7 +41,7 @@ are unable to boot using BOOTP.
</para><para arch="hppa">
Some older HPPA machines (e.g. 715/75) use RBOOTD rather than BOOTP.
-There is an <classname>rbootd</classname> package available in Debian.
+There is an <classname>rbootd</classname> package available in &debian;.
</para><para>
@@ -94,7 +94,7 @@ configuration examples in this section accordingly.
</para></note>
<para>
-All <command>in.tftpd</command> alternatives available in Debian should
+All <command>in.tftpd</command> alternatives available in &debian; should
log TFTP requests to the system logs by default. Some of them support a
<userinput>-v</userinput> argument to increase verbosity.
It is recommended to check these log messages in case of boot problems
@@ -102,7 +102,7 @@ as they are a good starting point for diagnosing the cause of errors.
</para><para arch="mips">
-If you intend to install Debian on an SGI machine and your TFTP server is a
+If you intend to install &debian; on an SGI machine and your TFTP server is a
GNU/Linux box running Linux 2.4, you'll need to set the following on your
server:
diff --git a/nl/install-methods/official-cdrom.xml b/nl/install-methods/official-cdrom.xml
index a31fcb7dd..0965582c3 100644
--- a/nl/install-methods/official-cdrom.xml
+++ b/nl/install-methods/official-cdrom.xml
@@ -6,12 +6,12 @@
<para>
By far the easiest way to install &debian-gnu; is from an Official
-Debian CD-ROM Set. You can buy a set from a vendor (see the
+&debian; CD-ROM Set. You can buy a set from a vendor (see the
<ulink url="&url-debian-cd-vendors;">CD vendors page</ulink>).
-You may also download the CD-ROM images from a Debian mirror and make
+You may also download the CD-ROM images from a &debian; mirror and make
your own set, if you have a fast network connection and a CD burner
(see the <ulink url="&url-debian-cd;">Debian CD page</ulink> for
-detailed instructions). If you have a Debian CD set and CDs are
+detailed instructions). If you have a &debian; CD set and CDs are
bootable on your machine, you can skip right to
<xref linkend="boot-installer"/>; much effort has been expended to ensure
the files most people need are there on the CD. Although a full set of
@@ -37,7 +37,7 @@ you can use an alternative strategy such as
or manually loading the kernel from the CD to initially boot the
system installer. The files you need for booting by another means are
-also on the CD; the Debian network archive and CD folder organization
+also on the CD; the &debian; network archive and CD folder organization
are identical. So when archive file paths are given below for
particular files you need for booting, look for those files in the
same directories and subdirectories on your CD.
diff --git a/nl/install-methods/tftp/bootp.xml b/nl/install-methods/tftp/bootp.xml
index e1eb8ea15..42f52e321 100644
--- a/nl/install-methods/tftp/bootp.xml
+++ b/nl/install-methods/tftp/bootp.xml
@@ -19,7 +19,7 @@ add) the relevant line in <filename>/etc/inetd.conf</filename>. On
&debian-gnu;, you can run <userinput>update-inetd --enable
bootps</userinput>, then <userinput>/etc/init.d/inetd
reload</userinput> to do so. Just in case your BOOTP server does not
-run Debian, the line in question should look like:
+run &debian;, the line in question should look like:
<informalexample><screen>
bootps dgram udp wait root /usr/sbin/bootpd bootpd -i -t 120
diff --git a/nl/install-methods/usb-setup/powerpc.xml b/nl/install-methods/usb-setup/powerpc.xml
index 2ed205351..6eba27fb6 100644
--- a/nl/install-methods/usb-setup/powerpc.xml
+++ b/nl/install-methods/usb-setup/powerpc.xml
@@ -20,7 +20,7 @@ $ hformat /dev/<replaceable>sdX2</replaceable>
Take care that you use the correct device name for your USB stick. The
<command>hformat</command> command is contained in the
-<classname>hfsutils</classname> Debian package.
+<classname>hfsutils</classname> &debian; package.
</para><para>
@@ -111,7 +111,7 @@ may need to be increased, depending on the image you are booting.
</para><para>
If you used an <filename>hd-media</filename> image, you should now copy a
-Debian ISO image (businesscard, netinst or full CD image; be sure to select
+&debian; ISO image (businesscard, netinst or full CD image; be sure to select
one that fits) onto the stick. When you are done, unmount the USB memory
stick (<userinput>umount /mnt</userinput>).
diff --git a/nl/install-methods/usb-setup/x86.xml b/nl/install-methods/usb-setup/x86.xml
index 5694b170b..bd9ca83e0 100644
--- a/nl/install-methods/usb-setup/x86.xml
+++ b/nl/install-methods/usb-setup/x86.xml
@@ -27,7 +27,7 @@ Don't forget to set the <quote>bootable</quote> bootable flag.
Take care that you use the correct device name for your USB stick. The
<command>mkdosfs</command> command is contained in the
-<classname>dosfstools</classname> Debian package.
+<classname>dosfstools</classname> &debian; package.
</para></note><para>
@@ -101,7 +101,7 @@ For the graphical installer you should add
</para><para>
If you used an <filename>hd-media</filename> image, you should now copy a
-Debian ISO image<footnote>
+&debian; ISO image<footnote>
<para>
You can use either a businesscard, a netinst or a full CD image (see
diff --git a/nl/partitioning/partition-programs.xml b/nl/partitioning/partition-programs.xml
index e3850e538..eb3045891 100644
--- a/nl/partitioning/partition-programs.xml
+++ b/nl/partitioning/partition-programs.xml
@@ -2,10 +2,10 @@
<!-- original version: 61147 untranslated -->
<sect1 id="partition-programs">
- <title>Debian Partitioning Programs</title>
+ <title>&debian; Partitioning Programs</title>
<para>
-Several varieties of partitioning programs have been adapted by Debian
+Several varieties of partitioning programs have been adapted by &debian;
developers to work on various types of hard disks and computer
architectures. Following is a list of the program(s) applicable for
your architecture.
@@ -18,7 +18,7 @@ your architecture.
<term><command>partman</command></term>
<listitem><para>
-Recommended partitioning tool in Debian. This Swiss army knife can
+Recommended partitioning tool in &debian;. This Swiss army knife can
also resize partitions, create filesystems
<phrase arch="any-x86"> (<quote>format</quote> in Windows speak)</phrase>
and assign them to the mountpoints.
diff --git a/nl/partitioning/partition/x86.xml b/nl/partitioning/partition/x86.xml
index d0e84a611..705f244aa 100644
--- a/nl/partitioning/partition/x86.xml
+++ b/nl/partitioning/partition/x86.xml
@@ -6,8 +6,8 @@
<para>
If you have an existing other operating system such as DOS or Windows and
-you want to preserve that operating system while installing Debian, you may
-need to resize its partition to free up space for the Debian installation.
+you want to preserve that operating system while installing &debian;, you may
+need to resize its partition to free up space for the &debian; installation.
The installer supports resizing of both FAT and NTFS filesystems; when you
get to the installer's partitioning step, select the option
<guimenuitem>Manual</guimenuitem> and then simply select an existing
@@ -58,7 +58,7 @@ must be placed within the first 1024 cylinders of your hard drive
This restriction doesn't apply if you have a BIOS newer than around
1995&ndash;98 (depending on the manufacturer) that supports the <quote>Enhanced
Disk Drive Support Specification</quote>. Both Lilo, the Linux loader, and
-Debian's alternative <command>mbr</command> must use the BIOS to read the
+&debian;'s alternative <command>mbr</command> must use the BIOS to read the
kernel from the disk into RAM. If the BIOS int 0x13 large disk access
extensions are found to be present, they will be utilized. Otherwise,
the legacy disk access interface is used as a fall-back, and it cannot
diff --git a/nl/partitioning/partitioning.xml b/nl/partitioning/partitioning.xml
index 1ac85cf9b..68cd5c88f 100644
--- a/nl/partitioning/partitioning.xml
+++ b/nl/partitioning/partitioning.xml
@@ -2,7 +2,7 @@
<!-- original version: 11648 untranslated -->
<appendix id="partitioning">
-<title>Partitioning for Debian</title>
+<title>Partitioning for &debian;</title>
&sizing.xml;
&tree.xml;
diff --git a/nl/partitioning/schemes.xml b/nl/partitioning/schemes.xml
index d1d212d30..373430f3d 100644
--- a/nl/partitioning/schemes.xml
+++ b/nl/partitioning/schemes.xml
@@ -6,7 +6,7 @@
<title>Recommended Partitioning Scheme</title>
<para>
-For new users, personal Debian boxes, home systems, and other
+For new users, personal &debian; boxes, home systems, and other
single-user setups, a single <filename>/</filename> partition (plus
swap) is probably the easiest, simplest way to go. However, if your
partition is larger than around 6GB, choose ext3 as your partition
@@ -24,7 +24,7 @@ partition.
</para><para>
You might need a separate <filename>/usr/local</filename> partition if
-you plan to install many programs that are not part of the Debian
+you plan to install many programs that are not part of the &debian;
distribution. If your machine will be a mail server, you might need
to make <filename>/var/mail</filename> a separate partition. Often,
putting <filename>/tmp</filename> on its own partition, for instance
diff --git a/nl/partitioning/sizing.xml b/nl/partitioning/sizing.xml
index 665627d5c..2f4556621 100644
--- a/nl/partitioning/sizing.xml
+++ b/nl/partitioning/sizing.xml
@@ -3,7 +3,7 @@
<sect1 id="partition-sizing">
- <title>Deciding on Debian Partitions and Sizes</title>
+ <title>Deciding on &debian; Partitions and Sizes</title>
<para>
At a bare minimum, GNU/&arch-kernel; needs one partition for itself. You can
diff --git a/nl/partitioning/tree.xml b/nl/partitioning/tree.xml
index 4ccf016a0..7a4aec4bc 100644
--- a/nl/partitioning/tree.xml
+++ b/nl/partitioning/tree.xml
@@ -11,7 +11,7 @@
for directory and file naming. This standard allows users and software
programs to predict the location of files and directories. The root
level directory is represented simply by the slash
-<filename>/</filename>. At the root level, all Debian systems include
+<filename>/</filename>. At the root level, all &debian; systems include
these directories:
<informaltable>
@@ -117,7 +117,7 @@ web sites, databases, the packaging system cache, etc. will be placed
under this directory. The size of this directory depends greatly on
the usage of your system, but for most people will be dictated by
the package management tool's overhead. If you are going to do a full
-installation of just about everything Debian has to offer, all in one
+installation of just about everything &debian; has to offer, all in one
session, setting aside 2 or 3 GB of space for
<filename>/var</filename> should be sufficient. If you are going to
install in pieces (that is to say, install services and utilities,
diff --git a/nl/post-install/further-reading.xml b/nl/post-install/further-reading.xml
index 8d9d09545..357e3dd7e 100644
--- a/nl/post-install/further-reading.xml
+++ b/nl/post-install/further-reading.xml
@@ -16,7 +16,7 @@ There is lots of useful documentation in
<filename>/usr/share/doc/FAQ</filename> contain lots of interesting
information. To submit bugs, look at
<filename>/usr/share/doc/debian/bug*</filename>. To read about
-Debian-specific issues for particular programs, look at
+&debian;-specific issues for particular programs, look at
<filename>/usr/share/doc/(package name)/README.Debian</filename>.
</para><para>
diff --git a/nl/post-install/kernel-baking.xml b/nl/post-install/kernel-baking.xml
index 23b1e7e71..5420f102c 100644
--- a/nl/post-install/kernel-baking.xml
+++ b/nl/post-install/kernel-baking.xml
@@ -5,8 +5,8 @@
<para>
Why would someone want to compile a new kernel? It is often not
-necessary since the default kernel shipped with Debian handles most
-configurations. Also, Debian often offers several alternative kernels.
+necessary since the default kernel shipped with &debian; handles most
+configurations. Also, &debian; often offers several alternative kernels.
So you may want to check first if there is an alternative kernel image
package that better corresponds to your hardware. However, it can be
useful to compile a new kernel in order to:
@@ -55,7 +55,7 @@ Don't be afraid to try compiling the kernel. It's fun and profitable.
</para><para>
-To compile a kernel the Debian way, you need some packages:
+To compile a kernel the &debian; way, you need some packages:
<classname>fakeroot</classname>, <classname>kernel-package</classname>,
<classname>linux-source-2.6</classname>
and a few others which are probably already installed (see
@@ -119,7 +119,7 @@ on) you are unsure about. Be careful: other options, not related to a
specific hardware, should be left at the default value if you do not
understand them. Do not forget to select <quote>Kernel module loader</quote>
in <quote>Loadable module support</quote> (it is not selected by default).
-If not included, your Debian installation will experience problems.
+If not included, your &debian; installation will experience problems.
</para><para>
@@ -163,7 +163,7 @@ above step may have produced, then <userinput>shutdown -r now</userinput>.
</para><para>
-For more information on Debian kernels and kernel compilation, see the
+For more information on &debian; kernels and kernel compilation, see the
<ulink url="&url-kernel-handbook;">Debian Linux Kernel Handbook</ulink>.
For more information on <classname>kernel-package</classname>, read
the fine documentation in <filename>/usr/share/doc/kernel-package</filename>.
diff --git a/nl/post-install/mail-setup.xml b/nl/post-install/mail-setup.xml
index e3bd7b749..103d06059 100644
--- a/nl/post-install/mail-setup.xml
+++ b/nl/post-install/mail-setup.xml
@@ -7,7 +7,7 @@
Today, email is an important part of many people's life. As there are
many options as to how to set it up, and as having it set up correctly is
-important for some Debian utilities, we will try to cover the basics in
+important for some &debian; utilities, we will try to cover the basics in
this section.
</para><para>
@@ -38,11 +38,11 @@ often used in combination with <command>exim</command> or
With the increasing popularity of graphical desktop systems, the use of
graphical e-mail programs like GNOME's <command>evolution</command>,
KDE's <command>kmail</command> or Mozilla's <command>thunderbird</command>
-(in Debian available as <command>icedove</command><footnote>
+(in &debian; available as <command>icedove</command><footnote>
<para>
The reason that <command>thunderbird</command> has been renamed to
-<command>icedove</command> in Debian has to do with licensing issues.
+<command>icedove</command> in &debian; has to do with licensing issues.
Details are outside the scope of this manual.
</para>
@@ -101,7 +101,7 @@ The e-mails can be read using <command>mutt</command>.
<title>Sending E-Mails Outside The System</title>
<para>
-As mentioned earlier, the installed Debian system is only set up to handle
+As mentioned earlier, the installed &debian; system is only set up to handle
e-mail local to the system, not for sending mail to others nor for
receiving mail from others.
@@ -124,7 +124,7 @@ this manual).
However, in that case you may need to configure individual utilities to
correctly send e-mails. One such utility is <command>reportbug</command>,
-a program that facilitates submitting bug reports against Debian packages.
+a program that facilitates submitting bug reports against &debian; packages.
By default it expects to be able to use <classname>exim4</classname> to
submit bug reports.
diff --git a/nl/post-install/new-to-unix.xml b/nl/post-install/new-to-unix.xml
index f04ab8cda..e235f3757 100644
--- a/nl/post-install/new-to-unix.xml
+++ b/nl/post-install/new-to-unix.xml
@@ -21,7 +21,7 @@ relating to Linux. Most of these documents can be installed locally;
just install the <classname>doc-linux-html</classname> package (HTML
versions) or the <classname>doc-linux-text</classname> package (ASCII
versions), then look in <filename>/usr/share/doc/HOWTO</filename>.
-International versions of the LDP HOWTOs are also available as Debian
+International versions of the LDP HOWTOs are also available as &debian;
packages.
</para>
diff --git a/nl/post-install/orientation.xml b/nl/post-install/orientation.xml
index c463562f6..50283724b 100644
--- a/nl/post-install/orientation.xml
+++ b/nl/post-install/orientation.xml
@@ -2,22 +2,22 @@
<!-- original version: 43576 untranslated -->
- <sect1 id="debian-orientation"><title>Orienting Yourself to Debian</title>
+ <sect1 id="debian-orientation"><title>Orienting Yourself to &debian;</title>
<para>
-Debian is a little different from other distributions. Even if you're
+&debian; is a little different from other distributions. Even if you're
familiar with Linux in other distributions, there are things you
-should know about Debian to help you to keep your system in a good,
+should know about &debian; to help you to keep your system in a good,
clean state. This chapter contains material to help you get oriented;
-it is not intended to be a tutorial for how to use Debian, but just a
+it is not intended to be a tutorial for how to use &debian;, but just a
very brief glimpse of the system for the very rushed.
</para>
- <sect2><title>Debian Packaging System</title>
+ <sect2><title>&debian; Packaging System</title>
<para>
-The most important concept to grasp is the Debian packaging system.
+The most important concept to grasp is the &debian; packaging system.
In essence, large parts of your system should be considered under the
control of the packaging system. These include:
diff --git a/nl/preface.xml b/nl/preface.xml
index 2b476194c..bcd7d5d52 100644
--- a/nl/preface.xml
+++ b/nl/preface.xml
@@ -4,16 +4,16 @@
<title>&debian-gnu; &release; installeren op &architecture;</title>
<para>
-Wij zijn verheugd dat u heeft besloten om Debian te proberen en weten
-zeker dat u zult ontdekken dat de GNU/&arch-kernel; distributie van Debian uniek
+Wij zijn verheugd dat u heeft besloten om &debian; te proberen en weten
+zeker dat u zult ontdekken dat de GNU/&arch-kernel; distributie van &debian; uniek
is. &debian-gnu; 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.
</para><para>
-Wij begrijpen dat velen onder u Debian zal willen installeren zonder deze
-handleiding te lezen en het Debian installatiesysteem is ontworpen om dit
+Wij begrijpen dat velen onder u &debian; zal willen installeren zonder deze
+handleiding te lezen en het &debian; installatiesysteem is ontworpen om dit
mogelijk te maken. Als u op dit moment geen gelegenheid heeft om de gehele
installatiehandleiding door te nemen, adviseren wij om tenminste de "Installatie
Howto" te lezen, die u meeneemt door het basis installatie proces en verwijzingen
diff --git a/nl/preparing/bios-setup/i386.xml b/nl/preparing/bios-setup/i386.xml
index 8e312ff49..29765d25f 100644
--- a/nl/preparing/bios-setup/i386.xml
+++ b/nl/preparing/bios-setup/i386.xml
@@ -16,7 +16,7 @@ your operating system to access your hardware. Your system probably
provides a BIOS setup menu, which is used to configure the BIOS.
Before installing, you <emphasis>must</emphasis> ensure that your BIOS
is set up correctly; not doing so can lead to intermittent crashes or
-an inability to install Debian.
+an inability to install &debian;.
</para><para>
@@ -118,7 +118,7 @@ then optionally the first CD-ROM device (possibly appearing as
<filename>D:</filename> or <filename>E:</filename>), and then from
<filename>C:</filename> (the first hard disk). This setting enables
you to boot from either a floppy disk or a CD-ROM, which are the two
-most common boot devices used to install Debian.
+most common boot devices used to install &debian;.
</para><para>
diff --git a/nl/preparing/bios-setup/s390.xml b/nl/preparing/bios-setup/s390.xml
index 4cc723e7f..1538023f9 100644
--- a/nl/preparing/bios-setup/s390.xml
+++ b/nl/preparing/bios-setup/s390.xml
@@ -32,11 +32,11 @@ design and preparation steps. IBM has made documentation available
about the whole process, e.g. how to prepare an installation medium
and how actually to boot from that medium. Duplicating that information
here is neither possible nor necessary. However, we will describe
-here which kind of Debian-specific data is needed and where to find it.
+here which kind of &debian;-specific data is needed and where to find it.
Using both sources of information, you have to prepare your machine
and the installation medium before you can perform a boot from it.
When you see the welcome message in your client session, return to this
-document to go through the Debian-specific installation steps.
+document to go through the &debian;-specific installation steps.
</para>
</sect2>
diff --git a/nl/preparing/install-overview.xml b/nl/preparing/install-overview.xml
index 1e48517b2..bb23295a4 100644
--- a/nl/preparing/install-overview.xml
+++ b/nl/preparing/install-overview.xml
@@ -4,7 +4,7 @@
<title>Overzicht van het installatieproces</title>
<para>
-Allereerst een opmerking over herinstallaties. Bij Debian zal zich
+Allereerst een opmerking over herinstallaties. Bij &debian; zal zich
slechts zeer zelden een omstandigheid voordoen die een volledige
herinstallatie noodzakelijk maakt; waarschijnlijk is een storing in de
harde schijf nog de meest voorkomende situatie.
@@ -26,7 +26,7 @@ een complete installatie nodig zijn: het is altijd mogelijk om het bestaande
systeem op te waarderen. En de programma's zijn vrijwel altijd compatibel
met opeenvolgende releases van het besturingssysteem. Als een nieuwe versie
van een programma ook nieuwe ondersteunende software vereist, zorgt de manier
-waarop Debian pakketten maakt ervoor dat alle software die benodigd is,
+waarop &debian; pakketten maakt ervoor dat alle software die benodigd is,
automatisch wordt geïdentificeerd en geïnstalleerd. Omdat zoveel aandacht
is besteed aan het voorkomen van de noodzaak om opnieuw te installeeren,
zou u dat als uw allerlaatste redmiddel moeten beschouwen. Het installatiesysteem
@@ -45,7 +45,7 @@ installatieproces.
<listitem><para>
Maak een reservekopie van bestaande gegevens en documenten op de harde schijf
-waarop u van plan bent Debian te installeren.
+waarop u van plan bent &debian; te installeren.
</para></listitem>
<listitem><para>
@@ -56,7 +56,7 @@ met de installatie begint.
</para></listitem>
<listitem><para>
-Maak op uw harde schijf ruimte vrij waarin door Debian partities kunnen worden
+Maak op uw harde schijf ruimte vrij waarin door &debian; partities kunnen worden
aangemaakt.
</para></listitem>
@@ -64,13 +64,13 @@ aangemaakt.
Pak of download de installatiesoftware en eventueel bestanden met specifieke
stuurbestanden die voor uw machine nodig zijn (dit geldt niet voor gebruikers
-van de Debian Installatie CD).
+van de &debian; Installatie CD).
</para></listitem>
<listitem><para>
Prepareer magneetbanden/diskettes/USB-sticks voor het opstarten van uw systeem
-of plaats opstartbestanden (de meeste gebruikers van Debian Installatie CDs
+of plaats opstartbestanden (de meeste gebruikers van &debian; Installatie CDs
kunnen opstarten vanaf één van de CDs).
<!-- FJP Wat wordt bedoeld met 'place boot files'? Bug in origineel. //-->
@@ -109,7 +109,7 @@ Maak verbinding met één of meerdere DASDs (Direct Access Storage Device).
<listitem><para>
-Maak en mount de partities waarop Debian zal worden geïnstalleerd.
+Maak en mount de partities waarop &debian; zal worden geïnstalleerd.
</para></listitem>
<listitem><para>
diff --git a/nl/preparing/minimum-hardware-reqts.xml b/nl/preparing/minimum-hardware-reqts.xml
index 00d450f98..1f4fe227b 100644
--- a/nl/preparing/minimum-hardware-reqts.xml
+++ b/nl/preparing/minimum-hardware-reqts.xml
@@ -56,7 +56,7 @@ desktop systeem.
De eigenlijke minimum vereisten voor beschikbaar geheugen zijn een stuk
kleiner dan de getallen in deze tabel. Afhankelijk van de architectuur
-kan Debian worden geïnstalleerd met slechts 20MB (voor s390) tot 48MB
+kan &debian; worden geïnstalleerd met slechts 20MB (voor s390) tot 48MB
(voor i386 en amd64). Hetzelfde geldt, zeker als u selectief bent in welke
applicaties u installeert, voor de harde schijf capaciteit. Zie
<xref linkend="tasksel-size-list"/> voor aanvullende informatie over
@@ -90,7 +90,7 @@ gegevens royaal in te schatten.
De schijfruimte nodig voor een soepele werking van het &debian-gnu; systeem
zelf is reeds in deze aanbevelingen verwerkt.
De partitie <filename>/var</filename> in het
-bijzonder bevat veel Debian-specifieke statusinformatie naast de reguliere
+bijzonder bevat veel &debian;-specifieke statusinformatie naast de reguliere
inhoud, zoals logbestanden. De bestanden van <command>dpkg</command> (met
informatie over alle geïnstalleerde pakketten) kan makkelijk 40MB gebruiken.
Verder worden hier door <command>apt-get</command> pakketten die gedownload
diff --git a/nl/preparing/needed-info.xml b/nl/preparing/needed-info.xml
index bbcc4215a..b4d2236f4 100644
--- a/nl/preparing/needed-info.xml
+++ b/nl/preparing/needed-info.xml
@@ -23,7 +23,7 @@ of in HTML- of PDF-formaat.
<para condition="for_wdo">
Het document dat u nu aan het lezen bent. Dit is de officiële versie van
-de installatiehandleiding voor release &releasename; van Debian en is
+de installatiehandleiding voor release &releasename; van &debian; en is
beschikbaar in <ulink url="&url-release-area;/installmanual">diverse
bestandsformaten en vertalingen</ulink>.
@@ -32,7 +32,7 @@ bestandsformaten en vertalingen</ulink>.
<para condition="for_alioth">
Het document dat u nu aan het lezen bent. Dit is de ontwikkelingsversie van
-de installatiehandleiding voor de volgende release van Debian en is
+de installatiehandleiding voor de volgende release van &debian; en is
beschikbaar in <ulink url="&url-d-i-alioth-manual;">diverse
bestandsformaten en vertalingen</ulink>.
diff --git a/nl/preparing/non-debian-partitioning.xml b/nl/preparing/non-debian-partitioning.xml
index 62a97da51..b4b0f19c3 100644
--- a/nl/preparing/non-debian-partitioning.xml
+++ b/nl/preparing/non-debian-partitioning.xml
@@ -28,12 +28,12 @@ Als er al een besturingssysteem op uw systeem aanwezig is
(VM, z/OS, OS/390, &hellip;)
</phrase>
-en u wilt Debian op dezelfde harde schijf installeren, dan zult u de schijf
-moeten herindelen. Debian vereist eigen partities op de harde schijf.
+en u wilt &debian; op dezelfde harde schijf installeren, dan zult u de schijf
+moeten herindelen. &debian; vereist eigen partities op de harde schijf.
Het kan niet worden geïnstalleerd op Windows- of MacOS-partities. Sommige
partities zouden kunnen worden gedeeld met andere Unix systemen, maar dit
valt buiten de scope van deze handleiding. U zult tenminste een afzonderlijke
-partitie nodig hebben voor het root-bestandssysteem van Debian.
+partitie nodig hebben voor het root-bestandssysteem van &debian;.
</para><para>
@@ -61,7 +61,7 @@ sluiten.
</para><para>
Als uw computer over meer dan één harde schijf beschikt, zou u één daarvan
-volledig kunnen reserveren voor Debian. Als dat het geval is, hoeft u deze
+volledig kunnen reserveren voor &debian;. Als dat het geval is, hoeft u deze
harde schijf niet in te delen voordat u het installatiesysteem opstart; het
schijfindelingsprogramma van het installatiesysteem kan dit zonder problemen
verzorgen.
@@ -88,7 +88,7 @@ van het systeem.
Als op uw machine reeds meerdere partities aanwezig zijn en er kan voldoende
ruimte worden vrijgemaakt door één of meerdere daarvan te verwijderen en
vervangen, dan kunt u eveneens gebruik maken van het schijfindelingsprogramma
-van het Debian installatiesysteem. U wordt echter aangeraden om toch de
+van het &debian; installatiesysteem. U wordt echter aangeraden om toch de
informatie hieronder door te lezen omdat er bijzondere omstandigheden kunnen
zijn &mdash; zoals de volgorde van bestaande partities in de partitie-index
&mdash; waardoor u alsnog wordt gedwongen om te herindelen vóór de installatie.
@@ -96,13 +96,13 @@ zijn &mdash; zoals de volgorde van bestaande partities in de partitie-index
</para><para arch="any-x86">
Als uw machine een FAT of NTFS bestandssysteem heeft, zoals wordt gebruikt door
-DOS en Windows, kunt u wachten en het schijfindelingsprogramma van het Debian
+DOS en Windows, kunt u wachten en het schijfindelingsprogramma van het &debian;
installatiesysteem gebruiken om de grootte van het bestandssysteem te wijzigen.
</para><para>
Als geen van bovenstaande situaties van toepassing is, zult u, om ruimte te
-creëren voor Debian-partities, uw harde schijf moeten herindelen voordat u met
+creëren voor &debian;-partities, uw harde schijf moeten herindelen voordat u met
de installatie begint. Als sommige van de partities bestemd zijn voor andere
besturingssystemen, zou u deze moeten creëren met behulp van de eigen
schijfindelingsprogrammatuur van die besturingssystemen. Wij adviseren u
@@ -114,8 +114,8 @@ de partities die u wilt behouden voor het oorspronkelijke besturingssysteem.
Als u meerdere besturingssystemen op dezelfde machine wilt installeren, wordt
aangeraden om eerst alle andere systemen te installeren voordat u verder gaat
-met de installatie van Debian. Windows en andere besturingssystemen kunnen de
-mogelijkheid om Debian op te starten verstoren, of kunnen u aanmoedigen om
+met de installatie van &debian;. Windows en andere besturingssystemen kunnen de
+mogelijkheid om &debian; op te starten verstoren, of kunnen u aanmoedigen om
'vreemde' partities opnieuw te fomateren.
</para><para>
@@ -140,7 +140,7 @@ eigenlijke installatie, verwijderen en vervangen door de &arch-parttype; partiti
Als u op dit moment beschikt over een harde schijf met één partitie (een
gebruikelijke situatie voor desktop systemen) en u wilt kunnen opstarten met
-zowel het huidige besturingssysteem als met Debian, dan zult u de volgende
+zowel het huidige besturingssysteem als met &debian;, dan zult u de volgende
stappen moeten doorlopen.
<orderedlist>
@@ -173,15 +173,15 @@ Installeer het oorspronkelijke besturingssysteem op haar nieuwe partitie.
<listitem><para>
Start het oorspronkelijke besturingssysteem opnieuw om te controleren dat
-alles in orde is en om de opstartbestanden van Debian te downloaden.
+alles in orde is en om de opstartbestanden van &debian; te downloaden.
<!-- FJP: Waarom nu opeens downloaden? Is helemaal geen onderdeel van dit traject!
Het lijkt me logischer om eerst een restore te doen. //-->
</para></listitem>
<listitem><para>
-Start het Debian installatiesysteem op om te vervolgen met de installatie
-van Debian.
+Start het &debian; installatiesysteem op om te vervolgen met de installatie
+van &debian;.
</para></listitem>
</orderedlist>
diff --git a/nl/preparing/nondeb-part/sparc.xml b/nl/preparing/nondeb-part/sparc.xml
index fe81e7291..174fb26f2 100644
--- a/nl/preparing/nondeb-part/sparc.xml
+++ b/nl/preparing/nondeb-part/sparc.xml
@@ -7,8 +7,8 @@
<para>
It's perfectly fine to partition from SunOS; in fact, if you intend to
-run both SunOS and Debian on the same machine, it is recommended that
-you partition using SunOS prior to installing Debian. The Linux
+run both SunOS and &debian; on the same machine, it is recommended that
+you partition using SunOS prior to installing &debian;. The Linux
kernel understands Sun disk labels, so there are no problems there.
SILO supports booting Linux and SunOS from any of EXT2 (Linux), UFS
(SunOS), romfs or iso9660 (CDROM) partitions.
diff --git a/nl/preparing/nondeb-part/x86.xml b/nl/preparing/nondeb-part/x86.xml
index dfeeaf431..c31bc203c 100644
--- a/nl/preparing/nondeb-part/x86.xml
+++ b/nl/preparing/nondeb-part/x86.xml
@@ -8,7 +8,7 @@
If you are manipulating existing FAT or NTFS partitions, it is
recommended that you either use the scheme below or native Windows or
DOS tools. Otherwise, it is not really necessary to partition from DOS
-or Windows; the Debian partitioning tools will generally do a better
+or Windows; the &debian; partitioning tools will generally do a better
job.
</para><para>
@@ -16,7 +16,7 @@ job.
But if you have a large IDE disk, and are not using LBA addressing,
overlay drivers (sometimes provided by hard disk manufacturers), or a
new (post 1998) BIOS that supports large disk access extensions, then
-you must locate your Debian boot partition carefully. In this case,
+you must locate your &debian; boot partition carefully. In this case,
you will have to put the boot partition into the first 1024 cylinders
of your hard disk (usually around 524 megabytes, without BIOS
translation). This may require that you move an existing FAT or NTFS
@@ -32,7 +32,7 @@ partition.
One of the most common installations is onto a system that already
contains DOS (including Windows 3.1), Win32 (such as Windows 95, 98, Me,
-NT, 2000, XP), or OS/2, and it is desired to put Debian onto the same disk
+NT, 2000, XP), or OS/2, and it is desired to put &debian; onto the same disk
without destroying the previous system. Note that the installer supports
resizing of FAT and NTFS filesystems as used by DOS and Windows. Simply
start the installer and when you get to the partitioning step, select the
@@ -45,8 +45,8 @@ So in most cases you should not need to use the method described below.
Before going any further, you should have decided how you will be
dividing up the disk. The method in this section will only split a
partition into two pieces. One will contain the original OS and the
-other will be used for Debian. During the installation of Debian, you
-will be given the opportunity to use the Debian portion of the disk as you
+other will be used for &debian;. During the installation of &debian;, you
+will be given the opportunity to use the &debian; portion of the disk as you
see fit, i.e., as swap or as a file system.
</para><para>
@@ -61,7 +61,7 @@ amount of space you can take from the partition.
</para><para>
The first thing needed is a copy of <command>fips</command> which is
-available in the <filename>tools/</filename> directory on your nearest Debian
+available in the <filename>tools/</filename> directory on your nearest &debian;
mirror. Unzip the archive and copy the files
<filename>RESTORRB.EXE</filename>, <filename>FIPS.EXE</filename> and
<filename>ERRORS.TXT</filename> to a bootable floppy. A bootable floppy can
@@ -100,7 +100,7 @@ case <command>fips</command> doesn't do the trick for you.
<para>
If you are partitioning for DOS drives, or changing the size of DOS
-partitions, using Debian tools, many people experience problems working
+partitions, using &debian; tools, many people experience problems working
with the resulting FAT partitions. For instance, some have reported
slow performance, consistent problems with <command>scandisk</command>, or
other weird errors in DOS or Windows.
@@ -110,7 +110,7 @@ other weird errors in DOS or Windows.
Apparently, whenever you create or resize a partition for DOS use,
it's a good idea to fill the first few sectors with zeros. You should do
this prior to running DOS's <command>format</command> command by executing
-the following command from Debian:
+the following command from &debian;:
<informalexample><screen>
# dd if=/dev/zero of=/dev/hdXX bs=512 count=4
diff --git a/nl/preparing/pre-install-bios-setup.xml b/nl/preparing/pre-install-bios-setup.xml
index 5500dcadc..396d58f5a 100644
--- a/nl/preparing/pre-install-bios-setup.xml
+++ b/nl/preparing/pre-install-bios-setup.xml
@@ -5,7 +5,7 @@
<para>
In deze sectie wordt ingegaan op eventuele hardwareconfiguratie die u moet
-uitvoeren voordat u Debian installeert. In het algemeen betreft dit controle
+uitvoeren voordat u &debian; installeert. In het algemeen betreft dit controle
en mogelijk aanpassing van 'firmware'-instellingen voor uw systeem. De
firmware is de basisprogrammatuur die door de apparatuur wordt gebruikt;
het meest kritieke moment waarop deze wordt gebruikt is tijdens het opstarten
diff --git a/nl/preparing/preparing.xml b/nl/preparing/preparing.xml
index b31ce7573..f5518f5b1 100644
--- a/nl/preparing/preparing.xml
+++ b/nl/preparing/preparing.xml
@@ -5,7 +5,7 @@
<para>
-Dit hoofdstuk behandelt de voorbereiding op de installatie van Debian zelfs
+Dit hoofdstuk behandelt de voorbereiding op de installatie van &debian; zelfs
voordat u het installatieprogramma start. Dit omvat het maken van een reservekopie
van uw gegevens, het verzamelen van gegevens over uw hardware en het bijeenzoeken
van eventueel benodigde informatie.
diff --git a/nl/using-d-i/components.xml b/nl/using-d-i/components.xml
index 246b5711c..659b9c949 100644
--- a/nl/using-d-i/components.xml
+++ b/nl/using-d-i/components.xml
@@ -18,7 +18,7 @@ gekozen installatiemethode en van uw apparatuur.
<title>Instelling van het installatiesysteem en hardware configuratie</title>
<para>
-Laten we er vanuit gaan dat uw systeem met het Debian installatiesysteem is
+Laten we er vanuit gaan dat uw systeem met het &debian; installatiesysteem is
opgestart en dat u het eerste scherm voor u heeft. Op dat moment is de
functionaliteit van &d-i; nog vrij beperkt. Het weet nog niet veel over uw
apparatuur, welke taal u prefereert en zelfs de taken die het moet uitvoeren.
@@ -164,7 +164,7 @@ linkend="boot-dev-select-sun"/>.</phrase>
<title>De installatie afronden</title>
<para>
-Dit is de laatste stap van het installatieproces voor Debian waarbij het
+Dit is de laatste stap van het installatieproces voor &debian; waarbij het
installatiesysteem nog enkele afrondende taken uitvoert.
Het bestaat voornamelijk uit het afwerken van losse eindjes van &d-i;.
diff --git a/nl/using-d-i/modules/finish-install.xml b/nl/using-d-i/modules/finish-install.xml
index 39af8c00d..9bc3190e3 100644
--- a/nl/using-d-i/modules/finish-install.xml
+++ b/nl/using-d-i/modules/finish-install.xml
@@ -7,7 +7,7 @@
U zal worden gevraagd om het installatiemedium (CD, diskette, enz.)
dat u heeft gebruikt om het installatiesysteem op te starten, te verwijderen.
-Vervolgens zal uw systeem opnieuw opstarten met uw nieuwe Debian systeem.
+Vervolgens zal uw systeem opnieuw opstarten met uw nieuwe &debian; systeem.
</para><para arch="s390">
diff --git a/nl/using-d-i/modules/ia64/elilo-installer.xml b/nl/using-d-i/modules/ia64/elilo-installer.xml
index 3900ce064..0c8088cb8 100644
--- a/nl/using-d-i/modules/ia64/elilo-installer.xml
+++ b/nl/using-d-i/modules/ia64/elilo-installer.xml
@@ -88,7 +88,7 @@ the filenames re-written to refer to files in the EFI partition.
This is the boot loader program that the <quote>EFI Boot Manager</quote>
runs to boot the system.
-It is the program behind the <guimenuitem>Debian GNU/Linux</guimenuitem>
+It is the program behind the <guimenuitem>&debian; GNU/Linux</guimenuitem>
menu item of the <quote>EFI Boot Manager</quote> command menu.
</para></listitem></varlistentry>
@@ -100,7 +100,7 @@ menu item of the <quote>EFI Boot Manager</quote> command menu.
This is the initial root filesystem used to boot the kernel.
It is a copy of the file referenced in the
<filename>/etc/elilo.conf</filename>.
-In a standard Debian installation it would be the file in
+In a standard &debian; installation it would be the file in
<filename>/boot</filename> pointed to by the symbolic link
<filename>/initrd.img</filename>.
@@ -124,7 +124,7 @@ any local changes would be lost at the next time
This is the compressed kernel itself.
It is a copy of the file referenced in the
<filename>/etc/elilo.conf</filename>.
-In a standard Debian installation it would be the file in
+In a standard &debian; installation it would be the file in
<filename>/boot</filename> pointed to by the symbolic link
<filename>/vmlinuz</filename>.
diff --git a/nl/using-d-i/modules/iso-scan.xml b/nl/using-d-i/modules/iso-scan.xml
index bce973905..47e3b193f 100644
--- a/nl/using-d-i/modules/iso-scan.xml
+++ b/nl/using-d-i/modules/iso-scan.xml
@@ -5,7 +5,7 @@
<para>
Als u de <emphasis>hd-media</emphasis> installatiemethode gebruikt, komt
-er een moment waarop u de ISO-image met het Debian Installatiesysteem
+er een moment waarop u de ISO-image met het &debian; Installatiesysteem
zult moeten localiseren en koppelen om het restant van de
installatiebestanden te laden. Dit is de taak van de module
<command>iso-scan</command>.
@@ -23,7 +23,7 @@ bijvoorbeeld <filename>/data/<replaceable>willekeurig</replaceable>.iso</filenam
gevonden zullen worden, maar niet bijvoorbeeld
<filename>/data/tmp/<replaceable>willekeurig</replaceable>.iso</filename>).
Nadat een ISO-image is gevonden, controleert <command>iso-scan</command> of
-het een geldig Debian ISO-installatie-image betreft of niet. In het eerste
+het een geldig &debian; ISO-installatie-image betreft of niet. In het eerste
geval zijn we klaar, in het tweede geval wordt verder gezocht.
</para><para>
diff --git a/nl/using-d-i/modules/localechooser.xml b/nl/using-d-i/modules/localechooser.xml
index 6b3f2f35b..fa1a7737d 100644
--- a/nl/using-d-i/modules/localechooser.xml
+++ b/nl/using-d-i/modules/localechooser.xml
@@ -21,7 +21,7 @@ beschikbaar is, zal het installatiesysteem terugvallen op Engels.
</para><para>
Het geselecteerde land zal later in het installatieproces worden gebruikt
-bij de selectie van uw tijdzone en een voor uw locatie geschikte Debian
+bij de selectie van uw tijdzone en een voor uw locatie geschikte &debian;
spiegelserver. Taal en land tezamen zullen worden gebruikt om de standaard
<quote>locale</quote> voor uw systeem in te stellen en om u te helpen bij
de selectie van uw toetsenboord.
diff --git a/nl/using-d-i/modules/os-prober.xml b/nl/using-d-i/modules/os-prober.xml
index 1476243d5..b51f8a16d 100644
--- a/nl/using-d-i/modules/os-prober.xml
+++ b/nl/using-d-i/modules/os-prober.xml
@@ -9,7 +9,7 @@ Voordat een opstartlader wordt geïnstalleerd, zal het installatiesysteem
eerst proberen om te ontdekken of er andere besturingsystemen op de machine
aanwezig zijn. Als het een besturingssysteem heeft gevonden dat wordt
ondersteund, zult u hierover worden geïnformeerd tijdens de installatie van
-de opstartlader en zal de computer geconfigureerd worden om naast Debian ook
+de opstartlader en zal de computer geconfigureerd worden om naast &debian; ook
dit andere besturingsysteem te kunnen opstarten.
</para><para>
diff --git a/nl/using-d-i/modules/partman.xml b/nl/using-d-i/modules/partman.xml
index 66765691b..76389e9ed 100644
--- a/nl/using-d-i/modules/partman.xml
+++ b/nl/using-d-i/modules/partman.xml
@@ -162,7 +162,7 @@ te wijzigen zoals hieronder beschreven voor handmatige schijfindeling.
Als u kiest voor handmatige schijfindeling, zal een vergelijkbaar scherm
worden getoond als hiervoor weergegeven, maar dan met uw bestaande
partitie-indeling en nog zonder aanhechtpunten. Hoe u de schijfindeling
-en het gebruik van partities voor uw nieuwe Debian systeem handmatig kunt
+en het gebruik van partities voor uw nieuwe &debian; systeem handmatig kunt
instellen, wordt hieronder behandeld.
</para><para>
diff --git a/nl/using-d-i/modules/save-logs.xml b/nl/using-d-i/modules/save-logs.xml
index 2d5d51cb5..7c0c1fe1a 100644
--- a/nl/using-d-i/modules/save-logs.xml
+++ b/nl/using-d-i/modules/save-logs.xml
@@ -8,7 +8,7 @@
Als de installatie succesvol is, worden de logbestanden die tijdens
het installatieproces zijn aangemaakt, automatisch opgeslagen in de
map <filename>/var/log/debian-installer/</filename> op uw nieuwe
-Debian systeem.
+&debian; systeem.
</para><para>
diff --git a/nl/using-d-i/modules/x86/lilo-installer.xml b/nl/using-d-i/modules/x86/lilo-installer.xml
index 679221536..89cc7f37e 100644
--- a/nl/using-d-i/modules/x86/lilo-installer.xml
+++ b/nl/using-d-i/modules/x86/lilo-installer.xml
@@ -36,11 +36,11 @@ boot process.
</para></listitem></varlistentry>
<varlistentry>
-<term>new Debian partition</term><listitem><para>
+<term>new &debian; partition</term><listitem><para>
Choose this if you want to use another boot
manager. <command>LILO</command> will install itself at the beginning
-of the new Debian partition and it will serve as a secondary boot
+of the new &debian; partition and it will serve as a secondary boot
loader.
</para></listitem></varlistentry>
@@ -61,7 +61,7 @@ If you can no longer boot into Windows 9x (or DOS) after this step,
you'll need to use a Windows 9x (MS-DOS) boot disk and use the
<userinput>fdisk /mbr</userinput> command to reinstall the MS-DOS
master boot record &mdash; however, this means that you'll need to use
-some other way to get back into Debian!
+some other way to get back into &debian;!
</para>
</sect3>
diff --git a/nl/using-d-i/using-d-i.xml b/nl/using-d-i/using-d-i.xml
index 554b7e923..388155858 100644
--- a/nl/using-d-i/using-d-i.xml
+++ b/nl/using-d-i/using-d-i.xml
@@ -1,11 +1,11 @@
<!-- original version: 56428 -->
- <chapter id="d-i-intro"><title>Het Debian installatiesysteem gebruiken</title>
+ <chapter id="d-i-intro"><title>Het &debian; installatiesysteem gebruiken</title>
<sect1><title>Hoe het installatiesysteem werkt</title>
<para>
-Het Debian installatiesysteem bestaat uit een aantal modules die
+Het &debian; installatiesysteem bestaat uit een aantal modules die
zijn ontwikkeld om een specifieke taak uit te voeren tijdens de installatie.
Elke module voert zijn taak uit, waarbij vragen kunnen worden gesteld
aan de gebruiker als dat voor die taak nodig is. Aan de vragen zelf is
@@ -186,7 +186,7 @@ netwerkkaarten, harde schijven en PCMCIA.
<term>cdrom-detect</term><listitem><para>
-Zoekt naar en koppelt een Debian installatie-CD.
+Zoekt naar en koppelt een &debian; installatie-CD.
</para></listitem>
</varlistentry>
@@ -211,8 +211,8 @@ Zoekt op harde schijven naar ISO-images (<filename>.iso</filename> bestanden).
<term>choose-mirror</term><listitem><para>
-Deze module toont een overzicht van spiegelservers met het Debian Archief.
-De gebruiker kan hiermee de bron voor de installatie van Debian pakketten kiezen.
+Deze module toont een overzicht van spiegelservers met het &debian; Archief.
+De gebruiker kan hiermee de bron voor de installatie van &debian; pakketten kiezen.
</para></listitem>
</varlistentry>
@@ -271,7 +271,7 @@ De module 'partman' (partitie-manager) stelt de gebruiker in staat om
harde schijven die met het systeem verbonden zijn, in te delen, bestandssystemen
te creëren op geselecteerde partities en deze aan te sluiten op koppelpunten.
Daarnaast kent 'partman' interessante functies als het volledig geautomatiseerd
-indelen van een harde schijf en ondersteuning van LVM. Voor Debian geniet 'partman'
+indelen van een harde schijf en ondersteuning van LVM. Voor &debian; geniet 'partman'
de voorkeur als hulpmiddel voor het indelen van harde schijven.
<!-- FJP Ook op andere media dan harde schijven (b.v. USB memory sticks)? //-->
@@ -403,7 +403,7 @@ Stelt de gebruiker in staat om, wanneer problemen worden tegengekomen,
informatie op een diskette, via het netwerk, op harde schijf of op een
ander medium te bewaren.
Hiermee kan later een nauwkeurig verslag van problemen met het
-installatiesysteem worden gestuurd aan de Debian ontwikkelaars.
+installatiesysteem worden gestuurd aan de &debian; ontwikkelaars.
</para></listitem>
</varlistentry>
diff --git a/nl/welcome/about-copyright.xml b/nl/welcome/about-copyright.xml
index e6241640f..b13e153dc 100644
--- a/nl/welcome/about-copyright.xml
+++ b/nl/welcome/about-copyright.xml
@@ -16,7 +16,7 @@ computer in your school or place of business. Lend your installation
media to your friends and help them install it on their computers!
You can even make thousands of copies and <emphasis>sell</emphasis>
them &mdash; albeit with a few restrictions. Your freedom to install
-and use the system comes directly from Debian being based on
+and use the system comes directly from &debian; being based on
<emphasis>free software</emphasis>.
</para><para>
@@ -38,7 +38,7 @@ does make some packages available that do not meet our criteria for
being free. These packages are not part of the official distribution,
however, and are only available from the
<userinput>contrib</userinput> or <userinput>non-free</userinput>
-areas of Debian mirrors or on third-party CD-ROMs; see the
+areas of &debian; mirrors or on third-party CD-ROMs; see the
<ulink url="&url-debian-faq;">Debian FAQ</ulink>, under
<quote>The Debian FTP archives</quote>, for more information about the
layout and contents of the archives.
@@ -59,17 +59,17 @@ software. Because of this provision, the source code<footnote>
<para>
For information on how to locate, unpack, and build
-binaries from Debian source packages, see the
+binaries from &debian; source packages, see the
<ulink url="&url-debian-faq;">Debian FAQ</ulink>,
under <quote>Basics of the Debian Package Management System</quote>.
</para>
-</footnote> for all such programs is available in the Debian system.
+</footnote> for all such programs is available in the &debian; system.
</para><para>
There are several other forms of copyright statements and software
-licenses used on the programs in Debian. You can find the copyrights
+licenses used on the programs in &debian;. You can find the copyrights
and licenses for every package installed on your system by looking in
the file
<filename>/usr/share/doc/<replaceable>package-name</replaceable>/copyright
@@ -78,7 +78,7 @@ once you've installed a package on your system.
</para><para>
-For more information about licenses and how Debian determines whether
+For more information about licenses and how &debian; determines whether
software is free enough to be included in the main distribution, see the
<ulink url="&url-dfsg;">Debian Free Software Guidelines</ulink>.
diff --git a/nl/welcome/doc-organization.xml b/nl/welcome/doc-organization.xml
index a075357a0..9baab8ec1 100644
--- a/nl/welcome/doc-organization.xml
+++ b/nl/welcome/doc-organization.xml
@@ -5,7 +5,7 @@
<para>
-Dit document is bedoeld als handleiding voor mensen die Debian voor
+Dit document is bedoeld als handleiding voor mensen die &debian; voor
het eerst gebruiken. Het probeert zo weinig mogelijk aannames te doen
over uw kennisniveau. We gaan er echter wel vanuit dat u een algemeen
beeld heeft van de werking van de hardware in uw computer.
@@ -15,7 +15,7 @@ beeld heeft van de werking van de hardware in uw computer.
Ook gevorderde gebruikers kunnen interessante referentie-informatie
vinden in dit document, waaronder de voor installatie minimaal benodigde
specificaties, details over hardware die door het installatiesysteem van
-Debian wordt ondersteund, en dergelijke. We moedigen gevorderde gebruikers
+&debian; wordt ondersteund, en dergelijke. We moedigen gevorderde gebruikers
aan om heen en weer te bladeren in het document.
</para><para>
@@ -36,9 +36,9 @@ te kunnen gebruiken; zie <xref linkend="hardware-req"/>.
Maak een veiligheidskopie (backup) van uw systeem, zorg indien nodig voor
een plan van aanpak en voor de configuratie van hardware voorafgaand aan
-de installatie van Debian; zie <xref linkend="preparing"/>. Als u een
+de installatie van &debian;; zie <xref linkend="preparing"/>. Als u een
multi-boot systeem voorbereidt, kan het zijn dat u ruimte op uw harde schijf
-moet creëren die kan worden gepartitioneerd voor gebruik door Debian.
+moet creëren die kan worden gepartitioneerd voor gebruik door &debian;.
</para></listitem>
<listitem><para>
@@ -62,8 +62,8 @@ het configureren van uw netwerkverbinding, het partitioneren van uw harde
schijf, de installatie van een basissysteem en vervolgens de selectie en
installatie van taken. Als u niet vanaf een CD installeert, wordt de
netwerkverbinding gebruikt om andere benodigde installatiebestanden direct
-vanaf een Debian server te downloaden. (Enige achtergrondinformatie over het
-opzetten van de partities voor uw Debian systeem is te vinden in
+vanaf een &debian; server te downloaden. (Enige achtergrondinformatie over het
+opzetten van de partities voor uw &debian; systeem is te vinden in
<xref linkend="partitioning"/>.)
</para></listitem>
@@ -79,7 +79,7 @@ met behulp van <xref linkend="boot-new"/>.
Wanneer u de installatie van uw systeem heeft voltooid, kunt u
<xref linkend="post-install"/> lezen. Dat hoofdstuk legt uit waar u
-aanvullende informatie over Unix en Debian kunt vinden en hoe u uw kernel
+aanvullende informatie over Unix en &debian; kunt vinden en hoe u uw kernel
kunt vervangen.
<!-- XXX FIXME: Als u uw eigen installatiesysteem wilt maken op basis van
diff --git a/nl/welcome/getting-newest-inst.xml b/nl/welcome/getting-newest-inst.xml
index bd41f702d..e81217be6 100644
--- a/nl/welcome/getting-newest-inst.xml
+++ b/nl/welcome/getting-newest-inst.xml
@@ -1,20 +1,20 @@
<!-- original version: 28672 -->
<sect1 id="getting-newest-inst">
- <title>Debian verkrijgen</title>
+ <title>&debian; verkrijgen</title>
<para>
Voor informatie over hoe u &debian-gnu; kunt downloaden vanaf het Internet
-of waar officiële Debian CDs gekocht kunnen worden, verwijzen wij u naar de
+of waar officiële &debian; CDs gekocht kunnen worden, verwijzen wij u naar de
<ulink url="&url-debian-distrib;">distributie webpagina</ulink>.
Op de <ulink url="&url-debian-mirrors;">lijst van Debian-mirrors</ulink>
-vindt u het complete overzicht van officiële Debian-mirrors, zodat u
+vindt u het complete overzicht van officiële &debian;-mirrors, zodat u
eenvoudig de dichtstbijzijnde kunt vinden.
</para><para>
-Na de installatie kan Debian eenvoudig worden opgewaardeerd. De
+Na de installatie kan &debian; eenvoudig worden opgewaardeerd. De
installatieprocedure helpt u het systeem zodanig in te richten dat u,
indien nodig, kunt opwaarderen zodra de installatie is voltooid.
diff --git a/nl/welcome/welcome.xml b/nl/welcome/welcome.xml
index 862c66cc8..07d8232af 100644
--- a/nl/welcome/welcome.xml
+++ b/nl/welcome/welcome.xml
@@ -1,11 +1,11 @@
<!-- original version: 28672 -->
-<chapter id="welcome"><title>Welkom bij Debian</title>
+<chapter id="welcome"><title>Welkom bij &debian;</title>
<para>
-Dit hoofdstuk biedt een overzicht over het Debian Project en
+Dit hoofdstuk biedt een overzicht over het &debian; Project en
&debian-gnu;. Als u reeds bekend bent met de geschiedenis van het
-Debian Project en van de &debian-gnu; distributie kunt u dit
+&debian; Project en van de &debian-gnu; distributie kunt u dit
hoofdstuk desgewenst overslaan.
</para>
diff --git a/nl/welcome/what-is-debian-hurd.xml b/nl/welcome/what-is-debian-hurd.xml
index beb67b966..7f1f3a3ef 100644
--- a/nl/welcome/what-is-debian-hurd.xml
+++ b/nl/welcome/what-is-debian-hurd.xml
@@ -3,11 +3,11 @@
<!-- conditionalised because the hurd port is not yet an official debian
release -->
<sect1 id="what-is-debian-hurd" condition="unofficial-build">
- <title>Wat is Debian GNU/Hurd?</title>
+ <title>Wat is &debian; GNU/Hurd?</title>
<para>
-Debian GNU/Hurd is een Debian GNU systeem waarbij de monolitische Linux
+&debian; GNU/Hurd is een &debian; GNU systeem waarbij de monolitische Linux
kernel wordt vervangen door de GNU Hurd &mdash; een verzameling servers
die bovenop de GNU Mach microkernel draaien. Hurd is nog niet voltooid en
is niet geschikt voor dagelijks gekruik, maar er is voortgang. Hurd wordt
diff --git a/nl/welcome/what-is-debian-kfreebsd.xml b/nl/welcome/what-is-debian-kfreebsd.xml
index b03402b86..82ab120e9 100644
--- a/nl/welcome/what-is-debian-kfreebsd.xml
+++ b/nl/welcome/what-is-debian-kfreebsd.xml
@@ -1,16 +1,16 @@
<!-- original version: 64660 untranslated -->
<sect1 id="what-is-debian-kfreebsd">
- <title>What is Debian GNU/kFreeBSD?</title>
+ <title>What is &debian; GNU/kFreeBSD?</title>
<para>
-Debian GNU/kFreeBSD is a Debian GNU system with the kFreeBSD kernel.
+&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
+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
+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>
diff --git a/nl/welcome/what-is-debian-linux.xml b/nl/welcome/what-is-debian-linux.xml
index f7e2978e1..8e78bd0bb 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 GNU/Linux?</title>
+ <title>Wat is &debian; GNU/Linux?</title>
<para>
-De combinatie van de filosofie en methodologie van Debian met de hulpprogramma's
+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 GNU/Linux 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
@@ -19,7 +19,7 @@ probleemrapporten verzekert dat problemen snel worden gevonden en hersteld.
</para><para>
-Debian's aandacht voor detail staat ons toe om een distributie
+&debian;'s aandacht voor detail staat ons toe om een distributie
samen te stellen die van hoge kwaliteit, stabiel en schaalbaar is.
Installaties kunnen eenvoudig worden geconfigureerd om vele rollen
te vervullen: van een uitgeklede firewall via een wetenschappelijk
@@ -27,30 +27,30 @@ werkstation tot een zware netwerkserver.
</para><para>
-Debian is in het bijzonder populair bij gevorderde gebruikers vanwege
+&debian; is in het bijzonder populair bij gevorderde gebruikers vanwege
haar techinische kwaliteit en haar sterke betrokkenheid bij de behoeften
-en verwachtingen van de Linux gemeenschap. Debian heeft veel nieuwe
+en verwachtingen van de Linux gemeenschap. &debian; heeft veel nieuwe
functionaliteit in Linux geïntroduceerd die nu gemeengoed is.
</para><para>
-Zo was Debian de eerste Linux distributie die een systeem voor
+Zo was &debian; de eerste Linux distributie die een systeem voor
pakketbeheer bevatte met als doel eenvoudige installatie en verwijdering
-van software. Debian was ook de eerste Linux distributie die kon worden
+van software. &debian; was ook de eerste Linux distributie die kon worden
opgewaardeerd zonder dat een geheel nieuwe installatie nodig was.
</para><para>
-Debian is nog altijd vooraanstaand in de ontwikkeling van Linux. Het
-ontwikkelproces van Debian is een voorbeeld van hoe goed het Open
+&debian; is nog altijd vooraanstaand in de ontwikkeling van Linux. Het
+ontwikkelproces van &debian; is een voorbeeld van hoe goed het Open
Source ontwikkelmodel kan werken &mdash; zelfs voor zeer complexe
taken als het opbouwen en beheren van een compleet besturingssysteem.
</para><para>
-De eigenschap die Debian het meest onderscheidt van andere Linux
+De eigenschap die &debian; het meest onderscheidt van andere Linux
distributies is het systeem voor pakketbeheer. Deze hulpmiddelen geven
-de beheerder van een Debian systeem volledige controle over de pakketten
+de beheerder van een &debian; systeem volledige controle over de pakketten
die op dat systeem geïnstalleerd zijn, waaronder het vermogen om een
individueel pakket te installeren of automatisch het volledige
besturingssysteem op te waarderen. Ook is het mogelijk individuele
@@ -61,9 +61,9 @@ en opgeven aan welke afhankelijkheden daarmee wordt voldaan.
</para><para>
Om uw systeem te beschermen tegen <quote>Trojaanse paarden</quote> en
-andere kwaadaardige software, controleren de servers van Debian of een nieuw(e)
-(versie van een) pakket wel afkomstig is van zijn geregistreerde Debian
-ontwikkelaar. Ook besteden de samenstellers van Debian pakketten veel zorg
+andere kwaadaardige software, controleren de servers van &debian; of een nieuw(e)
+(versie van een) pakket wel afkomstig is van zijn geregistreerde &debian;
+ontwikkelaar. Ook besteden de samenstellers van &debian; pakketten veel zorg
aan het veilig configureren van hun pakketten. Als in uitgegeven pakketten
beveiligingsproblemen naar voren komen, is een verbeterde versie meestal
zeer snel beschikbaar. Door de eenvoudige wijze waarop pakketten kunnen worden
@@ -73,8 +73,8 @@ geïnstalleerd worden.
</para><para>
De voornaamste (en beste) methode om ondersteuning te krijgen voor uw
-Debian GNU/Linux systeem en om te communiceren met Debian ontwikkelaars, is
-via de vele mailinglijsten die door het Debian Project worden beheerd
+&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
is door gebruik te maken van het <ulink url="&url-debian-lists-subscribe;">