diff options
| author | Holger Wansing <linux@wansing-online.de> | 2010-10-08 22:15:00 +0000 |
|---|---|---|
| committer | Holger Wansing <linux@wansing-online.de> | 2010-10-08 22:15:00 +0000 |
| commit | fda66061d58ccccdb91b609e3161d22e55a4f497 (patch) | |
| tree | be2df2e8b3f3c57c6ea3e9076752b59de741364a /en | |
| parent | 36dc1cdf560c7c70c600d935bfd275955db114cc (diff) | |
| download | installation-guide-fda66061d58ccccdb91b609e3161d22e55a4f497.zip | |
Change many occurences of 'Debian' into &debian;.
This run is in the english version, other languages will follow.
Diffstat (limited to 'en')
79 files changed, 297 insertions, 297 deletions
diff --git a/en/administrivia/administrivia.xml b/en/administrivia/administrivia.xml index 914b9a536..6ae98728d 100644 --- a/en/administrivia/administrivia.xml +++ b/en/administrivia/administrivia.xml @@ -12,7 +12,7 @@ This manual was created for Sarge's debian-installer, based on the Woody installation manual for boot-floppies, which was based -on earlier Debian installation manuals, and on the Progeny +on earlier &debian; installation manuals, and on the Progeny distribution manual which was released under GPL in 2003. </para><para> @@ -112,7 +112,7 @@ the Etch, Lenny and Squeeze releases. </para><para> -Many, many Debian users and developers contributed to this document. +Many, many &debian; users and developers contributed to this document. Particular note must be made of Michael Schmitz (m68k support), Frank Neumann (original author of the <ulink url="&url-m68k-old-amiga-install;">Amiga install manual</ulink>), diff --git a/en/appendix/chroot-install.xml b/en/appendix/chroot-install.xml index 9d28047ce..e41a8b14d 100644 --- a/en/appendix/chroot-install.xml +++ b/en/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: @@ -517,14 +517,14 @@ Then install the kernel package of your choice using its package name. 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> <phrase arch="x86">or <userinput>man lilo.conf</userinput></phrase> 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><phrase arch="x86">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> @@ -570,7 +570,7 @@ label=Debian 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/en/appendix/graphical.xml b/en/appendix/graphical.xml index 34816ceae..5030a6d85 100644 --- a/en/appendix/graphical.xml +++ b/en/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/en/appendix/plip.xml b/en/appendix/plip.xml index d07909ee0..cc749661a 100644 --- a/en/appendix/plip.xml +++ b/en/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/en/appendix/preseed.xml b/en/appendix/preseed.xml index 0ac157e22..9a4b02d26 100644 --- a/en/appendix/preseed.xml +++ b/en/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 @@ -394,7 +394,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: @@ -561,7 +561,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> @@ -581,10 +581,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/en/bookinfo.xml b/en/bookinfo.xml index b24167fe8..2410e52d2 100644 --- a/en/bookinfo.xml +++ b/en/bookinfo.xml @@ -10,14 +10,14 @@ This document contains installation instructions for the &debian-gnu; &release; system (codename <quote>&releasename;</quote>), for the &arch-title; (<quote>&architecture;</quote>) architecture. It also contains pointers to more information and -information on how to make the most of your new Debian system. +information on how to make the most of your new &debian; system. </para> <para> <warning condition="not-checked"><para> This installation guide is based on an earlier manual written for -the old Debian installation system (the <quote>boot-floppies</quote>), and has -been updated to document the new Debian installer. However, for +the old &debian; installation system (the <quote>boot-floppies</quote>), and has +been updated to document the new &debian; installer. However, for &architecture;, the manual has not been fully updated and fact checked for the new installer. There may remain parts of the manual that are incomplete or outdated or that still document the boot-floppies diff --git a/en/boot-installer/arm.xml b/en/boot-installer/arm.xml index f016e70df..73f65a22e 100644 --- a/en/boot-installer/arm.xml +++ b/en/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/en/boot-installer/ia64.xml b/en/boot-installer/ia64.xml index 68ba99888..6bbfda4a5 100644 --- a/en/boot-installer/ia64.xml +++ b/en/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/en/boot-installer/intro-cd.xml b/en/boot-installer/intro-cd.xml index 523976a08..4c4ea0421 100644 --- a/en/boot-installer/intro-cd.xml +++ b/en/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/en/boot-installer/mips.xml b/en/boot-installer/mips.xml index ab5f659cf..fe63cdd0d 100644 --- a/en/boot-installer/mips.xml +++ b/en/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/en/boot-installer/parameters.xml b/en/boot-installer/parameters.xml index 909090c54..5d2bbc667 100644 --- a/en/boot-installer/parameters.xml +++ b/en/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> @@ -315,7 +315,7 @@ this misbehavior. Set to <userinput>true</userinput> to enable support for Serial ATA RAID (also called ATA RAID, BIOS RAID or fake RAID) disks in the installer. Note that this support is currently experimental. Additional information -can be found on the <ulink url="&url-d-i-wiki;">Debian Installer Wiki</ulink>. +can be found on the <ulink url="&url-d-i-wiki;">&debian; Installer Wiki</ulink>. </para></listitem> </varlistentry> @@ -524,7 +524,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/en/boot-installer/powerpc.xml b/en/boot-installer/powerpc.xml index 95d4cc870..ebd27f108 100644 --- a/en/boot-installer/powerpc.xml +++ b/en/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/en/boot-installer/trouble.xml b/en/boot-installer/trouble.xml index 22669f4fe..e9335de7b 100644 --- a/en/boot-installer/trouble.xml +++ b/en/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> @@ -511,7 +511,7 @@ 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/en/boot-installer/x86.xml b/en/boot-installer/x86.xml index 5bf8e052f..f1251eff7 100644 --- a/en/boot-installer/x86.xml +++ b/en/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, @@ -344,7 +344,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/en/boot-new/boot-new.xml b/en/boot-new/boot-new.xml index 8f5596708..99443f2b4 100644 --- a/en/boot-new/boot-new.xml +++ b/en/boot-new/boot-new.xml @@ -2,7 +2,7 @@ <!-- $Id$ --> <chapter id="boot-new"> - <title>Booting Into Your New Debian System</title> + <title>Booting Into Your New &debian; System</title> <sect1 id="base-boot"><title>The Moment of Truth</title> <para> @@ -15,7 +15,7 @@ call the <quote>smoke test</quote>. If you did a default installation, the first thing you should see when you boot the system is the menu of the <classname>grub</classname><phrase arch="x86"> or possibly the <classname>lilo</classname> bootloader</phrase>. -The first choices in the menu will be for your new Debian system. If you +The first choices in the menu will be for your new &debian; system. If you had any other operating systems on your computer (like Windows) that were detected by the installation system, those will be listed lower down in the menu. @@ -24,14 +24,14 @@ menu. If the system fails to start up correctly, don't panic. If the installation was successful, chances are good that there is only a relatively minor -problem that is preventing the system from booting Debian. In most cases +problem that is preventing the system from booting &debian;. In most cases such problems can be fixed without having to repeat the installation. One available option to fix boot problems is to use the installer's built-in rescue mode (see <xref linkend="rescue"/>). </para><para> -If you are new to Debian and &arch-kernel;, you may need some help from more +If you are new to &debian; and &arch-kernel;, you may need some help from more experienced users. <phrase arch="x86">For direct on-line help you can try the IRC channels #debian or #debian-boot on the OFTC network. Alternatively you can contact @@ -160,7 +160,7 @@ starting points. Documentation accompanying programs you have installed can be found in <filename>/usr/share/doc/</filename>, under a subdirectory named after the -program (or, more precise, the Debian package that contains the program). +program (or, more precise, the &debian; package that contains the program). However, more extensive documentation is often packaged separately in special documentation packages that are mostly not installed by default. For example, documentation about the package management tool diff --git a/en/hardware/buying-hardware.xml b/en/hardware/buying-hardware.xml index f2547cf6d..4995508a1 100644 --- a/en/hardware/buying-hardware.xml +++ b/en/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/en/hardware/hardware-supported.xml b/en/hardware/hardware-supported.xml index 7ead9f639..717ae8ec2 100644 --- a/en/hardware/hardware-supported.xml +++ b/en/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 or kFreeBSD kernel and the GNU tool-sets. Therefore, any architecture or platform to which the Linux or kFreeBSD 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> @@ -153,7 +153,7 @@ variations of each architecture known as <quote>flavors</quote>. </para><para> -Debian GNU/kFreeBSD &release; supports two architectures. +&debian; GNU/kFreeBSD &release; supports two architectures. </para><para> @@ -161,7 +161,7 @@ Debian GNU/kFreeBSD &release; supports two architectures. <tgroup cols="2"> <thead> <row> - <entry>Architecture</entry><entry>Debian Designation</entry> + <entry>Architecture</entry><entry>&debian; Designation</entry> </row> </thead> @@ -183,9 +183,9 @@ Debian GNU/kFreeBSD &release; supports two architectures. This document covers installation for the <emphasis>&arch-title;</emphasis> architecture using the <emphasis>&arch-kernel;</emphasis> kernel. 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. +<ulink url="http://www.debian.org/ports/">&debian;-Ports</ulink> pages. </para> <caution arch="ia64"><para> @@ -244,7 +244,7 @@ with GNU/Linux, see for example the <para> Multiprocessor support — also called <quote>symmetric multiprocessing</quote> -or SMP — is available for this architecture. The standard Debian +or SMP — 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 @@ -253,7 +253,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> @@ -269,14 +269,14 @@ section of the kernel config.</phrase> Multiprocessor support — also called <quote>symmetric multiprocessing</quote> or SMP — 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> @@ -288,7 +288,7 @@ is not compiled with SMP support. Multiprocessor support — also called <quote>symmetric multiprocessing</quote> or SMP — 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. @@ -296,7 +296,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> @@ -311,7 +311,7 @@ section of the kernel config.</phrase> Multiprocessor support — also called <quote>symmetric multiprocessing</quote> or SMP — 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 @@ -345,11 +345,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/en/hardware/hardware.xml b/en/hardware/hardware.xml index 642ae48f7..caca5d8e4 100644 --- a/en/hardware/hardware.xml +++ b/en/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/en/hardware/installation-media.xml b/en/hardware/installation-media.xml index e289ceb6c..fc8a8ff56 100644 --- a/en/hardware/installation-media.xml +++ b/en/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/en/hardware/network-cards.xml b/en/hardware/network-cards.xml index 9825bb343..802019393 100644 --- a/en/hardware/network-cards.xml +++ b/en/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/en/hardware/supported/arm.xml b/en/hardware/supported/arm.xml index 73f0a4e40..b0186bb03 100644 --- a/en/hardware/supported/arm.xml +++ b/en/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/en/hardware/supported/i386.xml b/en/hardware/supported/i386.xml index db1f26355..b66536d76 100644 --- a/en/hardware/supported/i386.xml +++ b/en/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/en/hardware/supported/mips.xml b/en/hardware/supported/mips.xml index fecec2d54..eba14c64f 100644 --- a/en/hardware/supported/mips.xml +++ b/en/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/en/hardware/supported/mipsel.xml b/en/hardware/supported/mipsel.xml index ac6d09ae4..a4c8a80a9 100644 --- a/en/hardware/supported/mipsel.xml +++ b/en/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/en/hardware/supported/powerpc.xml b/en/hardware/supported/powerpc.xml index 5d57c6992..e2cbf28c8 100644 --- a/en/hardware/supported/powerpc.xml +++ b/en/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 — 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/en/hardware/supported/sparc.xml b/en/hardware/supported/sparc.xml index 196b4a1dc..a8261e45f 100644 --- a/en/hardware/supported/sparc.xml +++ b/en/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/en/howto/installation-howto.xml b/en/howto/installation-howto.xml index aeb6851d3..8ddbf4696 100644 --- a/en/howto/installation-howto.xml +++ b/en/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…</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/en/install-methods/automatic-install.xml b/en/install-methods/automatic-install.xml index b59bf9b59..db2ab694a 100644 --- a/en/install-methods/automatic-install.xml +++ b/en/install-methods/automatic-install.xml @@ -6,19 +6,19 @@ <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-quickstart</classname> (which can use an install server) and -the Debian Installer itself. Have a look at the +the &debian; Installer itself. Have a look at the <ulink url="http://fai-project.org">FAI home page</ulink> for detailed information. </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/en/install-methods/boot-drive-files.xml b/en/install-methods/boot-drive-files.xml index 52e8df824..fad41e4f2 100644 --- a/en/install-methods/boot-drive-files.xml +++ b/en/install-methods/boot-drive-files.xml @@ -52,7 +52,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 (note that LILO can not boot from files on an NTFS file system), for instance to <filename>/boot/newinstall/</filename>. @@ -88,7 +88,7 @@ from DOS using <command>loadlin</command>. </para><para> -Copy the following files from a Debian CD image to <filename>c:\</filename>. +Copy the following files from a &debian; CD image to <filename>c:\</filename>. <itemizedlist> <listitem><para> @@ -118,7 +118,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. @@ -129,7 +129,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 @@ -158,7 +158,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/en/install-methods/boot-usb-files.xml b/en/install-methods/boot-usb-files.xml index 5312bbd80..fc8d99553 100644 --- a/en/install-methods/boot-usb-files.xml +++ b/en/install-methods/boot-usb-files.xml @@ -141,7 +141,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/en/install-methods/create-floppy.xml b/en/install-methods/create-floppy.xml index 8489678ac..2610c834f 100644 --- a/en/install-methods/create-floppy.xml +++ b/en/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/en/install-methods/download/arm.xml b/en/install-methods/download/arm.xml index 3a8a8fba7..9f958e6eb 100644 --- a/en/install-methods/download/arm.xml +++ b/en/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/en/install-methods/downloading-files.xml b/en/install-methods/downloading-files.xml index 8ec61a025..c937b3d30 100644 --- a/en/install-methods/downloading-files.xml +++ b/en/install-methods/downloading-files.xml @@ -2,16 +2,16 @@ <!-- $Id$ --> <sect1 id="downloading-files"> - <title>Downloading Files from Debian Mirrors</title> + <title>Downloading Files from &debian; Mirrors</title> <para> To find the nearest (and thus probably the fastest) mirror, see the -<ulink url="&url-debian-mirrors;">list of Debian mirrors</ulink>. +<ulink url="&url-debian-mirrors;">list of &debian; mirrors</ulink>. </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> — the <ulink url="&url-debian-installer;images/MANIFEST">MANIFEST</ulink> lists each image and its purpose. diff --git a/en/install-methods/floppy/i386.xml b/en/install-methods/floppy/i386.xml index 059ad6c3f..158057aa4 100644 --- a/en/install-methods/floppy/i386.xml +++ b/en/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/en/install-methods/floppy/powerpc.xml b/en/install-methods/floppy/powerpc.xml index b0892e08a..1a29c1043 100644 --- a/en/install-methods/floppy/powerpc.xml +++ b/en/install-methods/floppy/powerpc.xml @@ -5,7 +5,7 @@ <sect2 arch="powerpc"><title>Writing Disk Images From MacOS</title> <para> -An AppleScript, <application>Make Debian Floppy</application>, is +An AppleScript, <application>Make &debian; Floppy</application>, is available for burning floppies from the provided disk image files. It can be downloaded from <ulink url="ftp://ftp2.sourceforge.net/pub/sourceforge/d/de/debian-imac/MakeDebianFloppy.sit"></ulink>. To @@ -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/en/install-methods/install-tftp.xml b/en/install-methods/install-tftp.xml index 5402c66be..4ea74196c 100644 --- a/en/install-methods/install-tftp.xml +++ b/en/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/en/install-methods/official-cdrom.xml b/en/install-methods/official-cdrom.xml index 4325bca81..f48e29e39 100644 --- a/en/install-methods/official-cdrom.xml +++ b/en/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/en/install-methods/tftp/bootp.xml b/en/install-methods/tftp/bootp.xml index 38a74b09e..ce87259ca 100644 --- a/en/install-methods/tftp/bootp.xml +++ b/en/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/en/install-methods/usb-setup/powerpc.xml b/en/install-methods/usb-setup/powerpc.xml index 291fc908f..2f5183cf2 100644 --- a/en/install-methods/usb-setup/powerpc.xml +++ b/en/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/en/install-methods/usb-setup/x86.xml b/en/install-methods/usb-setup/x86.xml index 17af5713e..2991b724b 100644 --- a/en/install-methods/usb-setup/x86.xml +++ b/en/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/en/partitioning/partition-programs.xml b/en/partitioning/partition-programs.xml index dcb0009c0..cb63a3489 100644 --- a/en/partitioning/partition-programs.xml +++ b/en/partitioning/partition-programs.xml @@ -2,10 +2,10 @@ <!-- $Id$ --> <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/en/partitioning/partition/x86.xml b/en/partitioning/partition/x86.xml index 4fea5c7b5..5b7f7698f 100644 --- a/en/partitioning/partition/x86.xml +++ b/en/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–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/en/partitioning/partitioning.xml b/en/partitioning/partitioning.xml index 66136a451..9748036c3 100644 --- a/en/partitioning/partitioning.xml +++ b/en/partitioning/partitioning.xml @@ -2,7 +2,7 @@ <!-- $Id$ --> <appendix id="partitioning"> -<title>Partitioning for Debian</title> +<title>Partitioning for &debian;</title> &sizing.xml; &tree.xml; diff --git a/en/partitioning/schemes.xml b/en/partitioning/schemes.xml index 6ff4253ef..f4156827c 100644 --- a/en/partitioning/schemes.xml +++ b/en/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/en/partitioning/sizing.xml b/en/partitioning/sizing.xml index 510d60e77..214132964 100644 --- a/en/partitioning/sizing.xml +++ b/en/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/en/partitioning/tree.xml b/en/partitioning/tree.xml index 771e5deb7..5868f9f2a 100644 --- a/en/partitioning/tree.xml +++ b/en/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/en/post-install/further-reading.xml b/en/post-install/further-reading.xml index c49c26239..8e69688ee 100644 --- a/en/post-install/further-reading.xml +++ b/en/post-install/further-reading.xml @@ -16,26 +16,26 @@ 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> The <ulink url="http://www.debian.org/">Debian web site</ulink> -contains a large quantity of documentation about Debian. In +contains a large quantity of documentation about &debian;. In particular, see the <ulink url="http://www.debian.org/doc/FAQ/">Debian GNU/Linux FAQ</ulink> and the <ulink url="http://www.debian.org/doc/user-manuals#quick-reference">Debian Reference</ulink>. -An index of more Debian documentation is available from the +An index of more &debian; documentation is available from the <ulink url="http://www.debian.org/doc/ddp">Debian Documentation Project</ulink>. -The Debian community is self-supporting; to subscribe to +The &debian; community is self-supporting; to subscribe to one or more of the Debian mailing lists, see the <ulink url="http://www.debian.org/MailingLists/subscribe"> Mail List Subscription</ulink> page. Last, but not least, the <ulink url="http://lists.debian.org/">Debian Mailing -List Archives</ulink> contain a wealth of information on Debian. +List Archives</ulink> contain a wealth of information on &debian;. </para><para arch="linux-any"> diff --git a/en/post-install/kernel-baking.xml b/en/post-install/kernel-baking.xml index 07e3b3010..d147d48d9 100644 --- a/en/post-install/kernel-baking.xml +++ b/en/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 @@ -73,7 +73,7 @@ log of the active config file for the build. </para><para> Note that you don't <emphasis>have</emphasis> to compile your kernel -the <quote>Debian way</quote>; but we find that using the packaging system +the <quote>&debian; way</quote>; but we find that using the packaging system to manage your kernel is actually safer and easier. In fact, you can get your kernel sources right from Linus instead of <classname>linux-source-2.6</classname>, @@ -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/en/post-install/mail-setup.xml b/en/post-install/mail-setup.xml index 5278d6bad..52c8103cc 100644 --- a/en/post-install/mail-setup.xml +++ b/en/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/en/post-install/new-to-unix.xml b/en/post-install/new-to-unix.xml index c28cd9d00..f85182353 100644 --- a/en/post-install/new-to-unix.xml +++ b/en/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/en/post-install/orientation.xml b/en/post-install/orientation.xml index 288da7e4b..c2342f401 100644 --- a/en/post-install/orientation.xml +++ b/en/post-install/orientation.xml @@ -2,22 +2,22 @@ <!-- $Id$ --> - <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/en/preface.xml b/en/preface.xml index f5aedb494..62453cca1 100644 --- a/en/preface.xml +++ b/en/preface.xml @@ -5,8 +5,8 @@ <title>Installing &debian-gnu; &release; For &architecture;</title> <para> -We are delighted that you have decided to try Debian, and are -sure that you will find that Debian's GNU/&arch-kernel; distribution is +We are delighted that you have decided to try &debian;, and are +sure that you will find that &debian;'s GNU/&arch-kernel; distribution is unique. &debian-gnu; brings together high-quality free software from around the world, integrating it into a coherent whole. We believe that you will find that the result is truly more than the sum @@ -14,8 +14,8 @@ of the parts. </para><para> -We understand that many of you want to install Debian without reading this -manual, and the Debian installer is designed to make this possible. If you +We understand that many of you want to install &debian; without reading this +manual, and the &debian; installer is designed to make this possible. If you don't have time to read the whole Installation Guide right now, we recommend that you read the Installation Howto, which will walk you through the basic installation process, and links to the manual for more advanced topics or diff --git a/en/preparing/bios-setup/i386.xml b/en/preparing/bios-setup/i386.xml index 21f7e485e..7e9872b9a 100644 --- a/en/preparing/bios-setup/i386.xml +++ b/en/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/en/preparing/bios-setup/s390.xml b/en/preparing/bios-setup/s390.xml index 6a5edf30e..a7a613c17 100644 --- a/en/preparing/bios-setup/s390.xml +++ b/en/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/en/preparing/install-overview.xml b/en/preparing/install-overview.xml index a52e2cd8c..f2f3f6404 100644 --- a/en/preparing/install-overview.xml +++ b/en/preparing/install-overview.xml @@ -5,7 +5,7 @@ <title>Overview of the Installation Process</title> <para> -First, just a note about re-installations. With Debian, a +First, just a note about re-installations. With &debian;, a circumstance that will require a complete re-installation of your system is very rare; perhaps mechanical failure of the hard disk would be the most common case. @@ -24,7 +24,7 @@ Under &debian-gnu;, it is much more likely that your OS can be repaired rather than replaced if things go wrong. Upgrades never require a wholesale installation; you can always upgrade in-place. And the programs are almost always compatible with successive OS releases. If -a new program version requires newer supporting software, the Debian +a new program version requires newer supporting software, the &debian; packaging system ensures that all the necessary software is automatically identified and installed. The point is, much effort has been put into avoiding the need for re-installation, so think of it as @@ -53,18 +53,18 @@ before starting the installation. </para></listitem> <listitem><para> -Create partitionable space for Debian on your hard disk. +Create partitionable space for &debian; on your hard disk. </para></listitem> <listitem><para> Locate and/or download the installer software and any specialized -driver files your machine requires (except Debian CD users). +driver files your machine requires (except &debian; CD users). </para></listitem> <listitem><para> -Set up boot tapes/floppies/USB sticks, or place boot files (most Debian +Set up boot tapes/floppies/USB sticks, or place boot files (most &debian; CD users can boot from one of the CDs). </para></listitem> @@ -102,7 +102,7 @@ Attach one or more DASDs (Direct Access Storage Device). <listitem><para> -Create and mount the partitions on which Debian will be installed. +Create and mount the partitions on which &debian; will be installed. </para></listitem> <listitem><para> diff --git a/en/preparing/minimum-hardware-reqts.xml b/en/preparing/minimum-hardware-reqts.xml index 8c41f57d3..6cde07432 100644 --- a/en/preparing/minimum-hardware-reqts.xml +++ b/en/preparing/minimum-hardware-reqts.xml @@ -57,7 +57,7 @@ Any OldWorld or NewWorld PowerPC can serve well as a desktop system. The actual minimum memory requirements are a lot less then the numbers listed in this table. Depending on the architecture, it is possible to -install Debian with as little as 20MB (for s390) to 48MB (for i386 and +install &debian; with as little as 20MB (for s390) to 48MB (for i386 and amd64). The same goes for the disk space requirements, especially if you pick and choose which applications to install; see <xref linkend="tasksel-size-list"/> for additional information on disk @@ -90,7 +90,7 @@ files and data. Disk space required for the smooth operation of the &debian-gnu; system itself is taken into account in these recommended system requirements. Notably, the <filename>/var</filename> partition contains -a lot of state information specific to Debian in addition to its regular +a lot of state information specific to &debian; in addition to its regular contents, like logfiles. The <command>dpkg</command> files (with information on all installed packages) can easily consume 40MB. Also, diff --git a/en/preparing/needed-info.xml b/en/preparing/needed-info.xml index 457e62350..0d4f3a1d3 100644 --- a/en/preparing/needed-info.xml +++ b/en/preparing/needed-info.xml @@ -25,7 +25,7 @@ This document you are now reading, in plain ASCII, HTML or PDF format. <para condition="for_wdo"> The document you are now reading, which is the official version of the -Installation Guide for the &releasename; release of Debian; available +Installation Guide for the &releasename; release of &debian;; available in <ulink url="&url-release-area;/installmanual">various formats and translations</ulink>. @@ -34,7 +34,7 @@ translations</ulink>. <para condition="for_alioth"> The document you are now reading, which is a development version of the -Installation Guide for the next release of Debian; available in +Installation Guide for the next release of &debian;; available in <ulink url="&url-d-i-alioth-manual;">various formats and translations</ulink>. @@ -113,7 +113,7 @@ Linux for &arch-title;</ulink> <para> IBM Redbook describing the Linux distributions available for the -mainframe. It has no chapter about Debian but the basic installation +mainframe. It has no chapter about &debian; but the basic installation concepts are the same across all &arch-title; distributions. </para> diff --git a/en/preparing/non-debian-partitioning.xml b/en/preparing/non-debian-partitioning.xml index 37dad488c..6cb6aa762 100644 --- a/en/preparing/non-debian-partitioning.xml +++ b/en/preparing/non-debian-partitioning.xml @@ -28,11 +28,11 @@ If you already have an operating system on your system (VM, z/OS, OS/390, …) </phrase> -and want to stick Debian on the same disk, you will need to repartition -the disk. Debian requires its own hard disk partitions. It cannot be +and want to stick &debian; on the same disk, you will need to repartition +the disk. &debian; requires its own hard disk partitions. It cannot be installed on Windows or MacOS partitions. It may be able to share some partitions with other Unix systems, but that's not covered here. At -the very least you will need a dedicated partition for the Debian +the very least you will need a dedicated partition for the &debian; root. </para><para> @@ -59,7 +59,7 @@ way before moving a wall or you risk destroying it. </para><para> If your computer has more than one hard disk, you may want to dedicate -one of the hard disks completely to Debian. If so, you don't need to +one of the hard disks completely to &debian;. If so, you don't need to partition that disk before booting the installation system; the installer's included partitioning program can handle the job nicely. @@ -82,7 +82,7 @@ original system's installation tapes or CDs. If your machine already has multiple partitions, and enough space can be provided by deleting and replacing one or more of them, then you -too can wait and use the Debian installer's partitioning program. You +too can wait and use the &debian; installer's partitioning program. You should still read through the material below, because there may be special circumstances like the order of the existing partitions within the partition map, that force you to partition before installing @@ -91,14 +91,14 @@ anyway. </para><para arch="any-x86"> If your machine has a FAT or NTFS filesystem, as used by DOS and Windows, -you can wait and use Debian installer's partitioning program to +you can wait and use &debian; installer's partitioning program to resize the filesystem. </para><para> If none of the above apply, you'll need to partition your hard disk before starting the installation to create partitionable space for -Debian. If some of the partitions will be owned by other operating +&debian;. If some of the partitions will be owned by other operating systems, you should create those partitions using native operating system partitioning programs. We recommend that you do <emphasis>not</emphasis> attempt to create partitions for &debian-gnu; @@ -110,8 +110,8 @@ retain. If you are going to install more than one operating system on the same machine, you should install all other system(s) before proceeding with -Debian installation. Windows and other OS installations may destroy -your ability to start Debian, or encourage you to reformat non-native +&debian; installation. Windows and other OS installations may destroy +your ability to start &debian;, or encourage you to reformat non-native partitions. </para><para> @@ -127,7 +127,7 @@ especially MacOS boot partitions. This should be kept in mind when pre-partitioning; you should create a &arch-parttype; placeholder partition to come <emphasis>before</emphasis> the other bootable partitions on the disk. (The small partitions dedicated to Apple disk drivers are not -bootable.) You can delete the placeholder with the Debian partition +bootable.) You can delete the placeholder with the &debian; partition tools later during the actual install, and replace it with &arch-parttype; partitions. @@ -135,7 +135,7 @@ partitions. If you currently have one hard disk with one partition (a common setup for desktop computers), and you want to multi-boot the native -operating system and Debian, you will need to: +operating system and &debian;, you will need to: <orderedlist> <listitem><para> @@ -168,12 +168,12 @@ Install the native operating system on its new partition. <listitem><para> Boot back into the native system to verify everything's OK, - and to download the Debian installer boot files. + and to download the &debian; installer boot files. </para></listitem> <listitem><para> -Boot the Debian installer to continue installing Debian. +Boot the &debian; installer to continue installing &debian;. </para></listitem> </orderedlist> diff --git a/en/preparing/nondeb-part/sparc.xml b/en/preparing/nondeb-part/sparc.xml index 342691f30..040feb008 100644 --- a/en/preparing/nondeb-part/sparc.xml +++ b/en/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/en/preparing/nondeb-part/x86.xml b/en/preparing/nondeb-part/x86.xml index eeb27f4f5..d7ed63602 100644 --- a/en/preparing/nondeb-part/x86.xml +++ b/en/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/en/preparing/pre-install-bios-setup.xml b/en/preparing/pre-install-bios-setup.xml index 564788045..27d784c0e 100644 --- a/en/preparing/pre-install-bios-setup.xml +++ b/en/preparing/pre-install-bios-setup.xml @@ -6,7 +6,7 @@ <para> This section will walk you through pre-installation hardware setup, if -any, that you will need to do prior to installing Debian. Generally, +any, that you will need to do prior to installing &debian;. Generally, this involves checking and possibly changing firmware settings for your system. The <quote>firmware</quote> is the core software used by the hardware; it is most critically invoked during the bootstrap process diff --git a/en/preparing/preparing.xml b/en/preparing/preparing.xml index 1ed52ff71..e4c772657 100644 --- a/en/preparing/preparing.xml +++ b/en/preparing/preparing.xml @@ -5,7 +5,7 @@ <title>Before Installing &debian-gnu;</title> <para> -This chapter deals with the preparation for installing Debian before you even +This chapter deals with the preparation for installing &debian; before you even boot the installer. This includes backing up your data, gathering information about your hardware, and locating any necessary information. diff --git a/en/using-d-i/components.xml b/en/using-d-i/components.xml index 438b36183..11e6e5395 100644 --- a/en/using-d-i/components.xml +++ b/en/using-d-i/components.xml @@ -15,10 +15,10 @@ the installation method you use and on your hardware. </para> <sect2 id="di-setup"> - <title>Setting up Debian Installer and Hardware Configuration</title> + <title>Setting up &debian; Installer and Hardware Configuration</title> <para> -Let's assume the Debian Installer has booted and you are facing its +Let's assume the &debian; Installer has booted and you are facing its first screen. At this time, the capabilities of &d-i; are still quite limited. It doesn't know much about your hardware, preferred language, or even the task it should perform. Don't worry. Because &d-i; is quite @@ -162,7 +162,7 @@ linkend="boot-dev-select-sun"/>.</phrase> <title>Finishing the Installation</title> <para> -This is the last step in the Debian installation process during which the +This is the last step in the &debian; installation process during which the installer will do any last minute tasks. It mostly consists of tidying up after the &d-i;. diff --git a/en/using-d-i/modules/finish-install.xml b/en/using-d-i/modules/finish-install.xml index b116ebdbe..64d330960 100644 --- a/en/using-d-i/modules/finish-install.xml +++ b/en/using-d-i/modules/finish-install.xml @@ -8,7 +8,7 @@ You will be prompted to remove the boot media (CD, floppy, etc) that you used to boot the installer. After that the system will be rebooted into -your new Debian system. +your new &debian; system. </para><para arch="s390"> diff --git a/en/using-d-i/modules/ia64/elilo-installer.xml b/en/using-d-i/modules/ia64/elilo-installer.xml index 5fa5d0efd..1567b7ad8 100644 --- a/en/using-d-i/modules/ia64/elilo-installer.xml +++ b/en/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/en/using-d-i/modules/iso-scan.xml b/en/using-d-i/modules/iso-scan.xml index aaf56d89d..926e44fb2 100644 --- a/en/using-d-i/modules/iso-scan.xml +++ b/en/using-d-i/modules/iso-scan.xml @@ -2,11 +2,11 @@ <!-- $Id$ --> <sect3 id="iso-scan"> - <title>Looking for the Debian Installer ISO Image</title> + <title>Looking for the &debian; Installer ISO Image</title> <para> When installing via the <emphasis>hd-media</emphasis> method, there -will be a moment where you need to find and mount the Debian Installer +will be a moment where you need to find and mount the &debian; Installer iso image in order to get the rest of the installation files. The component <command>iso-scan</command> does exactly this. @@ -23,7 +23,7 @@ directory and in the first level of subdirectories (i.e. it finds but not <filename>/data/tmp/<replaceable>whatever</replaceable>.iso</filename>). After an iso image has been found, <command>iso-scan</command> checks -its content to determine if the image is a valid Debian iso image or +its content to determine if the image is a valid &debian; iso image or not. In the former case we are done, in the latter <command>iso-scan</command> seeks for another image. diff --git a/en/using-d-i/modules/localechooser.xml b/en/using-d-i/modules/localechooser.xml index 7607ff0a2..b66c96a9c 100644 --- a/en/using-d-i/modules/localechooser.xml +++ b/en/using-d-i/modules/localechooser.xml @@ -23,7 +23,7 @@ installer will default to English. The selected geographic location (in most cases a country) will be used later in the installation process to select the correct time zone and a -Debian mirror appropriate for that country. +&debian; mirror appropriate for that country. Language and country together will help determine the default locale for your system and select the correct keyboard layout. diff --git a/en/using-d-i/modules/os-prober.xml b/en/using-d-i/modules/os-prober.xml index 43c761c04..b20f100ac 100644 --- a/en/using-d-i/modules/os-prober.xml +++ b/en/using-d-i/modules/os-prober.xml @@ -10,7 +10,7 @@ Before a boot loader is installed, the installer will attempt to probe for other operating systems which are installed on the machine. If it finds a supported operating system, you will be informed of this during the boot loader installation step, and the computer will be configured to boot this -other operating system in addition to Debian. +other operating system in addition to &debian;. </para><para> diff --git a/en/using-d-i/modules/partman.xml b/en/using-d-i/modules/partman.xml index 3589939e6..22f58403f 100644 --- a/en/using-d-i/modules/partman.xml +++ b/en/using-d-i/modules/partman.xml @@ -320,7 +320,7 @@ modify the proposed changes as described below for manual partitioning. A similar screen to the one shown just above will be displayed if you choose manual partitioning except that your existing partition table will be shown and without the mount points. How to manually set up your partition -table and the usage of partitions by your new Debian system will be covered +table and the usage of partitions by your new &debian; system will be covered in the remainder of this section. </para><para> diff --git a/en/using-d-i/modules/save-logs.xml b/en/using-d-i/modules/save-logs.xml index 2addf18a3..6cf9b0e3c 100644 --- a/en/using-d-i/modules/save-logs.xml +++ b/en/using-d-i/modules/save-logs.xml @@ -9,7 +9,7 @@ If the installation is successful, the logfiles created during the installation process will be automatically saved to <filename>/var/log/installer/</filename> on your new -Debian system. +&debian; system. </para><para> diff --git a/en/using-d-i/modules/x86/lilo-installer.xml b/en/using-d-i/modules/x86/lilo-installer.xml index 730b162a7..0295119f2 100644 --- a/en/using-d-i/modules/x86/lilo-installer.xml +++ b/en/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 — 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/en/using-d-i/using-d-i.xml b/en/using-d-i/using-d-i.xml index 9c5bf5cc3..e8d1bafec 100644 --- a/en/using-d-i/using-d-i.xml +++ b/en/using-d-i/using-d-i.xml @@ -2,12 +2,12 @@ <!-- $Id$ --> - <chapter id="d-i-intro"><title>Using the Debian Installer</title> + <chapter id="d-i-intro"><title>Using the &debian; Installer</title> <sect1><title>How the Installer Works</title> <para> -The Debian Installer consists of a number of special-purpose +The &debian; Installer consists of a number of special-purpose components to perform each installation task. Each component performs its task, asking the user questions as necessary to do its job. The questions themselves are given priorities, and the priority @@ -184,7 +184,7 @@ cards, disk drives, and PCMCIA. <term>cdrom-detect</term><listitem><para> -Looks for and mounts a Debian installation CD. +Looks for and mounts a &debian; installation CD. </para></listitem> </varlistentry> @@ -209,7 +209,7 @@ Searches for ISO images (<filename>.iso</filename> files) on hard drives. <term>choose-mirror</term><listitem><para> -Presents a list of Debian archive mirrors. The user may choose +Presents a list of &debian; archive mirrors. The user may choose the source of his installation packages. </para></listitem> @@ -267,7 +267,7 @@ Allows the user to partition disks attached to the system, create file systems on the selected partitions, and attach them to the mountpoints. Included are also interesting features like a fully automatic mode or LVM support. This is the preferred partitioning tool -in Debian. +in &debian;. </para></listitem> </varlistentry> @@ -382,7 +382,7 @@ console. Provides a way for the user to record information on a floppy disk, network, hard disk, or other media when trouble is encountered, in order to accurately -report installer software problems to Debian developers later. +report installer software problems to &debian; developers later. </para></listitem> </varlistentry> diff --git a/en/welcome/about-copyright.xml b/en/welcome/about-copyright.xml index 39bb9537a..30ed47ff2 100644 --- a/en/welcome/about-copyright.xml +++ b/en/welcome/about-copyright.xml @@ -15,7 +15,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 — 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> @@ -31,12 +31,12 @@ well. <note><para> -The Debian project, as a pragmatic concession to its users, +The &debian; project, as a pragmatic concession to its users, 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. @@ -55,17 +55,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 @@ -74,7 +74,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/en/welcome/doc-organization.xml b/en/welcome/doc-organization.xml index 222add960..39975d2c1 100644 --- a/en/welcome/doc-organization.xml +++ b/en/welcome/doc-organization.xml @@ -6,7 +6,7 @@ <para> -This document is meant to serve as a manual for first-time Debian +This document is meant to serve as a manual for first-time &debian; users. It tries to make as few assumptions as possible about your level of expertise. However, we do assume that you have a general understanding of how the hardware in your computer works. @@ -15,7 +15,7 @@ understanding of how the hardware in your computer works. Expert users may also find interesting reference information in this document, including minimum installation sizes, details about the -hardware supported by the Debian installation system, and so on. We +hardware supported by the &debian; installation system, and so on. We encourage expert users to jump around in the document. </para><para> @@ -35,9 +35,9 @@ installation system, in <xref linkend="hardware-req"/>. <listitem><para> Backup your system, perform any necessary planning and hardware -configuration prior to installing Debian, in <xref linkend="preparing"/>. If +configuration prior to installing &debian;, in <xref linkend="preparing"/>. If you are preparing a multi-boot system, you may need to create -partitionable space on your hard disk for Debian to use. +partitionable space on your hard disk for &debian; to use. </para></listitem> <listitem><para> @@ -59,10 +59,10 @@ Perform the actual installation according to <xref linkend="d-i-intro"/>. This involves choosing your language, configuring peripheral driver modules, configuring your network connection, so that remaining installation files can be obtained -directly from a Debian server (if you are not installing from a CD), +directly from a &debian; server (if you are not installing from a CD), partitioning your hard drives and installation of a base system, then selection and installation of tasks. -(Some background about setting up the partitions for your Debian +(Some background about setting up the partitions for your &debian; system is explained in <xref linkend="partitioning"/>.) </para></listitem> @@ -78,7 +78,7 @@ Boot into your newly installed base system, from <xref linkend="boot-new"/>. Once you've got your system installed, you can read <xref linkend="post-install"/>. That chapter explains where to -look to find more information about Unix and Debian, and how to +look to find more information about Unix and &debian;, and how to replace your kernel. <!-- XXX FIXME: If you want to build your own install system diff --git a/en/welcome/getting-newest-inst.xml b/en/welcome/getting-newest-inst.xml index e20000c0f..f424b6efa 100644 --- a/en/welcome/getting-newest-inst.xml +++ b/en/welcome/getting-newest-inst.xml @@ -2,20 +2,20 @@ <!-- $Id$ --> <sect1 id="getting-newest-inst"> - <title>Getting Debian</title> + <title>Getting &debian;</title> <para> For information on how to download &debian-gnu; from the Internet -or from whom official Debian CDs can be purchased, see the +or from whom official &debian; CDs can be purchased, see the <ulink url="&url-debian-distrib;">distribution web page</ulink>. -The <ulink url="&url-debian-mirrors;">list of Debian mirrors</ulink> -contains a full set of official Debian +The <ulink url="&url-debian-mirrors;">list of &debian; mirrors</ulink> +contains a full set of official &debian; mirrors, so you can easily find the nearest one. </para><para> -Debian can be upgraded after installation very easily. The +&debian; can be upgraded after installation very easily. The installation procedure will help set up the system so that you can make those upgrades once installation is complete, if need be. diff --git a/en/welcome/welcome.xml b/en/welcome/welcome.xml index b88e83943..ea97359e4 100644 --- a/en/welcome/welcome.xml +++ b/en/welcome/welcome.xml @@ -1,11 +1,11 @@ <!-- retain these comments for translator revision tracking --> <!-- $Id$ --> -<chapter id="welcome"><title>Welcome to Debian</title> +<chapter id="welcome"><title>Welcome to &debian;</title> <para> -This chapter provides an overview of the Debian Project and -&debian-gnu;. If you already know about the Debian Project's +This chapter provides an overview of the &debian; Project and +&debian-gnu;. If you already know about the &debian; Project's history and the &debian-gnu; distribution, feel free to skip to the next chapter. diff --git a/en/welcome/what-is-debian-hurd.xml b/en/welcome/what-is-debian-hurd.xml index fffbdd656..158b46ac4 100644 --- a/en/welcome/what-is-debian-hurd.xml +++ b/en/welcome/what-is-debian-hurd.xml @@ -4,11 +4,11 @@ <!-- conditionalised because the hurd port is not yet an official debian release --> <sect1 id="what-is-debian-hurd" condition="unofficial-build"> - <title>What is Debian GNU/Hurd?</title> + <title>What is &debian; GNU/Hurd?</title> <para> -Debian GNU/Hurd is a Debian GNU system with the GNU Hurd — a set of +&debian; GNU/Hurd is a &debian; GNU system with the GNU Hurd — a set of servers running on top of the GNU Mach microkernel. </para><para> @@ -21,14 +21,14 @@ stable. </para><para> -Please note that Debian GNU/Hurd is not a Linux system, and thus some +Please note that &debian; GNU/Hurd is not a Linux system, and thus some information on Linux system may not apply to it. </para><para> For more information, see the <ulink url="http://www.debian.org/ports/hurd/"> -Debian GNU/Hurd ports page</ulink> +&debian; GNU/Hurd ports page</ulink> and the <email>debian-hurd@lists.debian.org</email> mailing list. diff --git a/en/welcome/what-is-debian-kfreebsd.xml b/en/welcome/what-is-debian-kfreebsd.xml index 368410b11..f214c3180 100644 --- a/en/welcome/what-is-debian-kfreebsd.xml +++ b/en/welcome/what-is-debian-kfreebsd.xml @@ -2,27 +2,27 @@ <!-- $Id$ --> <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. </para><para> -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. </para><para> -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> For more information, see the <ulink url="http://www.debian.org/ports/kfreebsd-gnu/"> -Debian GNU/kFreeBSD ports page</ulink> +&debian; GNU/kFreeBSD ports page</ulink> and the <email>debian-bsd@lists.debian.org</email> mailing list. diff --git a/en/welcome/what-is-debian-linux.xml b/en/welcome/what-is-debian-linux.xml index ef172281b..fdd50c4f9 100644 --- a/en/welcome/what-is-debian-linux.xml +++ b/en/welcome/what-is-debian-linux.xml @@ -2,12 +2,12 @@ <!-- $Id$ --> <sect1 id="what-is-debian-linux"> - <title>What is Debian GNU/Linux?</title> + <title>What is &debian; GNU/Linux?</title> <para> -The combination of Debian's philosophy and methodology and the GNU +The combination of &debian;'s philosophy and methodology and the GNU tools, the Linux kernel, and other important free software, form a -unique software distribution called Debian GNU/Linux. This +unique software distribution called &debian; GNU/Linux. This distribution is made up of a large number of software <emphasis>packages</emphasis>. Each package in the distribution contains executables, scripts, documentation, and configuration @@ -19,37 +19,37 @@ tracking system ensures that problems are found and fixed quickly. </para><para> -Debian's attention to detail allows us to produce a high-quality, +&debian;'s attention to detail allows us to produce a high-quality, stable, and scalable distribution. Installations can be easily configured to serve many roles, from stripped-down firewalls to desktop scientific workstations to high-end network servers. </para><para> -Debian is especially popular among advanced users because of its +&debian; is especially popular among advanced users because of its technical excellence and its deep commitment to the needs and -expectations of the Linux community. Debian also introduced many +expectations of the Linux community. &debian; also introduced many features to Linux that are now commonplace. </para><para> -For example, Debian was the first Linux distribution to include a +For example, &debian; was the first Linux distribution to include a package management system for easy installation and removal of software. It was also the first Linux distribution that could be upgraded without requiring reinstallation. </para><para> -Debian continues to be a leader in Linux development. Its development +&debian; continues to be a leader in Linux development. Its development process is an example of just how well the Open Source development model can work — even for very complex tasks such as building and maintaining a complete operating system. </para><para> -The feature that most distinguishes Debian from other Linux +The feature that most distinguishes &debian; from other Linux distributions is its package management system. These tools give the -administrator of a Debian system complete control over the packages +administrator of a &debian; system complete control over the packages installed on that system, including the ability to install a single package or automatically update the entire operating system. Individual packages can also be protected from being updated. You can @@ -59,18 +59,18 @@ compiled yourself and what dependencies it fulfills. </para><para> To protect your system against <quote>Trojan horses</quote> and other malevolent -software, Debian's servers verify that uploaded packages come from -their registered Debian maintainers. Debian packagers also take great +software, &debian;'s servers verify that uploaded packages come from +their registered &debian; maintainers. &debian; packagers also take great care to configure their packages in a secure manner. When security problems in shipped packages do appear, fixes are usually available -very quickly. With Debian's simple update options, security fixes can +very quickly. With &debian;'s simple update options, security fixes can be downloaded and installed automatically across the Internet. </para><para> -The primary, and best, method of getting support for your Debian GNU/Linux -system and communicating with Debian Developers is through -the many mailing lists maintained by the Debian Project (there are +The primary, and best, method of getting support for your &debian; GNU/Linux +system and communicating with &debian; Developers is through +the many mailing lists maintained by the &debian; Project (there are more than &num-of-debian-maillists; at this writing). The easiest way to subscribe to one or more of these lists is visit <ulink url="&url-debian-lists-subscribe;"> |