Catalan translation fo d-i manual [Was: Re: [d-i manual] Deactivate translations? ]
Hello,
Guillem Jover <guillem@debian.org> wrote:
> On Sun, 2013-02-03 at 18:38:08 +0100, Christian PERRIER wrote:
> > Quoting Holger Wansing (linux@wansing-online.de):
> > > ca
> > > catalan hasn't receive any updates since the release of Squeeze /
> > > AND catalan is an xml based translation, what means that the translation stays
> > > the same even if there are changings in en!
> > > 52 files are not up-to-date ATM
> > > IMHO this translation should be deactivated for official builds!
> >
> > I agree it should be de-activated, but maybe try to CC
> > debian-l10n-catalan, which is a quite busy list, while Guillem and
> > Jordi are less involved in translations nowadays.
>
> I resigned as Catalan translator and coordinator last year.
>
> (<https://lists.debian.org/debian-l10n-catalan/2012/03/msg00002.html>.)
>
> I still have pending locally a review that got submitted to me long
> time ago, that I need to check and commit, but except for that I'm
> not planning on doing anything else.
>
> > But I doubt that a very outdated XML-based translation is easy to
> > update. Particularly in a rush.
>
> When I was taking care of the manual, we managed to update it in a
> week or so (?), I don't think that should be a problem.
I issued a call to update translations some time ago (see
https://lists.debian.org/debian-l10n-french/2012/10/msg00260.html )
and debian-l10n-catalan was also included there.
But noone jumped in for catalan.
That's why I ask to de-activate the translation now.
But let's see ...
@debian-l10n-catalan people:
since Guillem has resigned as a translator for the debian-installer
manual, that translation is lacking a catalan translator now.
If someone of you has some free time, it would be great if you could
spent some of that time to update the catalan translation (at least
the important bits).
The material could be viewed online under
http://anonscm.debian.org/viewvc/d-i/trunk/manual/ca/
I have prepared a diff with the needed changings for Catalan
(attached).
Feel free to ask me for assistance if you have interest.
Otherwise the translation would have to be moved out of the official
builds (thus no catalan translation of the d-i manual for Wheezy).
Thanks in advance
Holger
--
= = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
Created with Sylpheed 3.0.2
under D e b i a n G N U / L I N U X 6.0 ( S q u e e z e )
Registered LinuxUser #311290 - http://linuxcounter.net/
= = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
en/howto/installation-howto.xml : 64916 -> 68416
Index: en/howto/installation-howto.xml
===================================================================
--- en/howto/installation-howto.xml (Revision 64916)
+++ en/howto/installation-howto.xml (Revision 68416)
@@ -66,14 +66,13 @@
<para>
-There are two different netinst CD images which can be used to install
-&releasename; with the &d-i;. These images are intended to boot from CD
-and install additional packages over a network, hence the name 'netinst'.
-The difference between the two images is that on the full netinst image
-the base packages are included, whereas you have to download these from
-the web if you are using the business card image. If you'd rather, you can
-get a full size CD image which will not need the network to install. You
-only need the first CD of the set.
+The netinst CD image is a popular image which can be used to install
+&releasename; with the &d-i;. This image is intended to boot from CD and
+install additional packages over a network; hence the name 'netinst'.
+The image has the software components needed to run the installer and
+the base packages to provide a minimal &releasename; system. If you'd
+rather, you can get a full size CD image which will not need the network
+to install. You only need the first CD of the set.
</para><para>
@@ -135,12 +134,20 @@
example a USB keychain can make a handy &debian; install medium that you
can take with you anywhere.
-</para><para>
+</para><para condition="isohybrid-supported">
+The easiest way to prepare your USB memory stick is to download any
+Debian CD or DVD image that will fit on it, and write the CD image directly
+to the memory stick. Of course this will destroy anything already
+on the memory stick. This works because Debian CD images are
+"isohybrid" images that can boot both from CD and from USB drives.
+
+</para><para condition="isohybrid-unsupported">
+
The easiest way to prepare your USB memory stick is to download
-<filename>hd-media/boot.img.gz</filename>, and use gunzip to extract the 256 MB
+<filename>hd-media/boot.img.gz</filename>, and use gunzip to extract the 1 GB
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
+must be at least 1 GB 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
to the memory stick; any filename is ok as long as it ends in
@@ -179,9 +186,9 @@
The easiest thing to set up is probably PXE netbooting. Untar the
file <filename>netboot/pxeboot.tar.gz</filename> into
-<filename>/var/lib/tftpboot</filename> or
+<filename>/srv/tftp</filename> or
wherever is appropriate for your tftp server. Set up your DHCP server to pass
-filename <filename>/pxelinux.0</filename> to clients, and with luck
+filename <filename>pxelinux.0</filename> to clients, and with luck
everything will just work.
For detailed instructions, see <xref linkend="install-tftp" />.
@@ -247,6 +254,15 @@
</para><para>
+Setting up your clock and time zone is followed by the creation of user accounts. By
+default you are asked to provide a password for the <quote>root</quote>
+(administrator) account and information necessary to create one regular user
+account. If you do not specify a password for the <quote>root</quote> user this
+account will be disabled but the <command>sudo</command> package will be installed
+later to enable administrative tasks to be carried out on the new system.
+
+</para><para>
+
Now it is time to partition your disks. First you will be given the
opportunity to automatically partition either an entire drive, or available
free space on a drive (see <xref linkend="partman-auto" />).
@@ -292,13 +308,6 @@
</para><para>
-Installation of the base system is followed by setting up user accounts. By
-default you will need to provide a password for the <quote>root</quote>
-(administrator) account and information necessary to create one regular user
-account.
-
-</para><para>
-
The last step is to install a boot loader. If the installer detects
other operating systems on your computer, it will add them to the boot menu
and let you know.
en/preparing/install-overview.xml : 56322 -> 67991
Index: en/preparing/install-overview.xml
===================================================================
--- en/preparing/install-overview.xml (Revision 56322)
+++ en/preparing/install-overview.xml (Revision 67991)
@@ -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.
@@ -20,11 +20,11 @@
</para><para>
-Under &debian;, it is much more likely that your OS can be repaired
+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
@@ -51,21 +51,21 @@
before starting the installation.
</para></listitem>
-<listitem><para>
+<listitem arch="not-x86"><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 or firmware files your machine requires.
</para></listitem>
<listitem><para>
-Set up boot tapes/floppies/USB sticks, or place boot files (most Debian
-CD users can boot from one of the CDs).
+Set up boot media such as CDs/DVDs/USB sticks or provide a network boot
+infrastructure from which the installer can be booted.
</para></listitem>
<listitem><para>
@@ -100,9 +100,14 @@
</para></listitem>
+<listitem arch="x86"><para>
+If necessary, resize existing partitions on your target harddisk to make
+space for the installation.
+</para></listitem>
+
<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>
@@ -114,7 +119,7 @@
<listitem><para>
Install a <firstterm>boot loader</firstterm>
-which can start up &debian; and/or your existing system.
+which can start up &debian-gnu; and/or your existing system.
</para></listitem>
<listitem><para>
@@ -127,7 +132,7 @@
<para condition="gtk">
For &arch-title; you have the option of using
-<phrase arch="x86">a</phrase>
+<phrase arch="any-x86">a</phrase>
<phrase arch="powerpc">an experimental</phrase>
graphical version of the installation system. For more information about
this graphical installer, see <xref linkend="graphical"/>.
@@ -163,8 +168,9 @@
one of the available graphical desktop environments.
If you choose not to select the <quote>Desktop environment</quote> task,
you will only have a relatively basic, command line driven system.
-Installing the Desktop environment task is optional because it requires a
-fairly large amount of disk space, and because many &debian; systems are
+Installing the Desktop environment task is optional because in relation to a
+text-mode-only system it requires a comparatively large amount of disk space
+and because many &debian-gnu; systems are
servers which don't really have any need for a graphical user interface
to do their job.
@@ -172,7 +178,7 @@
Just be aware that the X Window System is completely separate from
<classname>debian-installer</classname>, and in fact is much more
-complicated. Installation and troubleshooting of the X Window
+complicated. Troubleshooting of the X Window
System is not within the scope of this manual.
</para>
en/preparing/pre-install-bios-setup.xml : 64916 -> 67993
Index: en/preparing/pre-install-bios-setup.xml
===================================================================
--- en/preparing/pre-install-bios-setup.xml (Revision 64916)
+++ en/preparing/pre-install-bios-setup.xml (Revision 67993)
@@ -7,11 +7,10 @@
This section will walk you through pre-installation hardware setup, if
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
+this involves checking and possibly changing BIOS/system firmware settings for
+your system. The <quote>BIOS</quote> or <quote>system firmware</quote> is the core software used by the
hardware; it is most critically invoked during the bootstrap process
-(after power-up). Known hardware issues affecting the reliability of
-&debian-gnu; on your system are also highlighted.
+(after power-up).
</para>
@@ -27,12 +26,11 @@
<title>USB BIOS support and keyboards</title>
<para>
-If you have no AT-style keyboard and only a USB model, you may need
-to enable legacy AT keyboard emulation in your BIOS setup. Only do this if
-the installation system fails to use your keyboard in USB mode. Conversely,
-for some systems (especially laptops) you may need to disable legacy USB
-support if your keyboard does not respond.
-Consult your main board manual and look in the BIOS for <quote>Legacy
+If you have no PS/2-style keyboard, but only a USB model, on some
+very old PCs you may need to enable legacy keyboard emulation in your BIOS setup
+to be able to use your keyboard in the bootloader menu, but this is not an issue
+for modern systems. If your keyboard does not work in the bootloader
+menu, consult your mainboard manual and look in the BIOS for <quote>Legacy
keyboard emulation</quote> or <quote>USB keyboard support</quote> options.
</para>
en/preparing/needed-info.xml : 61147 -> 68010
Index: en/preparing/needed-info.xml
===================================================================
--- en/preparing/needed-info.xml (Revision 61147)
+++ en/preparing/needed-info.xml (Revision 68010)
@@ -25,7 +25,7 @@
<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 @@
<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>.
@@ -55,7 +55,7 @@
<itemizedlist arch="x86;sparc;mips;mipsel">
<listitem arch="x86"><para>
-<ulink url="&url-hardware-howto;">Linux Hardware Compatibility HOWTO</ulink>
+<ulink url="&url-debian-wiki-hardware;">The Debian Wiki hardware page</ulink>
</para></listitem>
@@ -80,16 +80,15 @@
<para>
-Installation instructions and device drivers (DASD, XPRAM, Console,
- tape, z90 crypto, chandev, network) for Linux on &arch-title; using
- kernel 2.4
+Documentation of &arch-title;-specific boot sequence, commands and device
+drivers (e.g. DASD, XPRAM, Console, OSA, HiperSockets and z/VM interaction)
</para>
<itemizedlist>
<listitem><para>
-<ulink url="http://oss.software.ibm.com/developerworks/opensource/linux390/docu/l390dd08.pdf";>Device Drivers and Installation Commands</ulink>
+<ulink url="http://public.dhe.ibm.com/software/dw/linux390/docu/lk32dd04.pdf";>Device Drivers, Features, and Commands (Linux Kernel 2.6.32)</ulink>
</para></listitem>
</itemizedlist>
@@ -113,7 +112,7 @@
<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>
@@ -154,7 +153,10 @@
The BIOS setup screens of your computer. You can view these screens
when you start your computer by pressing a combination of keys. Check
-your manual for the combination. Often, it is the <keycap>Delete</keycap> key.
+your manual for the combination. Often, it is the <keycap>Delete</keycap>
+or the <keycap>F2</keycap> key, but some manufacturers use other keys
+or key combinations. Usually upon starting the computer there will
+be a message stating which key to press to enter the setup screen.
</para></listitem>
<listitem><para>
@@ -163,7 +165,7 @@
</para></listitem>
-<listitem arch="x86"><para>
+<listitem arch="any-x86"><para>
The System window in the Windows Control Panel.
@@ -188,7 +190,7 @@
<para>
<table>
-<title>Hardware Information Needed for an Install</title>
+<title>Hardware Information Helpful for an Install</title>
<tgroup cols="2">
<thead>
<row>
@@ -211,6 +213,7 @@
<entry>Partitions where other operating systems are installed.</entry>
</row>
+<!--
<row arch="not-s390">
<entry morerows="5">Monitor</entry>
<entry>Model and manufacturer.</entry>
@@ -222,7 +225,9 @@
<entry>Color depth (number of colors) supported.</entry>
</row>
<row arch="not-s390"><entry>Screen size.</entry></row>
+-->
+<!--
<row arch="not-s390">
<entry morerows="3">Mouse</entry>
<entry>Type: serial, PS/2, or USB.</entry>
@@ -230,28 +235,22 @@
<row arch="not-s390"><entry>Port.</entry></row>
<row arch="not-s390"><entry>Manufacturer.</entry></row>
<row arch="not-s390"><entry>Number of buttons.</entry></row>
+-->
<row arch="not-s390">
- <entry morerows="1">Network</entry>
- <entry>Model and manufacturer.</entry>
+ <entry morerows="0">Network interfaces</entry>
+ <entry>Type/model of available network interfaces.</entry>
</row>
-<row arch="not-s390"><entry>Type of adapter.</entry></row>
<row arch="not-s390">
- <entry morerows="1">Printer</entry>
+ <entry morerows="0">Printer</entry>
<entry>Model and manufacturer.</entry>
</row>
-<row arch="not-s390"><entry>Printing resolutions supported.</entry></row>
<row arch="not-s390">
- <entry morerows="2">Video Card</entry>
- <entry>Model and manufacturer.</entry>
+ <entry morerows="0">Video Card</entry>
+ <entry>Type/model and manufacturer.</entry>
</row>
-<row arch="not-s390"><entry>Video RAM available.</entry></row>
-<row arch="not-s390">
- <entry>Resolutions and color depths supported (these should be
- checked against your monitor's capabilities).</entry>
-</row>
<row arch="s390">
<entry morerows="1">DASD</entry>
@@ -276,58 +275,132 @@
<para>
-Many brand name products work without trouble on Linux. Moreover,
-hardware support in Linux is improving daily. However, Linux still does
+Many products work without trouble on &arch-kernel;. Moreover,
+hardware support in &arch-kernel; is improving daily. However, &arch-kernel; still does
not run as many different types of hardware as some operating systems.
-</para><para arch="x86">
+</para><para>
-In particular, Linux usually cannot run hardware that requires a
-running version of Windows to work.
+Drivers in &arch-kernel; in most cases are not written for a certain
+<quote>product</quote> or <quote>brand</quote> from a specific manufacturer, but for a certain
+hardware/chipset. Many seemingly
+different products/brands are based on the same hardware design; it is not
+uncommon that chip manufacturers provide so-called <quote>reference designs</quote> for
+products based on their chips which are then used by several different
+device manufacturers and sold under lots of different product or brand
+names.
-</para><para arch="x86">
+</para><para>
-Although some Windows-specific hardware can be made to run on Linux,
-doing so usually requires extra effort. In addition, Linux drivers
-for Windows-specific hardware are usually specific to one Linux
-kernel. Therefore, they can quickly become obsolete.
+This has advantages and disadvantages. An advantage is that a driver for one
+chipset works with lots of different products from different manufacturers,
+as long as their product is based on the same chipset. The disadvantage is
+that it is not always easy to see which actual chipset is used in a certain
+product/brand. Unfortunately sometimes device manufacturers change the
+hardware base of their product without changing the product name or at least
+the product version number, so that when having two items of the same
+brand/product name bought at different times, they can sometimes be based on
+two different chipsets and therefore use two different drivers or there
+might be no driver at all for one of them.
-</para><para arch="x86">
+</para><para>
-So called win-modems are the most common type of this hardware.
-However, printers and other equipment may also be Windows-specific.
+For USB and PCI/PCI-Express/ExpressCard devices, a good way to find out on
+which chipset they are based is to look at their device IDs. All
+USB/PCI/PCI-Express/ExpressCard devices have so called <quote>vendor</quote> and
+<quote>product</quote> IDs, and the combination of these two is usually the same for any
+product based on the same chipset.
</para><para>
-You can check hardware compatibility by:
+On Linux systems, these IDs can be read with the <command>lsusb</command>
+command for USB devices and with the <command>lspci -nn</command> command for
+PCI/PCI-Express/ExpressCard devices. The vendor and product IDs are usually
+given in the form of two hexadecimal numbers, seperated by a colon, such as
+<quote>1d6b:0001</quote>.
-<itemizedlist>
-<listitem><para>
+</para><para>
-Checking manufacturers' web sites for new drivers.
+An example for the output of <command>lsusb</command>: <quote>Bus 001
+Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub</quote>, whereby 1d6b is
+the vendor ID and 0002 is the product ID.
-</para></listitem>
-<listitem><para>
+</para><para>
-Looking at web sites or manuals for information about emulation.
-Lesser known brands can sometimes use the drivers or settings for
-better-known ones.
+An example for the output of <command>lspci -nn</command> for an Ethernet
+card: <quote>03:00.0 Ethernet controller [0200]: Realtek Semiconductor Co., Ltd.
+RTL8111/8168B PCI Express Gigabit Ethernet controller [10ec:8168] (rev 06)</quote>.
+The IDs are given inside the rightmost square brackets, i.e. here
+10ec is the vendor- and 8168 is the product ID.
-</para></listitem>
-<listitem><para>
+</para><para>
-Checking hardware compatibility lists for Linux on web sites
-dedicated to your architecture.
+As another example, a graphics card could give the following output:
+<quote>04:00.0 VGA compatible controller [0300]: Advanced Micro Devices [AMD] nee
+ATI RV710 [Radeon HD 4350] [1002:954f]</quote>.
-</para></listitem>
-<listitem><para>
+</para><para>
-Searching the Internet for other users' experiences.
+On Windows systems, the IDs for a device can be found in the Windows device
+manager on the tab <quote>details</quote>, where the vendor ID is prefixed with VEN_
+and the product ID is prefixed with DEV_.
-</para></listitem>
-</itemizedlist>
+On Windows 7 systems, you have to select the property <quote>Hardware IDs</quote> in the
+device manager's details tab to actually see the IDs, as they are not
+displayed by default.
+</para><para>
+
+Searching on the internet with the vendor/product ID, <quote>&arch-kernel;</quote> and
+<quote>driver</quote> as the search terms often results in information regarding
+the driver support status for a certain chipset. If a search for the
+vendor/product ID does not yield usable results, a search for the chip
+code names, which are also often provided by lsusb and lspci
+(<quote>RTL8111</quote>/<quote>RTL8168B</quote> in the network card example and <quote>RV710</quote> in the
+graphics card example), can help.
+
</para>
+
+ <sect3>
+ <title>Testing hardware compatibility with a Live-System</title>
+
+<para>
+
+&debian-gnu; is also available as a so-called <quote>live system</quote> for certain
+architectures. A live system is a preconfigured ready-to-use system
+in a compressed format that can be booted and used from a read-only medium
+like a CD or DVD. Using it by default does not create any permanent changes
+on your computer. You can change user settings and install additional
+programs from within the live system, but all this only happens in the
+computer's RAM, i.e. if you turn off the computer and boot the live system
+again, everything is reset to its defaults. If you want to see whether
+your hardware is supported by &debian-gnu;, the easiest way is to run a
+&debian; live system on it and try it out.
+
+</para><para>
+
+There are a few limitations in using a live system. The first is that as
+all changes you do within the live system must be held in your computer's
+RAM, this only works on systems with enough RAM to do that, so installing
+additional large software packages may fail due to memory constraints.
+Another limitation with regards to hardware compatibility testing is
+that the official &debian-gnu; live system contains only free components,
+i.e. there are no non-free firmware files included in it. Such non-free
+packages can of course be installed manually within the system, but there
+is no automatic detection of required firmware files like in the &d-i;,
+so installation of non-free components must be done manually if needed.
+
+</para><para>
+
+Information about the available variants of the &debian; live images
+can be found at the <ulink url="&url-debian-live-cd;">Debian Live Images website</ulink>.
+
+</para>
+
+
+ </sect3>
+
+
</sect2>
<sect2>
@@ -335,9 +408,10 @@
<para>
-If your computer is connected to a network 24 hours a day (i.e., an
-Ethernet or equivalent connection — not a PPP connection), you
-should ask your network's system administrator for this information.
+If your computer is connected to a fixed network (i.e. an Ethernet or
+equivalent connection — not a dialup/PPP connection) which is
+administered by somebody else, you should ask your network's system
+administrator for this information:
<itemizedlist>
<listitem><para>
@@ -376,24 +450,39 @@
</para><para>
-On the other hand, if your administrator tells you that a DHCP server
-is available and is recommended, then you don't need this information
+If the network you are connected to uses DHCP (Dynamic Host Configuration
+Protocol) for configuring network settings, you don't need this information
because the DHCP server will provide it directly to your computer
during the installation process.
</para><para>
-If you use a wireless network, you should also find out:
+If you have internet access via DSL or cable modem (i.e. over a cable tv
+network) and have a router (often provided preconfigured by your phone or
+catv provider) which handles your network connectivity, DHCP is usually
+available by default.
+
+</para><para arch="x86">
+
+As a rule of thumb: if you run a Windows system in your home network and did
+not have to manually perform any network settings there to achieve Internet
+access, network connectivity in &debian-gnu; will also be configured
+automatically.
+
+</para><para arch="not-s390">
+
+If you use a WLAN/WiFi network, you should find out:
+
<itemizedlist>
<listitem><para>
-ESSID of your wireless network.
+The ESSID (<quote>network name</quote>) of your wireless network.
</para></listitem>
<listitem><para>
-WEP security key (if applicable).
+The WEP or WPA/WPA2 security key to access the network (if applicable).
</para></listitem>
</itemizedlist>
en/preparing/non-debian-partitioning.xml : 61147 -> 67998
Index: en/preparing/non-debian-partitioning.xml
===================================================================
--- en/preparing/non-debian-partitioning.xml (Revision 61147)
+++ en/preparing/non-debian-partitioning.xml (Revision 67998)
@@ -20,26 +20,27 @@
If you already have an operating system on your system
-<phrase arch="x86">
-(Windows 9x, Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, …)
+<phrase arch="any-x86">
+(Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, …)
</phrase>
<phrase arch="s390">
(VM, z/OS, OS/390, …)
</phrase>
-and want to stick Linux on the same disk, you will need to repartition
-the disk. Debian requires its own hard disk partitions. It cannot be
+which uses the whole disk and you want to stick &debian; on the same disk, you will need to repartition
+it. &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 Linux systems, but that's not covered here. At
-the very least you will need a dedicated partition for the Debian
-root.
+partitions with other Unix systems, but that's not covered here. At
+the very least you will need a dedicated partition for the &debian;
+root filesystem.
</para><para>
You can find information about your current partition setup by using
a partitioning tool for your current operating system<phrase
-arch="x86">, such as fdisk or PartitionMagic</phrase><phrase
+arch="any-x86">, such as the integrated Disk Manager in Windows or fdisk in
+DOS</phrase><phrase
arch="powerpc">, such as Drive Setup, HD Toolkit, or MacTools</phrase><phrase
arch="s390">, such as the VM diskmap</phrase>. Partitioning tools always
provide a way to show existing partitions without making changes.
@@ -52,66 +53,50 @@
house, you would probably want to move all the furniture out of the
way before moving a wall or you risk destroying it.
-</para><para arch="hppa" condition="FIXME">
-
-<emphasis>FIXME: write about HP-UX disks?</emphasis>
-
</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
-partition that disk before booting the installation system; the
-installer's included partitioning program can handle the job nicely.
+Several modern operating systems offer the ability to move and resize
+certain existing partitions without destroying their contents. This allows
+making space for additional partitions without losing existing data. Even
+though this works quite well in most cases, making changes to the
+partitioning of a disk is an inherently dangerous action and should only be
+done after having made a full backup of all data.
+<phrase arch="any-x86">For FAT/FAT32 and NTFS partitions as used by DOS and
+Windows systems, the ability to move and resize them losslessly is provided
+both by &d-i; as well as by the integrated Disk Manager of Windows
+7. </phrase>
-</para><para>
+</para>
-If your machine has only one hard disk, and you would like to
-completely replace the current operating system with &debian;,
-you also can wait to partition as part of the installation process
-(<xref linkend="di-partition"/>), after you have booted the
-installation system. However this only works if you plan to boot the
-installer system from tapes, CD-ROM or files on a connected machine.
-Consider: if you boot from files placed on the hard disk, and then
-partition that same hard disk within the installation system, thus
-erasing the boot files, you'd better hope the installation is
-successful the first time around. At the least in this case, you
-should have some alternate means of reviving your machine like the
-original system's installation tapes or CDs.
+<para arch="x86">
+To losslessly resize an existing FAT or NTFS partition from within &d-i;, go
+to the partitioning step, select the option for manual partitioning, select
+the partition to resize, and simply specify its new size.
+</para>
-</para><para>
+<para arch="hppa" condition="FIXME">
-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
-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
-anyway.
+<emphasis>FIXME: write about HP-UX disks?</emphasis>
-</para><para arch="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
-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
-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;
-using another operating system's tools. Instead, you should just
-create the native operating system's partitions you will want to
-retain.
-
+Creating and deleting partitions can be done from within &d-i; as
+well as from an existing operating system. As a rule of thumb,
+partitions should be created by the system for which they are to
+be used, i.e. partitions to be used by &debian-gnu; should be
+created from within &d-i; and partitions to be used from another
+operating system should be created from there. &d-i; is
+capable of creating non-&arch-kernel; partitions, and partitions created
+this way usually work without problems when used in other operating
+systems, but there are a few rare corner cases in which this could
+cause problems, so if you want to be sure, use the native partitioning
+tools to create partitions for use by other operating systems.
</para><para>
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
-Linux installation. Windows and other OS installations may destroy
-your ability to start Linux, or encourage you to reformat non-native
+the &debian; installation. Windows and other OS installations may destroy
+your ability to start &debian;, or encourage you to reformat non-native
partitions.
</para><para>
@@ -121,21 +106,24 @@
</para><para arch="powerpc">
-In order for OpenFirmware to automatically boot &debian; the Linux
+In order for OpenFirmware to automatically boot &debian-gnu; the &arch-parttype;
partitions should appear before all other partitions on the disk,
especially MacOS boot partitions. This should be kept in mind when
-pre-partitioning; you should create a Linux placeholder partition to
+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 Linux partition
-tools later during the actual install, and replace it with Linux
+bootable.) You can delete the placeholder with the &debian; partition
+tools later during the actual install, and replace it with &arch-parttype;
partitions.
-</para><para>
+</para>
+<!-- paragraph scheduled for removal
+<para>
+
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>
@@ -157,7 +145,7 @@
Use the native partitioning tools to create native system
partition(s). Leave either a place holder partition or free space for
-&debian;.
+&debian-gnu;.
</para></listitem>
<listitem><para>
@@ -168,19 +156,26 @@
<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>
</para>
+-->
+<!-- &nondeb-part-x86.xml; currently includes only outdated information;
+ don't use it for building the manual.
+
&nondeb-part-x86.xml;
+
+-->
+
&nondeb-part-sparc.xml;
&nondeb-part-powerpc.xml;
en/preparing/backup.xml : 64829 -> 67991
Index: en/preparing/backup.xml
===================================================================
--- en/preparing/backup.xml (Revision 64829)
+++ en/preparing/backup.xml (Revision 67991)
@@ -6,12 +6,12 @@
<para>
Before you start, make sure to back up every file that is now on your
-system. If this is the first time a non-native operating system has
-been installed on your computer, it's quite likely you will need to
+system. If this is the first time a non-native operating system is going
+to be installed on your computer, it is quite likely you will need to
re-partition your disk to make room for &debian-gnu;. Anytime you
partition your disk, you run a risk of losing everything on the
disk, no matter what program you use to do it. The programs used in
-installation are quite reliable and most have seen years of use; but
+the installation are quite reliable and most have seen years of use; but
they are also quite powerful and a false move can cost you. Even after
backing up, be careful and think about your answers and actions. Two
minutes of thinking can save hours of unnecessary work.
@@ -20,11 +20,12 @@
If you are creating a multi-boot system, make sure that you have the
distribution media of any other present operating systems on hand.
-Especially if you repartition your boot drive, you might find that you
-have to reinstall your operating system's boot loader, or in many
-cases the whole operating system itself and all files on the affected
-partitions.
+Even though this is normally not necessary, there might be situations
+in which you could be required to reinstall your operating system's boot
+loader to make the system boot or in a worst case even have to reinstall the
+complete operating system and restore your previously made backup.
+
</para>
</sect1>
en/preparing/bios-setup/i386.xml : 56425 -> 68479
Index: en/preparing/bios-setup/i386.xml
===================================================================
--- en/preparing/bios-setup/i386.xml (Revision 56425)
+++ en/preparing/bios-setup/i386.xml (Revision 68479)
@@ -1,337 +1,81 @@
<!-- retain these comments for translator revision tracking -->
<!-- $Id$ -->
-<!-- This section is heavily outdated. It only really describes
- older BIOSes and not the current situation. Most of it is not
- really relevant for AMD64, but a general description would be.
- File should be renamed to x86.xml if a more general text is
- written. -->
+ <sect2 arch="any-x86" id="bios-setup"><title>Invoking the BIOS Set-Up Menu</title>
- <sect2 arch="x86" id="bios-setup"><title>Invoking the BIOS Set-Up Menu</title>
-
<para>
-BIOS provides the basic functions needed to boot your machine to allow
-your operating system to access your hardware. Your system probably
+The BIOS provides the basic functions needed to boot your machine and
+to allow your operating system to access your hardware. Your system
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.
+To enter the BIOS setup menu you have to press a key or key combination
+after turning on the computer. Often it is the <keycap>Delete</keycap>
+or the <keycap>F2</keycap> key, but some manufacturers use other keys.
+Usually upon starting the computer there will be a message
+stating which key to press to enter the setup screen.
-</para><para>
-
-The rest of this section is lifted from the
-<ulink url="&url-pc-hw-faq;"></ulink>, answering the question, <quote>How do I
-enter the CMOS configuration menu?</quote>. How you access the BIOS (or
-<quote>CMOS</quote>) configuration menu depends on who wrote your BIOS
-software:
-
</para>
-
-<!-- From: burnesa@cat.com (Shaun Burnet) -->
-<variablelist>
-
-<varlistentry>
- <term>AMI BIOS</term>
- <listitem><para>
-
-<keycap>Delete</keycap> key during the POST (power on self test)
-
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>Award BIOS</term>
- <listitem><para>
-
-<keycombo>
- <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap>
-</keycombo>, or <keycap>Delete</keycap> key during the POST
-
-</para></listitem>
-</varlistentry>
-
-<varlistentry><term>DTK BIOS</term>
- <listitem><para>
-
-<keycap>Esc</keycap> key during the POST
-
-</para></listitem>
-</varlistentry>
-
-<varlistentry><term>IBM PS/2 BIOS</term>
- <listitem><para>
-
-<keycombo>
- <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Insert</keycap>
-</keycombo>
-after
-<keycombo>
- <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Delete</keycap>
-</keycombo>
-
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>Phoenix BIOS</term>
- <listitem><para>
-
-<keycombo>
- <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap>
-</keycombo>
-or
-<keycombo>
- <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>S</keycap>
-</keycombo>
-or
-<keycap>F1</keycap>
-
-</para></listitem>
-</varlistentry>
-</variablelist>
-
-<para>
-
-Information on invoking other BIOS routines can be found in
-<ulink url="&url-invoking-bios-info;"></ulink>.
-
-</para><para>
-
-Some &arch-title; machines don't have a CMOS configuration menu in the
-BIOS. They require a software CMOS setup program. If you don't have
-the Installation and/or Diagnostics diskette for your machine, you can
-try using a shareware/freeware program. Try looking in
-<ulink url="&url-simtel;"></ulink>.
-
-</para>
</sect2>
+
+ <sect2 arch="any-x86" id="boot-dev-select"><title>Boot Device Selection</title>
- <sect2 arch="x86" id="boot-dev-select"><title>Boot Device Selection</title>
-
<para>
-Many BIOS setup menus allow you to select the devices that will be
-used to bootstrap the system. Set this to look for a bootable
-operating system on <filename>A:</filename> (the first floppy disk),
-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.
+Within the BIOS setup menu, you can select which devices shall be
+checked in which sequence for a bootable operating system. Possible choices
+usually include the internal harddisks, the CD/DVD-ROM drive and USB mass storage
+devices such as USB sticks or external USB harddisks. On modern systems there
+is also often a possibility to enable network booting via PXE.
</para><para>
-If you have a newer SCSI controller and you have a CD-ROM device
-attached to it, you are usually able to boot from the CD-ROM. All you
-have to do is enable booting from a CD-ROM in the SCSI-BIOS of your
-controller.
+Depending on the installation media (CD/DVD ROM, USB stick, network boot)
+you have chosen you should enable the appropriate boot devices if they
+are not already enabled.
</para><para>
-Another popular option is to boot from a USB storage device (also called
-a USB memory stick or USB key). Some BIOSes can boot directly from a USB
-storage device, but some cannot. You may need to configure your BIOS to boot
-from a <quote>Removable drive</quote> or even from <quote>USB-ZIP</quote> to
-get it to boot from the USB device.
+Most BIOS versions allow to call up a boot menu on system startup in
+which you select from which device the computer should start for the
+current session. If this option is available, the BIOS usually displays
+a short message like <quote>press <keycap>F12</keycap> for boot
+menu</quote> on system startup.
+The actual key used to select this menu varies from system to system;
+commonly used keys are <keycap>F12</keycap>, <keycap>F11</keycap> and
+<keycap>F8</keycap>. Choosing a device from this menu does not change
+the default boot order of the BIOS, i.e. you can start once from a
+USB stick while having configured the internal harddisk as the normal
+primary boot device.
</para><para>
-Here are some details about how to set the boot order. Remember to
-reset the boot order after Linux is installed, so that you restart
-your machine from the hard drive.
+If your BIOS does not provide you with a boot menu to do ad-hoc choices
+of the current boot device, you have to change your BIOS setup to make
+the device from which the &d-i; shall be booted the primary boot device.
-</para>
-
- <sect3 id="ctbooi">
- <title>Changing the Boot Order on IDE Computers</title>
-
-<orderedlist>
-<listitem><para>
-
-As your computer starts, press the keys to enter the BIOS
-utility. Often, it is the <keycap>Delete</keycap> key. However,
-consult the hardware documentation for the exact keystrokes.
-
-</para></listitem>
-<listitem><para>
-
-Find the boot sequence in the setup utility. Its location depends on
-your BIOS, but you are looking for a field that lists drives.
-
</para><para>
+Unfortunately some computers contain buggy BIOS versions. Booting &d-i; from
+a USB stick might not work even if there is an appropriate option in the
+BIOS setup menu and the stick is selected as the primary boot device. On
+some of these systems using a USB stick as boot medium is impossible; others
+can be tricked into booting from the stick by changing the device type in
+the BIOS setup from the default <quote>USB harddisk</quote> or <quote>USB
+stick</quote> to <quote>USB ZIP</quote> or <quote>USB CDROM</quote>.
+<phrase condition="isohybrid-supported">
+In particular if you use an isohybrid CD/DVD image on a USB stick
+(see <xref linkend="usb-copy-isohybrid"/>), changing the device type to
+<quote>USB CDROM</quote> helps on some BIOSes which will not boot from a USB stick in
+USB harddisk mode.</phrase>
-Common entries on IDE machines are C, A, cdrom or A, C, cdrom.
-
</para><para>
+If you cannot manipulate the BIOS to boot directly from a USB stick you
+still have the option of using an ISO copied to the stick. Boot &d-i;
+using <xref linkend="boot-drive-files"/> and, after scanning the hard
+drives for an installer ISO image, select the USB device and choose an
+installation image.
-C is the hard drive, and A is the floppy drive.
-
-</para></listitem>
-<listitem><para>
-
-Change the boot sequence setting so that the CD-ROM or the
-floppy is first. Usually, the <keycap>Page Up</keycap> or
-<keycap>Page Down</keycap> keys cycle
-through the possible choices.
-
-</para></listitem>
-<listitem><para>
-
-Save your changes. Instructions on the screen tell you how to
-save the changes on your computer.
-
-</para></listitem>
-</orderedlist>
- </sect3>
-
- <sect3 id="ctboos">
- <title>Changing the Boot Order on SCSI Computers</title>
-<para>
-
-<orderedlist>
-<listitem><para>
-
-As your computer starts, press the keys to enter the SCSI setup
-utility.
-
-</para><para>
-
-You can start the SCSI setup utility after the memory check and
-the message about how to start the BIOS utility displays when you
-start your computer.
-
-</para><para>
-
-The keystrokes you need depend on the utility. Often, it is
-<keycombo><keycap>Ctrl</keycap><keycap>F2</keycap></keycombo>.
-However, consult your hardware documentation for the
-exact keystrokes.
-
-</para></listitem>
-<listitem><para>
-
-Find the utility for changing the boot order.
-
-</para></listitem>
-<listitem><para>
-
-Set the utility so that the SCSI ID of the CD drive is first on
-the list.
-
-</para></listitem>
-<listitem><para>
-
-Save your changes. Instructions on the screen tell you how to
-save the changes on your computer. Often, you must press
-<keycap>F10</keycap>.
-
-</para></listitem>
-</orderedlist>
-
</para>
- </sect3>
</sect2>
- <sect2 arch="x86">
- <title>Miscellaneous BIOS Settings</title>
-
- <sect3 id="cd-settings"><title>CD-ROM Settings</title>
-<para>
-
-Some BIOS systems (such as Award BIOS) allow you to automatically set
-the CD speed. You should avoid that, and instead set it to, say, the
-lowest speed. If you get <userinput>seek failed</userinput> error
-messages, this may be your problem.
-
-</para>
- </sect3>
-
- <sect3><title>Extended vs. Expanded Memory</title>
-<para>
-
-If your system provides both ex<emphasis>ten</emphasis>ded and
-ex<emphasis>pan</emphasis>ded memory, set it so that there is as much
-extended and as little expanded memory as possible. Linux requires
-extended memory and cannot use expanded memory.
-
-</para>
- </sect3>
-
- <sect3><title>Virus Protection</title>
-<para>
-
-Disable any virus-warning features your BIOS may provide. If you have
-a virus-protection board or other special hardware, make sure it is
-disabled or physically removed while running GNU/Linux. These aren't
-compatible with GNU/Linux; moreover, due to the file system
-permissions and protected memory of the Linux kernel, viruses are
-almost unheard of<footnote>
-<para>
-
-After installation you can enable Boot Sector protection if you
-want. This offers no additional security in Linux but if you also run
-Windows it may prevent a catastrophe. There is no need to tamper with
-the Master Boot Record (MBR) after the boot manager has been set up.
-
-</para>
-</footnote>.
-
-</para>
- </sect3>
-
- <sect3><title>Shadow RAM</title>
-<para>
-
-Your motherboard may provide <emphasis>shadow RAM</emphasis> or BIOS
-caching. You may see settings for <quote>Video BIOS Shadow</quote>,
-<quote>C800-CBFF Shadow</quote>, etc. <emphasis>Disable</emphasis>
-all shadow RAM. Shadow
-RAM is used to accelerate access to the ROMs on your motherboard and
-on some of the controller cards. Linux does not use these ROMs once it
-has booted because it provides its own faster 32-bit software in place
-of the 16-bit programs in the ROMs. Disabling the shadow RAM may make
-some of it available for programs to use as normal memory. Leaving
-the shadow RAM enabled may interfere with Linux access to hardware
-devices.
-
-</para>
- </sect3>
-
- <sect3><title>Memory Hole</title>
-<para>
-
-If your BIOS offers something like <quote>15–16 MB Memory
-Hole</quote>, please disable that. Linux expects to find memory there if
-you have that much RAM.
-
-</para><para>
-
-We have a report of an Intel Endeavor motherboard on which there is an
-option called <quote>LFB</quote> or <quote>Linear Frame Buffer</quote>.
-This had two settings: <quote>Disabled</quote> and <quote>1
-Megabyte</quote>. Set it to <quote>1 Megabyte</quote>.
-When disabled, the installation floppy was not read correctly, and the
-system eventually crashed. At this writing we don't understand what's
-going on with this particular device — it just worked with that
-setting and not without it.
-
-</para>
- </sect3>
-
-<!-- no other platforms other than x86 provide this sort of thing, AFAIK -->
-
- <sect3><title>Advanced Power Management</title>
-<para>
-
-If your motherboard provides Advanced Power Management (APM),
-configure it so that power management is controlled by APM. Disable
-the doze, standby, suspend, nap, and sleep modes, and disable the hard
-disk's power-down timer. Linux can take over control of these modes,
-and can do a better job of power-management than the BIOS.
-
-</para>
- </sect3>
- </sect2>
en/preparing/bios-setup/s390.xml : 64994 -> 66909
Index: en/preparing/bios-setup/s390.xml
===================================================================
--- en/preparing/bios-setup/s390.xml (Revision 64994)
+++ en/preparing/bios-setup/s390.xml (Revision 66909)
@@ -75,8 +75,9 @@
sub-directory to your CMS disk. Be sure to transfer
<filename>kernel.debian</filename> and
<filename>initrd.debian</filename> in binary mode with a fixed record
-length of 80 characters. <filename>parmfile.debian</filename> can
-be in either ASCII or EBCDIC format.
+length of 80 characters (by specifying <userinput>BINARY</userinput> and <userinput>LOCSITE
+FIX 80</userinput> in your FTP client). <filename>parmfile.debian</filename> can be
+in either ASCII or EBCDIC format.
A sample <filename>debian.exec</filename> script, which will punch the files in
the proper order, is included with the images.
en/preparing/nondeb-part/x86.xml : 43576 -> 65195
Index: en/preparing/nondeb-part/x86.xml
===================================================================
--- en/preparing/nondeb-part/x86.xml (Revision 43576)
+++ en/preparing/nondeb-part/x86.xml (Revision 65195)
@@ -2,13 +2,13 @@
<!-- $Id$ -->
- <sect2 arch="x86"><title>Partitioning From DOS or Windows</title>
+ <sect2 arch="any-x86"><title>Partitioning From DOS or Windows</title>
<para>
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 Linux 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 @@
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 @@
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, 2003, Vista, 7), 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 @@
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>
@@ -60,9 +60,8 @@
</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
-mirror. Unzip the archive and copy the files
+The first thing needed is a copy of <command>fips</command>.
+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
be created using the command <filename>sys a:</filename> under DOS.
@@ -100,7 +99,7 @@
<para>
If you are partitioning for DOS drives, or changing the size of DOS
-partitions, using Linux 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 +109,7 @@
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 Linux:
+the following command from &debian;:
<informalexample><screen>
# dd if=/dev/zero of=/dev/hdXX bs=512 count=4
en/boot-installer/parameters.xml : 65799 -> 68161
Index: en/boot-installer/parameters.xml
===================================================================
--- en/boot-installer/parameters.xml (Revision 65799)
+++ en/boot-installer/parameters.xml (Revision 68161)
@@ -25,26 +25,10 @@
common gotchas are included below in
<xref linkend="boot-troubleshooting"/>.
-</para><para arch="linux-any">
+</para>
-When the kernel boots, a message
+<para arch="linux-any" condition="supports-serial-console">
-<informalexample><screen>
-Memory:<replaceable>avail</replaceable>k/<replaceable>total</replaceable>k available
-</screen></informalexample>
-
-should be emitted early in the process.
-<replaceable>total</replaceable> should match the total amount of RAM,
-in kilobytes. If this doesn't match the actual amount of RAM you have
-installed, you need to use the
-<userinput>mem=<replaceable>ram</replaceable></userinput> parameter,
-where <replaceable>ram</replaceable> is set to the amount of memory,
-suffixed with <quote>k</quote> for kilobytes, or <quote>m</quote> for
-megabytes. For example, both <userinput>mem=65536k</userinput> and
-<userinput>mem=64m</userinput> mean 64MB of RAM.
-
-</para><para arch="linux-any" condition="supports-serial-console">
-
If you are booting with a serial console, generally the kernel will
autodetect this.
If you have a videocard (framebuffer) and a keyboard also attached to
@@ -53,8 +37,8 @@
<userinput>console=<replaceable>device</replaceable></userinput>
argument to the kernel, where <replaceable>device</replaceable> is
your serial device, which is usually something like
-<filename>ttyS0</filename><footnote>
-
+<filename>ttyS0</filename>.
+<footnote>
<para>
In order to ensure the terminal type used by the installer matches your
terminal emulator, the parameter
@@ -62,10 +46,14 @@
Note that the installer only supports the following terminal types:
<literal>linux</literal>, <literal>bterm</literal>, <literal>ansi</literal>,
<literal>vt102</literal> and <literal>dumb</literal>. The default for
-serial console in &d-i; is <userinput>vt102</userinput>.
+serial console in &d-i; is <userinput>vt102</userinput>. If you are using a
+virtualization tool which does not provide conversion into such terminals types
+itself, e.g. QEMU/KVM, you can start it inside a <command>screen</command>
+session. That will indeed perform translation into the <literal>screen</literal>
+terminal type, which is very close to <literal>vt102</literal>.
</para>
-</footnote>.
+</footnote>
</para><para arch="sparc">
@@ -150,9 +138,11 @@
The default frontend is <userinput>DEBIAN_FRONTEND=newt</userinput>.
<userinput>DEBIAN_FRONTEND=text</userinput> may be preferable for
-serial console installs. Generally, only the
-<userinput>newt</userinput> frontend is available on default install
-media. On architectures that support it, the graphical installer uses
+serial console installs. Some specialized types of install media may
+only offer a limited selection of frontends, but the
+<userinput>newt</userinput> and <userinput>text</userinput> frontends
+are available on most default install media.
+On architectures that support it, the graphical installer uses
the <userinput>gtk</userinput> frontend.
</para></listitem>
@@ -216,7 +206,21 @@
</para></listitem>
</varlistentry>
+
<varlistentry>
+<term>log_host</term>
+<term>log_port</term>
+<listitem><para>
+
+Causes the installer to send log messages to a remote syslog on the
+specified host and port as well as to a local file. If not specified, the
+port defaults to the standard syslog port 514.
+
+</para></listitem>
+</varlistentry>
+
+
+<varlistentry>
<term>lowmem</term>
<listitem><para>
en/boot-installer/arm.xml : 64916 -> 67373
Index: en/boot-installer/arm.xml
===================================================================
--- en/boot-installer/arm.xml (Revision 64916)
+++ en/boot-installer/arm.xml (Revision 67373)
@@ -19,100 +19,6 @@
&boot-installer-intro-firmware.xml;
- <sect3 arch="arm" id="boot-firmware-nslu2"><title>Booting the NSLU2</title>
-<para>
-
-There are three ways how to put the installer firmware into flash:
-
-</para>
-
- <sect4 arch="arm"><title>Using the NSLU2 web interface</title>
-<para>
-
-Go to the administration section and choose the menu item
-<literal>Upgrade</literal>. You can then browse your disk for the
-installer image you have previously downloaded. Then press the
-<literal>Start Upgrade</literal> button, confirm, wait for a few minutes
-and confirm again. The system will then boot straight into the installer.
-
-</para>
- </sect4>
-
- <sect4 arch="arm"><title>Via the network using Linux/Unix</title>
-<para>
-
-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;.
-
-First, you have to put your NSLU2 in upgrade mode:
-
-<orderedlist>
-<listitem><para>
-
-Disconnect any disks and/or devices from the USB ports.
-
-</para></listitem>
-<listitem><para>
-
-Power off the NSLU2
-
-</para></listitem>
-<listitem><para>
-
-Press and hold the reset button (accessible through the small hole on the
-back just above the power input).
-
-</para></listitem>
-<listitem><para>
-
-Press and release the power button to power on the NSLU2.
-
-</para></listitem>
-<listitem><para>
-
-Wait for 10 seconds watching the ready/status LED. After 10 seconds it
-will change from amber to red. Immediately release the reset button.
-
-</para></listitem>
-<listitem><para>
-
-The NSLU2 ready/status LED will flash alternately red/green (there is a 1
-second delay before the first green). The NSLU2 is now in upgrade mode.
-
-</para></listitem>
-</orderedlist>
-
-See the <ulink
-url="http://www.nslu2-linux.org/wiki/OpenSlug/UsingTheBinary";>NSLU2-Linux
-pages</ulink> if you have problems with this.
-
-Once your NSLU2 is in upgrade mode, you can flash the new image:
-
-<informalexample><screen>
-sudo upslug2 -i di-nslu2.bin
-</screen></informalexample>
-
-Note that the tool also shows the MAC address of your NSLU2, which may come
-in handy to configure your DHCP server. After the whole image has been
-written and verified, the system will automatically reboot. Make sure you
-connect your USB disk again now, otherwise the installer won't be able to
-find it.
-
-</para>
- </sect4>
-
- <sect4 arch="arm"><title>Via the network using Windows</title>
-<para>
-
-There is <ulink
-url="http://www.everbesthk.com/8-download/sercomm/firmware/all_router_utility.zip";>a
-tool</ulink> for Windows to upgrade the firmware via the network.
-
-</para>
- </sect4>
- </sect3>
-
<sect3 arch="arm" id="boot-firmware-ss4000e">
<title>Booting the SS4000-E</title>
<para>
@@ -213,7 +119,7 @@
</para><para>
This will seemingly restart the machine; but in reality, it loads
-reboot to RAM and restarts it from there. Not doing this step will cause
+redboot to RAM and restarts it from there. Not doing this step will cause
the system to hang in the necessary ip_address step that comes next.
</para><para>
en/boot-installer/accessibility.xml : 64664 -> 68473
Index: en/boot-installer/accessibility.xml
===================================================================
--- en/boot-installer/accessibility.xml (Revision 64664)
+++ en/boot-installer/accessibility.xml (Revision 68473)
@@ -8,7 +8,8 @@
Some users may need specific support because of e.g. some visual
impairment.
<phrase arch="ia64;powerpc;x86">USB braille displays are detected
-automatically, but most other</phrase>
+automatically (not serial displays connected via a serial-to-USB converter),
+but most other</phrase>
<phrase arch="arm;hppa;mips;mipsel;sparc">Most</phrase>
accessibility features have to be enabled manually.
<phrase arch="x86">On machines that support it, the boot menu emits a beep
@@ -47,12 +48,12 @@
boot parameter to tell <classname>brltty</classname> which driver it
should use. <replaceable>driver</replaceable> should be replaced by the
two-letter driver code for your terminal (see the
-<ulink url="&url-brltty-driver-codes;">driver code list</ulink>).
+<ulink url="&url-brltty-manual;">BRLTTY manual</ulink>).
<replaceable>port</replaceable> should be replaced by the name of the
serial port the display is connected to, <userinput>ttyS0</userinput> is
-the default. <replaceable>table</replaceable> is the name of the braille
-table to be used (see the <ulink url="&url-brltty-table-codes;">table code
-list</ulink>); the English table is the default. Note that the table can
+the default, <userinput>ttyUSB0</userinput> can be typically used when using a serial-to-USB converter. <replaceable>table</replaceable> is the name of the
+braille table to be used (see the <ulink url="&url-brltty-manual;">BRLTTY
+manual</ulink>); the English table is the default. Note that the table can
be changed later by entering the preference menu. Documentation on key
bindings for braille devices is available on the <ulink
url="&url-brltty-driver-help;"><classname>brltty</classname> website</ulink>.
@@ -60,13 +61,50 @@
</para>
</sect2>
+
<sect2 arch="x86">
+ <title>Software Speech Synthesis</title>
+<para>
+
+Support for software speech synthesis is available on all installer images which
+have the graphical installer, i.e. all netinst, CD and DVD images, and the
+netboot gtk variant. It can be activated by selecting it in the
+boot menu by typing <userinput>s</userinput> &enterkey;. The textual version
+of the installer will then be automatically selected, and support for software
+speech synthesis will be automatically installed on the target system.
+
+</para><para>
+
+The first question (language) is spoken in english, and the remainder
+of installation is spoken in the selected language (if available in
+<classname>espeak</classname>).
+
+</para><para>
+
+The default speech rate is quite slow. To make it faster, press
+<keycombo><keycap>CapsLock</keycap><keycap>6</keycap></keycombo>.
+To make it slower, press
+<keycombo><keycap>CapsLock</keycap><keycap>5</keycap></keycombo>.
+
+The default volume should be medium. To make it louder, press
+<keycombo><keycap>CapsLock</keycap><keycap>2</keycap></keycombo>.
+To make it quieter, press
+<keycombo><keycap>CapsLock</keycap><keycap>1</keycap></keycombo>.
+
+To get more details on the browsing shortcuts, see the
+<ulink url="&url-speakup-guide;">Speakup guide</ulink>.
+
+</para>
+ </sect2>
+
+ <sect2 arch="x86">
<title>Hardware Speech Synthesis</title>
<para>
-Support for hardware speech synthesis devices is available only alongside
-support for graphical installer. You thus need to select the
-<quote>Graphical install</quote> entry in the boot menu.
+Support for hardware speech synthesis devices is available on all installer
+images which have the graphical installer, i.e. all netinst, CD and DVD images,
+and the netboot gtk variant. You thus need to select a <quote>Graphical
+install</quote> entry in the boot menu.
</para><para>
@@ -75,7 +113,7 @@
<userinput>speakup.synth=<replaceable>driver</replaceable></userinput>
boot parameter to tell <classname>speakup</classname> which driver it should
use. <replaceable>driver</replaceable> should be replaced by the driver code
-for your device (see <ulink url="&url-speakup-driver-codes;">driver code
+for your device (see <ulink url="&url-speakup-guide;">driver code
list</ulink>). The textual version of the installer will then be
automatically selected, and support for the speech synthesis device will be
automatically installed on the target system.
@@ -109,4 +147,23 @@
</para>
</sect2>
+
+ <sect2><title>Preseeding</title>
+<para>
+
+Alternatively, &debian; can be installed completely automatically by using
+preseeding. This is documented in <xref linkend="appendix-preseed"/>.
+
+</para>
+ </sect2>
+
+ <sect2><title>Accessibility of the installed system</title>
+<para>
+
+Documentation on accessibility of the installed system is available on the
+<ulink url="&url-debian-wiki-accessibility;">Debian Accessibility wiki page</ulink>.
+
+</para>
+ </sect2>
+
</sect1>
en/boot-installer/x86.xml : 62896 -> 68418
Index: en/boot-installer/x86.xml
===================================================================
--- en/boot-installer/x86.xml (Revision 62896)
+++ en/boot-installer/x86.xml (Revision 68418)
@@ -1,13 +1,13 @@
<!-- retain these comments for translator revision tracking -->
<!-- $Id$ -->
- <sect2 arch="x86"><title>Booting from a CD-ROM</title>
+ <sect2 arch="any-x86"><title>Booting from a CD-ROM</title>
&boot-installer-intro-cd.xml;
<!-- 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,
@@ -71,14 +71,29 @@
</sect2>
- <sect2 arch="x86" id="boot-win32">
+ <sect2 arch="any-x86" id="boot-win32">
<title>Booting from Windows</title>
<para>
-To start the installer from Windows, you must first obtain CD-ROM/DVD-ROM
-or USB memory stick installation media as described in
-<xref linkend="official-cdrom"/> and <xref linkend="boot-usb-files"/>.
+To start the installer from Windows, you can either
+<itemizedlist>
+<listitem><para>
+
+obtain CD-ROM/DVD-ROM<phrase condition="bootable-usb"> or USB memory
+stick</phrase> installation media as described in
+<xref linkend="official-cdrom"/><phrase condition="bootable-usb"> respective
+<xref linkend="boot-usb-files"/></phrase> or
+
+</para></listitem>
+<listitem><para>
+
+download a standalone Windows executable, which is available as
+tools/win32-loader/stable/win32-loader.exe on the &debian; mirrors,
+
+</para></listitem>
+</itemizedlist>
+
</para><para>
If you use an installation CD or DVD, a pre-installation program should be
@@ -90,47 +105,54 @@
</para><para>
After the program has been started, a few preliminary questions will be
-asked and the system will be prepared to start the &debian; installer.
+asked and the system will be prepared to reboot into the &debian-gnu;
+installer.
</para>
</sect2>
-<!-- FIXME the documented procedure does not exactly work, commented out
- until fixes
-
<sect2 arch="x86" id="install-from-dos">
- <title>Booting from a DOS partition</title>
+ <title>Booting from DOS using loadlin</title>
+<para>
-&boot-installer-intro-hd.xml;
+Boot into DOS (not Windows). To do this, you can for instance boot from a
+recovery or diagnostic disk.
-<para>
+</para><para>
-Boot into DOS (not Windows) without any drivers being loaded. To do
-this, you have to press <keycap>F8</keycap> at exactly the right
-moment (and optionally select the <quote>safe mode command prompt only</quote>
-option). Enter the subdirectory for the flavor you chose, e.g.,
+If you can access the installation CD, change the current drive to the CD-ROM
+drive, e.g.
<informalexample><screen>
-cd c:\install
-</screen></informalexample>.
+d:
+</screen></informalexample>
-Next, execute <command>install.bat</command>.
-The kernel will load and launch the installer system.
+else make sure you have first prepared your hard disk as explained in
+<xref linkend="files-loadlin"/>, and change the current drive to it if needed.
</para><para>
-Please note, there is currently a loadlin problem (#142421) which
-precludes <filename>install.bat</filename> from being used with the
-bf2.4 flavor. The symptom of the problem is an
-<computeroutput>invalid compressed format</computeroutput> error.
+Enter the subdirectory for the flavor you chose, e.g.,
+<informalexample><screen>
+cd \&x86-install-dir;
+</screen></informalexample>
+
+If you prefer using the graphical installer, enter the <filename>gtk</filename>
+sub-directory.
+
+<informalexample><screen>
+cd gtk
+</screen></informalexample>
+
+Next, execute <command>install.bat</command>.
+The kernel will load and launch the installer system.
+
</para>
</sect2>
-END FIXME -->
-
<sect2 arch="x86" id="boot-initrd">
- <title>Booting from Linux Using <command>LILO</command> or
+ <title>Booting from Linux using <command>LILO</command> or
<command>GRUB</command></title>
<para>
@@ -193,7 +215,7 @@
</para><para>
-The procedure for <command>GRUB</command> is quite similar. Locate your
+The procedure for <command>GRUB1</command> is quite similar. Locate your
<filename>menu.lst</filename> in the <filename>/boot/grub/</filename>
directory (or sometimes <filename>/boot/boot/grub/</filename>) and add an
entry for the installer, for example (assuming <filename>/boot</filename>
@@ -208,22 +230,39 @@
</para><para>
+The procedure for <command>GRUB2</command> is very similar. The file is named
+<filename>grub.cfg</filename> instead of <filename>menu.lst</filename>. An entry
+for the installer would be for instance for example:
+
+<informalexample><screen>
+menuentry 'New Install' {
+insmod part_msdos
+insmod ext2
+set root='(hd0,msdos1)'
+linux /boot/newinstall/vmlinuz
+initrd /boot/newinstall/initrd.gz
+}
+</screen></informalexample>
+
+</para><para>
+
From here on, there should be no difference between <command>GRUB</command>
or <command>LILO</command>.
</para>
</sect2>
- <sect2 arch="x86" condition="bootable-usb" id="usb-boot">
+ <sect2 arch="any-x86" condition="bootable-usb" id="usb-boot">
<title>Booting from USB Memory Stick</title>
<para>
Let's assume you have prepared everything from <xref
linkend="boot-dev-select"/> and <xref linkend="boot-usb-files"/>. Now
just plug your USB stick into some free USB connector and reboot the
-computer. The system should boot up, and you should be presented with
-the <prompt>boot:</prompt> prompt. Here you can enter optional boot
-arguments, or just hit &enterkey;.
+computer. The system should boot up, and unless you have used the flexible
+way to build the stick and not enabled it, you should be presented with the
+<prompt>boot:</prompt> prompt. Here you can enter optional boot arguments, or
+just hit &enterkey;.
</para>
</sect2>
@@ -338,28 +377,32 @@
<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
Install
Graphical install
-Advanced options >
+Advanced options >
Help
+Install with speech synthesis
Press ENTER to boot or TAB to edit a menu entry
</screen></informalexample>
Depending on the installation method you are using, the <quote>Graphical
-install</quote> option may not be available.
+install</quote> option may not be available. Bi-arch images additionally have a
+64 bit variant for each install option, right below it, thus almost doubling the
+number of options.
</para><para>
For a normal installation, select either the <quote>Install</quote> or
the <quote>Graphical install</quote> entry — using either the
-arrow keys on your keyboard or by typing the first (highlighted) letter
-— and press &enterkey; to boot the installer.
+arrow keys on your keyboard or by typing the first (highlighted) letter, the
+<quote>Install</quote> entry is already selected by default — and press
+&enterkey; to boot the installer.
</para><para>
@@ -380,9 +423,8 @@
Choosing the <quote>Help</quote> entry will result in the first help screen
being displayed which gives an overview of all available help screens.
-Note that it is not possible to return to the boot menu after the help
-screens have been displayed. However, the F3 and F4 help screens list
-commands that are equivalent to the boot methods listed in the menu. All
+To return to the boot menu after the help screens have been
+displayed, type 'menu' at the boot prompt and press &enterkey;. All
help screens have a boot prompt at which the boot command can be typed:
<informalexample><screen>
en/boot-installer/trouble.xml : 64916 -> 68014
Index: en/boot-installer/trouble.xml
===================================================================
--- en/boot-installer/trouble.xml (Revision 64916)
+++ en/boot-installer/trouble.xml (Revision 68014)
@@ -36,7 +36,7 @@
If the installer fails to recognize a CD-ROM, try just running the option
<menuchoice> <guimenuitem>Detect and mount CD-ROM</guimenuitem> </menuchoice>
-a second time. Some DMA related issues with older CD-ROM drives are known to
+a second time. Some DMA related issues with very old CD-ROM drives are known to
be resolved in this way.
</para></listitem>
@@ -65,6 +65,8 @@
at high speeds using a modern CD writer.
</para></listitem>
+
+<!--
<listitem><para>
If your system boots correctly from the CD-ROM, it does not necessarily
@@ -72,10 +74,12 @@
that your CD-ROM drive is connected to).
</para></listitem>
+-->
+
<listitem><para>
-Some older CD-ROM drives do not work correctly if <quote>direct memory
-access</quote> (DMA) is enabled.
+Some very old CD-ROM drives do not work correctly if <quote>direct memory
+access</quote> (DMA) is enabled for them.
</para></listitem>
</itemizedlist>
@@ -91,8 +95,9 @@
<itemizedlist>
<listitem><para>
-Check that your BIOS actually supports booting from CD-ROM (older systems
-possibly don't) and that your CD-ROM drive supports the media you are using.
+Check that your BIOS actually supports booting from CD-ROM (only an
+issue for very old systems) and that CD booting is enabled in the
+BIOS.
</para></listitem>
<listitem><para>
@@ -274,19 +279,40 @@
recognized properly, the first thing to check is the boot parameters,
as discussed in <xref linkend="boot-parms"/>.
-</para><para>
+</para>
-Often, problems can be solved by removing add-ons and peripherals, and
-then trying booting again. <phrase arch="any-x86">Internal modems, sound
-cards, and Plug-n-Play devices can be especially problematic.</phrase>
+<para arch="not-s390">
+In some cases, malfunctions
+can be caused by missing device firmware (see <xref
+linkend="hardware-firmware"/> and <xref linkend="loading-firmware"/>).
-</para><para>
+</para>
+ </sect2>
-If you have a large amount of memory installed in your machine, more
-than 512M, and the installer hangs when booting the kernel, you may
-need to include a boot argument to limit the amount of memory the
-kernel sees, such as <userinput>mem=512m</userinput>.
+ <sect2 arch="x86">
+ <title>Software Speech Synthesis</title>
+<para>
+
+If software speech synthesis does not work, there is most probably an issue
+with your sound board, usually because either the driver for it is not included
+in the installer, or because it has unusual mixer level names which are set to
+muted by default. You should thus submit a bug report which includes the output
+of the following commands, run on the same machine from a Linux system which is
+known to have sound working (e.g., a live CD).
+
+<itemizedlist>
+<listitem>
+<para><userinput>dmesg</userinput></para>
+</listitem><listitem>
+<para><userinput>lspci</userinput></para>
+</listitem><listitem>
+<para><userinput>lsmod</userinput></para>
+</listitem><listitem>
+<para><userinput>amixer</userinput></para>
+</listitem>
+</itemizedlist>
+
</para>
</sect2>
@@ -297,8 +323,11 @@
There are some common installation problems that can be solved or avoided by
passing certain boot parameters to the installer.
-</para><para>
+</para>
+<!-- outdated
+<para>
+
Some systems have floppies with <quote>inverted DCLs</quote>. If you receive
errors reading from the floppy, even when you know the floppy is good,
try the parameter <userinput>floppy=thinkpad</userinput>.
@@ -337,8 +366,11 @@
</footnote> may help. If that does not work,
try adding the boot parameter <userinput>fb=false</userinput>.
-</para><para>
+</para>
+-->
+<para>
+
If your screen begins to show a weird picture while the kernel boots,
eg. pure white, pure black or colored pixel garbage, your system may
contain a problematic video card which does not switch to the
@@ -354,7 +386,7 @@
<title>System Freeze During the PCMCIA Configuration Phase</title>
<para>
-Some laptop models produced by Dell are known to crash when PCMCIA device
+Some very old laptop models produced by Dell are known to crash when PCMCIA device
detection tries to access some hardware addresses. Other laptops may display
similar problems. If you experience such a problem and you don't need PCMCIA
support during the installation, you can disable PCMCIA using the
@@ -378,6 +410,7 @@
</para>
</sect3>
+<!-- outdated
<sect3>
<title>System Freeze while Loading USB Modules</title>
<para>
@@ -390,6 +423,8 @@
</para>
</sect3>
+-->
+
</sect2>
<sect2 arch="sparc" id="sparc-boot-problems">
en/boot-installer/s390.xml : 43745 -> 68399
Index: en/boot-installer/s390.xml
===================================================================
--- en/boot-installer/s390.xml (Revision 43745)
+++ en/boot-installer/s390.xml (Revision 68399)
@@ -22,9 +22,13 @@
<para>
On S/390 you can append boot parameters in the parm file. This file can
-either be in ASCII or EBCDIC format.
-A sample parm file <filename>parmfile.debian</filename> is provided with
-the installation images.
+either be in ASCII or EBCDIC format. It needs to be fixed-width with
+80 characters per line. A sample parm file
+<filename>parmfile.debian</filename> is provided with the installation
+images. If a parameter is too long to fit into the 80 characters limit
+it can simply be continued in the first column of the next line. All
+the lines are concatenated without spaces when being passed to the
+kernel.
<!-- Link is bad; commented out for now
Please read
@@ -32,5 +36,28 @@
for more information about S/390-specific boot parameters.
-->
+</para><para>
+
+If you boot the installer in a logical partition (LPAR) or
+virtual machine (VM) where a lot of devices are visible, you can
+instruct the kernel to restrict the list to a fixed set of devices.
+This is advised for the installer's boot process if a lot of disks are
+visible, most likely in LPAR mode. The <quote>cio_ignore</quote> option supports both
+a blacklist (to only disallow a few devices) and a whitelist (to only
+allow specific devices):
+
+<informalexample role="example"><screen>
+ # blacklist: just ignore the two devices 300 and 301
+ cio_ignore=0.0.0300-0.0.0301
+ # whitelist: ignore everything but 1150, FD00, FD01 and FD02
+ cio_ignore=all,!0.0.1150,!0.0.fd00-0.0.fd02
+</screen></informalexample>
+
+Please note that all devices numbers' hex digits need to be specified in
+lower case. Furthermore if this boot parameter is used all devices
+need to be listed: this includes at least disks, network devices and
+the console. To be considered during the installer's boot process the
+above option needs to be added to <filename>parmfile.debian</filename>.
+
</para>
</sect2>
en/boot-installer/powerpc.xml : 64916 -> 67785
Index: en/boot-installer/powerpc.xml
===================================================================
--- en/boot-installer/powerpc.xml (Revision 64916)
+++ en/boot-installer/powerpc.xml (Revision 67785)
@@ -8,14 +8,31 @@
<para>
Currently, the only &arch-title; subarchitectures that support CD-ROM
-booting are PReP (though not all systems) and New World PowerMacs.
+booting are PReP/CHRP (though not all systems) and New World PowerMacs.
On PowerMacs, hold the <keycap>c</keycap> key, or else the combination of
<keycap>Command</keycap>, <keycap>Option</keycap>,
<keycap>Shift</keycap>, and <keycap>Delete</keycap>
-keys together while booting to boot from the CD-ROM.
+keys together while booting to boot from the factory default CD/DVD drive.
</para><para>
+To boot a PowerMac from an external Firewire CD/DVD drive invoke
+Open Firmware prompt first (see <xref linkend="invoking-openfirmware"/>),
+then type
+
+<informalexample><screen>
+0 > boot fw/node/sbp-2/disk:,\install\yaboot
+</screen></informalexample>
+
+for an alternative way to boot from the internal factory default CD/DVD
+drive type
+
+<informalexample><screen>
+0 > boot cd:,\install\yaboot
+</screen></informalexample>
+
+</para><para>
+
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
@@ -25,15 +42,12 @@
</para><para>
-If your system doesn't boot directly from CD-ROM, you can still use
-the CD-ROM to install the system. On NewWorlds, you can also use an
-OpenFirmware command to boot from the CD-ROM manually. Follow the
-instructions in <xref linkend="boot-newworld"/> for booting from
-the hard disk, except use the path to <command>yaboot</command> on the
-CD at the OF prompt, such as
+To boot &debian; CD/DVD on Pegasos II machine, hold <keycap>Esc</keycap>
+key immediately after pressing the power-on button, when SmartFirmware
+prompt appears, type
<informalexample><screen>
-0 > boot cd:,\install\yaboot
+boot cd install/pegasos
</screen></informalexample>
</para>
en/post-install/orientation.xml : 64916 -> 67216
Index: en/post-install/orientation.xml
===================================================================
--- en/post-install/orientation.xml (Revision 64916)
+++ en/post-install/orientation.xml (Revision 67216)
@@ -67,6 +67,19 @@
</para>
</sect2>
+ <sect2><title>Additional Software Available for &debian;</title>
+<para>
+
+There are official and unofficial software repositories that are not
+enabled in the default &debian; install. These contain software which
+many find important and expect to have. Information on these
+additional repositories can be found on the &debian; Wiki page titled
+<ulink url="&url-debian-wiki-software;">The Software
+Available for &debian;'s Stable Release</ulink>.
+
+</para>
+ </sect2>
+
<sect2><title>Application Version Management</title>
<para>
en/administrivia/administrivia.xml : 43043 -> 64955
Index: en/administrivia/administrivia.xml
===================================================================
--- en/administrivia/administrivia.xml (Revision 43043)
+++ en/administrivia/administrivia.xml (Revision 64955)
@@ -103,6 +103,15 @@
This document was originally written by Bruce Perens, Sven Rudolph, Igor
Grobman, James Treacy, and Adam Di Carlo. Sebastian Ley wrote the
Installation Howto.
+
+</para><para>
+
+Miroslav KuÅ?e has documented a lot of the new functionality in Sarge's
+debian-installer. Frans Pop was the main editor and release manager during
+the Etch, Lenny and Squeeze releases.
+
+</para><para>
+
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
@@ -110,8 +119,7 @@
Arto Astala, Eric Delaunay/Ben Collins (SPARC information), Tapio
Lehtonen, and Stéphane Bortzmeyer for numerous edits and text.
We have to thank Pascal Le Bail for useful information about booting
-from USB memory sticks. Miroslav KuÅ?e has documented a lot of the new
-functionality in Sarge's debian-installer.
+from USB memory sticks.
</para><para>
en/using-d-i/using-d-i.xml : 61189 -> 67299
Index: en/using-d-i/using-d-i.xml
===================================================================
--- en/using-d-i/using-d-i.xml (Revision 61189)
+++ en/using-d-i/using-d-i.xml (Revision 67299)
@@ -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
@@ -164,7 +164,7 @@
</varlistentry>
<varlistentry>
-<term>kbd-chooser</term><listitem><para>
+<term>console-setup</term><listitem><para>
Shows a list of keyboards, from which the user chooses the model which
matches his own.
@@ -184,7 +184,7 @@
<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 @@
<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>
@@ -244,6 +244,14 @@
</varlistentry>
<varlistentry>
+<term>user-setup</term><listitem><para>
+
+Sets up the root password, and adds a non-root user.
+
+</para></listitem>
+</varlistentry>
+<varlistentry>
+
<term>clock-setup</term><listitem><para>
Updates the system clock and determines whether the clock is set to UTC
@@ -267,7 +275,7 @@
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>
@@ -315,20 +323,12 @@
<term>base-installer</term><listitem><para>
Installs the most basic set of packages which would allow
-the computer to operate under Linux when rebooted.
+the computer to operate under &debian-gnu; when rebooted.
</para></listitem>
</varlistentry>
<varlistentry>
-<term>user-setup</term><listitem><para>
-
-Sets up the root password, and adds a non-root user.
-
-</para></listitem>
-</varlistentry>
-<varlistentry>
-
<term>apt-setup</term><listitem><para>
Configures apt, mostly automatically, based on what media the installer is
@@ -361,7 +361,7 @@
<term>bootloader-installer</term><listitem><para>
The various bootloader installers each install a boot loader program on the
-hard disk, which is necessary for the computer to start up using Linux
+hard disk, which is necessary for the computer to start up using &arch-kernel;
without using a floppy or CD-ROM. Many boot loaders allow the user to
choose an alternate operating system each time the computer boots.
@@ -382,7 +382,7 @@
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>
en/using-d-i/loading-firmware.xml : 64734 -> 68421
Index: en/using-d-i/loading-firmware.xml
===================================================================
--- en/using-d-i/loading-firmware.xml (Revision 64734)
+++ en/using-d-i/loading-firmware.xml (Revision 68421)
@@ -37,25 +37,30 @@
device will also function without it, or if the device is not needed during
the installation.
-</para>
-<warning><para>
+</para><para>
-Support for loading firmware is still relatively basic and is likely to
-be improved in future releases of the installer. Currently &d-i; will
-for example not display any warning if you choose to load missing firmware,
-but the requested firmware is not found.
-Please report any issues you encounter by filing an installation report
-(see <xref linkend="submit-bug"/>).
+&d-i; only prompts for firmware needed by kernel modules loaded during
+the installation. Not all drivers are included in &d-i;, in particular
+radeon is not, so this implies that the capabilities of some devices may
+be no different at the end of the installation from what they were at
+the beginning. Consequently, some of your hardware may not be being used
+to its full potential. If you suspect this is the case, or are just
+curious, it is not a bad idea to check the output of the
+<command>dmesg</command> command on the newly booted system and search
+for <quote>firmware</quote>.
-</para></warning>
+</para>
<sect2><title>Preparing a medium</title>
<para>
-Although in some cases the firmware can also be loaded from a partition on
-a hard disk, the most common method to load firmware will be from some
-removable medium such as a floppy disk or a USB stick.
-The firmware files or packages must be placed in either the root directory
+Official CD images do not include non-free firmware. The most common
+method to load such firmware is from some removable medium such as a USB
+stick. Alternatively, unofficial CD builds containing non-free firmware
+can be found at <ulink url="&url-firmware-cds;"/>.
+
+To prepare a USB stick (or other medium like a hard drive partition, or floppy
+disk), the firmware files or packages must be placed in either the root directory
or a directory named <filename>/firmware</filename> of the file system on
the medium. The recommended file system to use is FAT as that is most
certain to be supported during the early stages of the installation.
en/using-d-i/components.xml : 61147 -> 65801
Index: en/using-d-i/components.xml
===================================================================
--- en/using-d-i/components.xml (Revision 61147)
+++ en/using-d-i/components.xml (Revision 65801)
@@ -15,10 +15,10 @@
</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
@@ -62,6 +62,20 @@
</sect2>
+ <sect2 id="di-user-setup">
+ <title>Setting Up Users And Passwords</title>
+<para>
+
+Just before configuring the clock, the installer will allow you
+to set up the <quote>root</quote> account and/or an account for the first
+user. Other user accounts can be created after the installation has been
+completed.
+
+</para>
+
+&module-user-setup.xml;
+ </sect2>
+
<sect2 id="di-partition">
<title>Partitioning and Mount Point Selection</title>
<para>
@@ -101,20 +115,6 @@
&module-base-installer.xml;
</sect2>
- <sect2 id="di-user-setup">
- <title>Setting Up Users And Passwords</title>
-<para>
-
-After the base system has been installed, the installer will allow you
-to set up the <quote>root</quote> account and/or an account for the first
-user. Other user accounts can be created after the installation has been
-completed.
-
-</para>
-
-&module-user-setup.xml;
- </sect2>
-
<sect2 id="di-install-software">
<title>Installing Additional Software</title>
<para>
@@ -162,7 +162,7 @@
<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;.
@@ -173,7 +173,7 @@
</sect2>
<sect2 id="di-miscellaneous">
- <title>Miscellaneous</title>
+ <title>Troubleshooting</title>
<para>
The components listed in this section are usually not involved in the
@@ -185,6 +185,6 @@
&module-save-logs.xml;
&module-cdrom-checker.xml;
&module-shell.xml;
+ </sect2>
&module-network-console.xml;
- </sect2>
</sect1>
en/using-d-i/modules/apt-setup.xml : 64829 -> 68102
Index: en/using-d-i/modules/apt-setup.xml
===================================================================
--- en/using-d-i/modules/apt-setup.xml (Revision 64829)
+++ en/using-d-i/modules/apt-setup.xml (Revision 68102)
@@ -193,4 +193,41 @@
</para>
</sect4>
+
+<sect4 id="apt-setup-mirror-selection">
+<title>Choosing a network mirror</title>
+<para>
+
+If you have selected to use a network mirror during the installation
+(optional for CD/DVD installs, required for netboot images), you will be
+presented with a list of geographically nearby (and therefore hopefully
+fast) network mirrors, based upon your country selection earlier in the
+installation process. Choosing the offered default is usually fine.
+
+</para><para>
+
+If your computer is on an IPv6-only network (which is probably not the case
+for the vast majority of users), using the default mirror for your country
+might not work. All the mirrors in the list are reachable via IPv4, but
+only some of them can be used via IPv6. As connectivity of individual
+mirrors can change over time, this information is not available in the
+installer. If there is no IPv6 connectivity for the default mirror for your
+country, you can either try some of the other mirrors offered to you or
+choose the <quote>enter information manually</quote> option. You can then specify
+<quote>ftp.ipv6.debian.org</quote> as the mirror name, which is an alias for
+a mirror available via IPv6, although it will probably not be the fastest
+possible one.
+
+</para><para>
+
+Another option when choosing to specify the mirror manually is to use
+<quote>http.debian.net</quote> as your mirror.
+<quote>http.debian.net</quote> is not a physical mirror but a mirror
+redirection service, i.e. it automatically refers your system to a
+real mirror near you in terms of network topology. It takes into account
+by which protocol you connect to it, i.e. if you use IPv6, it will
+refer you to an IPv6-capable mirror near you.
+
+</para>
+</sect4>
</sect3>
en/using-d-i/modules/kbd-chooser.xml : 65199 -> 68143
Index: en/using-d-i/modules/kbd-chooser.xml
===================================================================
--- en/using-d-i/modules/kbd-chooser.xml (Revision 65199)
+++ en/using-d-i/modules/kbd-chooser.xml (Revision 68143)
@@ -19,19 +19,7 @@
Move the highlight to the keyboard selection you desire and press
&enterkey;. Use the arrow keys to move the highlight — they are
in the same place in all national language keyboard layouts, so they
-are independent of the keyboard configuration. An 'extended' keyboard
-is one with <keycap>F1</keycap> through <keycap>F10</keycap> keys
-along the top row.
+are independent of the keyboard configuration.
-</para><para arch="powerpc">
-
-There are two keyboard layouts for US keyboards; the qwerty/mac-usb-us
-(Apple USB) layout will place the Alt function on the
-<keycap>Command/Apple</keycap> key (in the keyboard position next to
-the <keycap>space</keycap> key similar to <keycap>Alt</keycap> on
-PC keyboards), while the qwerty/us (Standard) layout will place the
-Alt function on the <keycap>Option</keycap> key (engraved with 'alt'
-on most Mac keyboards). In other respects the two layouts are similar.
-
</para>
</sect3>
en/using-d-i/modules/pkgsel.xml : 58649 -> 68208
Index: en/using-d-i/modules/pkgsel.xml
===================================================================
--- en/using-d-i/modules/pkgsel.xml (Revision 58649)
+++ en/using-d-i/modules/pkgsel.xml (Revision 68208)
@@ -71,7 +71,7 @@
</para><para arch="x86">
-Some CD images (businesscard, netinst and DVD) also allow selection of
+Some CD images (netinst and DVD) also allow selection of
the desired desktop environment from the graphical boot menu. Select the
<quote>Advanced options</quote> option in the main menu and look for
<quote>Alternative desktop environments</quote>.
en/using-d-i/modules/choose-mirror.xml : 43658 -> 66398
Index: en/using-d-i/modules/choose-mirror.xml
===================================================================
--- en/using-d-i/modules/choose-mirror.xml (Revision 43658)
+++ en/using-d-i/modules/choose-mirror.xml (Revision 66398)
@@ -17,6 +17,7 @@
(not for ftp)
- Forcing to ftp can be done using "protocol=ftp"
- Note that not all mirrors are equal (see http://www.nl.debian.org/mirror/list)
+- cdn.debian.net can be a useful catch-all.
- The selected mirror will be tested.
- How to handle problems with mirrors.
en/using-d-i/modules/partman.xml : 62932 -> 66181
Index: en/using-d-i/modules/partman.xml
===================================================================
--- en/using-d-i/modules/partman.xml (Revision 62932)
+++ en/using-d-i/modules/partman.xml (Revision 66181)
@@ -50,7 +50,7 @@
Some options can only be changed when installing at medium or low debconf
priority; at higher priorities sensible defaults will be used.
-</para><para>
+</para><para arch="linux-any">
The installer supports various forms of advanced partitioning and use of
storage devices, which in many cases can be used in combination.
@@ -92,20 +92,54 @@
<listitem><para>
<phrase arch="arm;mipsel"><emphasis>ext2r0</emphasis>,</phrase>
<emphasis>ext2</emphasis>,
- <emphasis>ext3</emphasis>,
- <emphasis>ext4</emphasis>
- </para><para>
+ <phrase arch="linux-any"><emphasis>ext3</emphasis>,</phrase>
+ <phrase arch="linux-any"><emphasis>ext4</emphasis></phrase>
+ </para><para arch="linux-any">
The default file system selected in most cases is ext3; for
<filename>/boot</filename> partitions ext2 will be selected by default
when guided partitioning is used.
</para></listitem>
- <listitem><para>
+ <listitem arch="linux-any"><para>
<emphasis>jfs</emphasis> (not available on all architectures)
</para></listitem>
- <listitem><para>
+ <listitem arch="kfreebsd-any"><para>
+ <emphasis>ufs</emphasis>
+ </para><para>
+ The default file system is UFS.
+ </para></listitem>
+ <listitem arch="linux-any"><para>
<emphasis>xfs</emphasis> (not available on all architectures)
</para></listitem>
- <listitem><para>
+ <listitem arch="kfreebsd-any"><para>
+ <emphasis>zfs</emphasis>
+ </para><para>
+ As ZFS support in the installer is still in development, only a basic
+ subset of ZFS features are supported. Some of them can be enabled
+ manually after the initial install, but there are some caveats:
+ <itemizedlist>
+ <listitem><para>
+ Each ZFS pool will host only one filesystem. After install is finished,
+ more filesystems can be created on this pool by using the
+ <quote>zfs create</quote> command.
+ </para></listitem>
+ <listitem><para>
+ Each ZFS pool will be composed of exactly one partition. After install
+ is finished, a single-device ZFS pool can be converted into a multi-device
+ pool by using the <quote>zpool add</quote> command, or into a mirrored
+ pool by using the <quote>zpool attach</quote> command. However, you shouldn't
+ do this on the pool that hosts root filesystem, as it would prevent GRUB
+ from booting your system.
+ </para></listitem>
+ <listitem><para>
+ Compression is not currently supported. After the install is finished,
+ compression can be enabled by setting the <quote>compression</quote> property
+ via the <quote>zfs set</quote> command. However, if a compression algorithm
+ other than the default (lzjb) is used on the pool that hosts your root
+ filesystem, this may prevent GRUB from booting your system.
+ </para></listitem>
+ </itemizedlist>
+ </para></listitem>
+ <listitem arch="linux-any"><para>
<emphasis>reiserfs</emphasis> (optional; not available on all architectures)
</para><para>
Support for the Reiser file system is no longer available by default.
@@ -141,7 +175,7 @@
<sect3 id="partman-auto">
<title>Guided Partitioning</title>
-<para>
+<para arch="linux-any">
If you choose guided partitioning, you may have three options: to create
partitions directly on the hard disk (classic method), or to create them
@@ -156,12 +190,12 @@
</footnote>.
</para>
-<note><para>
+<note arch="linux-any"><para>
The option to use (encrypted) LVM may not be available on all architectures.
</para></note>
-<para>
+<para arch="linux-any">
When using LVM or encrypted LVM, the installer will create most
partitions inside one big partition; the advantage of this method is that
@@ -170,7 +204,7 @@
knowing a special key phrase, thus providing extra security of your
(personal) data.
-</para><para>
+</para><para arch="linux-any">
When using encrypted LVM, the installer will also automatically erase the
disk by writing random data to it. This further improves security (as it
@@ -179,7 +213,7 @@
take some time depending on the size of your disk.
</para>
-<note><para>
+<note arch="linux-any"><para>
If you choose guided partitioning using LVM or encrypted LVM, some changes
in the partition table will need to be written to the selected disk while
@@ -191,8 +225,8 @@
</para></note>
<para>
-If you choose guided partitioning (either classic or using (encrypted)
-LVM) for a whole disk, you will first be asked to select the disk you want
+If you choose guided partitioning<phrase arch="linux-any"> (either classic or using (encrypted)
+LVM)</phrase> for a whole disk, you will first be asked to select the disk you want
to use. Check that all your disks are listed and, if you have several disks,
make sure you select the correct one. The order they are listed in may
differ from what you are used to. The size of the disks may help to identify
@@ -202,9 +236,11 @@
Any data on the disk you select will eventually be lost, but you will always
be asked to confirm any changes before they are written to the disk.
+<phrase arch="linux-any">
If you have selected the classic method of partitioning, you will be able to
undo any changes right until the end; when using (encrypted) LVM this is not
possible.
+</phrase>
</para><para>
@@ -251,7 +287,7 @@
</tbody></tgroup></informaltable>
-<para>
+<para arch="linux-any">
If you choose guided partitioning using (encrypted) LVM, the installer will also create
a separate <filename>/boot</filename> partition. The other partitions,
@@ -320,7 +356,7 @@
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>
@@ -339,14 +375,14 @@
the free space). After this, you will be presented with a detailed
overview of your new partition. The main setting is <guimenuitem>Use
as:</guimenuitem>, which determines if the partition will have a file
-system on it, or be used for swap, software RAID, LVM, an encrypted
-file system, or not be used at all. Other settings include
+system on it, or be used for swap,<phrase arch="linux-any"> software RAID, LVM, an encrypted
+file system,</phrase> or not be used at all. Other settings include
mountpoint, mount options, and bootable flag; which settings are shown
depends on how the partition is to be used. If you don't like the
preselected defaults, feel free to change them to your liking. E.g. by
selecting the option <guimenuitem>Use as:</guimenuitem>, you can
choose a different filesystem for this partition, including options
-to use the partition for swap, software RAID, LVM, or not
+to use the partition for swap,<phrase arch="linux-any"> software RAID, LVM,</phrase> or not
use it at all. Another nice feature is the ability to copy data from
an existing partition onto this one.
When you are satisfied with your new partition, select
@@ -378,7 +414,7 @@
<command>partman</command> will detect this and will not let you continue
until you allocate one.
-</para><para>
+</para><para arch="linux-any">
Capabilities of <command>partman</command> can be extended with installer
modules, but are dependent on your system's architecture. So if you can't
en/using-d-i/modules/netcfg.xml : 50619 -> 68097
Index: en/using-d-i/modules/netcfg.xml
===================================================================
--- en/using-d-i/modules/netcfg.xml (Revision 50619)
+++ en/using-d-i/modules/netcfg.xml (Revision 68097)
@@ -15,20 +15,32 @@
<refentrytitle>interfaces</refentrytitle> <manvolnum>5</manvolnum>
</citerefentry> man page.
-</para><para>
+</para>
+<sect4 id="netcfg-automatic">
+<title>Automatic network configuration</title>
+<para>
+
By default, &d-i; tries to configure your computer's network
-automatically via DHCP. If the DHCP probe succeeds, you are done. If the
-probe fails, it may be caused by many factors ranging from unplugged
-network cable, to a misconfigured DHCP setup. Or maybe you don't have
-a DHCP server in your local network at all. For further explanation,
-check the error messages on the fourth console. In any case, you will
+automatically as far as possible. If the automatic configuration
+fails, that may be caused by many factors ranging from an
+unplugged network cable to missing infrastructure for automatic
+configuration. For further explanation in case of errors, check
+the error messages on the fourth console. In any case, you will
be asked if you want to retry, or if you want to perform a manual
-setup. DHCP servers are sometimes really slow in their responses, so
-if you are sure everything is in place, try again.
+setup. Sometimes the network services used for autoconfiguration
+can be slow in their responses, so if you are sure everything is
+in place, simply start the autoconfiguration attempt again.
+If autoconfiguration fails repeatedly, you can instead choose
+the manual network setup.
-</para><para>
+</para>
+</sect4>
+<sect4 id="netcfg-manual">
+<title>Manual network configuration</title>
+<para>
+
The manual network setup in turn asks you a number of questions about
your network, notably
<computeroutput>IP address</computeroutput>,
@@ -37,8 +49,10 @@
<computeroutput>Name server addresses</computeroutput>, and a
<computeroutput>Hostname</computeroutput>.
Moreover, if you have a wireless network interface, you will be asked
-to provide your <computeroutput>Wireless ESSID</computeroutput> and
-a <computeroutput>WEP key</computeroutput>. Fill in the answers from
+to provide your <computeroutput>Wireless ESSID</computeroutput>
+(<quote>wireless network name</quote>) and a <computeroutput>WEP key</computeroutput> or
+<computeroutput>WPA/WPA2 passphrase</computeroutput>.
+Fill in the answers from
<xref linkend="needed-info"/>.
</para><note><para>
@@ -53,4 +67,26 @@
the system has been installed.
</para></note>
+</sect4>
+
+<sect4 id="netcfg-ipv4-ipv6">
+<title>IPv4 and IPv6</title>
+<para>
+
+From &debian-gnu; 7.0 (<quote>Wheezy</quote>) onwards, &d-i; supports IPv6
+as well as the <quote>classic</quote> IPv4. All combinations of IPv4 and
+IPv6 (IPv4-only, IPv6-only and dual-stack configurations) are supported.
+
+</para><para>
+
+Autoconfiguration for IPv4 is done via DHCP (Dynamic Host Configuration
+Protocol). Autoconfiguration for IPv6 supports stateless autoconfiguration
+using NDP (Neighbor Discovery Protocol, including recursive DNS server
+(RDNSS) assignment), stateful autoconfiguration via DHCPv6 and mixed
+stateless/stateful autoconfiguration (address configuration via NDP,
+additional parameters via DHCPv6).
+
+</para>
+</sect4>
+
</sect3>
en/welcome/doc-organization.xml : 64916 -> 67991
Index: en/welcome/doc-organization.xml
===================================================================
--- en/welcome/doc-organization.xml (Revision 64916)
+++ en/welcome/doc-organization.xml (Revision 67991)
@@ -59,7 +59,7 @@
<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/DVD set),
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;
en/welcome/what-is-debian-linux.xml : 25496 -> 64916
Index: en/welcome/what-is-debian-linux.xml
===================================================================
--- en/welcome/what-is-debian-linux.xml (.../installer/doc/manual/en/welcome/what-is-debian-linux.xml) (Revision 25496)
+++ en/welcome/what-is-debian-linux.xml (.../manual/en/welcome/what-is-debian-linux.xml) (Revision 64916)
@@ -2,12 +2,12 @@
<!-- $Id$ -->
<sect1 id="what-is-debian-linux">
- <title>What is &debian;?</title>
+ <title>What is &debian; GNU/Linux?</title>
<para>
-The combination of Debian's philosophy and methodology and the GNU
+The combination of &debian;'s philosophy and methodology and the GNU
tools, the Linux kernel, and other important free software, form a
-unique software distribution called &debian;. This
+unique software distribution called &debian; GNU/Linux. This
distribution is made up of a large number of software
<emphasis>packages</emphasis>. Each package in the distribution
contains executables, scripts, documentation, and configuration
@@ -19,37 +19,37 @@
</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 @@
</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;
-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;">
en/welcome/what-is-debian-kfreebsd.xml : 64660 -> 64916 (untranslated)
Index: en/welcome/what-is-debian-kfreebsd.xml
===================================================================
--- en/welcome/what-is-debian-kfreebsd.xml (Revision 64660)
+++ en/welcome/what-is-debian-kfreebsd.xml (Revision 64916)
@@ -2,23 +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.
-This port of Debian is currently only being developed for the i386 and amd64
+</para><para>
+
+This port of &debian; is currently only being developed for the i386 and amd64
architectures, although ports to other architectures is possible.
-Please note that Debian GNU/kFreeBSD is not a Linux system, and thus some
+</para><para>
+
+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.
en/welcome/what-is-debian-hurd.xml : 28672 -> 64916
Index: en/welcome/what-is-debian-hurd.xml
===================================================================
--- en/welcome/what-is-debian-hurd.xml (.../installer/doc/manual/en/welcome/what-is-debian-hurd.xml) (Revision 28672)
+++ en/welcome/what-is-debian-hurd.xml (.../manual/en/welcome/what-is-debian-hurd.xml) (Revision 64916)
@@ -4,13 +4,16 @@
<!-- 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 that replaces the Linux
-monolithic kernel with the GNU Hurd — a set of servers running on
-top of the GNU Mach microkernel. The Hurd is still unfinished, and is
+&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>
+
+The Hurd is still unfinished, and is
unsuitable for day-to-day use, but work is continuing. The Hurd is
currently only being developed for the i386 architecture, although
ports to other architectures will be made once the system becomes more
@@ -18,9 +21,14 @@
</para><para>
+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.
en/welcome/about-copyright.xml : 64916 -> 67991
Index: en/welcome/about-copyright.xml
===================================================================
--- en/welcome/about-copyright.xml (Revision 64916)
+++ en/welcome/about-copyright.xml (Revision 67991)
@@ -21,7 +21,7 @@
</para><para>
Calling software <emphasis>free</emphasis> doesn't mean that the software isn't
-copyrighted, and it doesn't mean that CDs containing that software
+copyrighted, and it doesn't mean that CDs/DVDs containing that software
must be distributed at no charge. Free software, in part, means that
the licenses of individual programs do not require you to pay for the
privilege of distributing or using those programs. Free software also
@@ -36,7 +36,7 @@
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/DVD-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.
en/boot-new/boot-new.xml : 61133 -> 64916
Index: en/boot-new/boot-new.xml
===================================================================
--- en/boot-new/boot-new.xml (Revision 61133)
+++ en/boot-new/boot-new.xml (Revision 64916)
@@ -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>
@@ -10,12 +10,12 @@
Your system's first boot on its own power is what electrical engineers
call the <quote>smoke test</quote>.
-</para><para arch="x86">
+</para><para arch="any-x86">
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> or possibly
-the <classname>lilo</classname> bootloader.
-The first choices in the menu will be for your new Debian system. If 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
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 @@
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 Linux, 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
@@ -45,7 +45,7 @@
clearly and include any messages that are displayed and may help others to
diagnose the issue.
-</para><para arch="x86">
+</para><para arch="any-x86">
If you had any other operating systems on your computer that were not detected
or not detected correctly, please file an installation report.
@@ -98,7 +98,7 @@
On G4 machines and iBooks, you can hold down the
<keycap>option</keycap> key and get a graphical screen with a button
-for each bootable OS, &debian; will be a button with a small penguin
+for each bootable OS, &debian-gnu; will be a button with a small penguin
icon.
</para><para>
@@ -118,15 +118,15 @@
</para><para>
Resetting OpenFirmware on G3 or G4 hardware will cause it to boot
-&debian; by default (if you correctly partitioned and placed the
-Apple_Bootstrap partition first). If you have &debian; on a SCSI disk
+&debian-gnu; by default (if you correctly partitioned and placed the
+Apple_Bootstrap partition first). If you have &debian-gnu; on a SCSI disk
and MacOS on an IDE disk this may not work and you will have to enter
OpenFirmware and set the <envar>boot-device</envar> variable,
<command>ybin</command> normally does this automatically.
</para><para>
-After you boot &debian; for the first time you can add any additional
+After you boot &debian-gnu; for the first time you can add any additional
options you desire (such as dual boot options) to
<filename>/etc/yaboot.conf</filename> and run <command>ybin</command>
to update your boot partition with the changed configuration. Please
@@ -160,7 +160,7 @@
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
en/partitioning/partition/x86.xml : 64916 -> 66973
Index: en/partitioning/partition/x86.xml
===================================================================
--- en/partitioning/partition/x86.xml (Revision 64916)
+++ en/partitioning/partition/x86.xml (Revision 66973)
@@ -20,8 +20,7 @@
<quote>logical</quote> partitions a drive can contain. Additionally, with pre
1994–98 BIOSes, there are limits to where on the drive the BIOS can boot
from. More information can be found in the
-<ulink url="&url-partition-howto;">Linux Partition HOWTO</ulink> and the
-<ulink url="&url-phoenix-bios-faq-large-disk;">Phoenix BIOS FAQ</ulink>, but
+<ulink url="&url-partition-howto;">Linux Partition HOWTO</ulink>, but
this section will include a brief overview to help you plan most situations.
</para><para>
@@ -37,8 +36,8 @@
</para><para arch="linux-any">
-Linux limits the partitions per drive to 15 partitions for SCSI disks
-(3 usable primary partitions, 12 logical partitions), and 63
+Linux limits the partitions per drive to 255 partitions for SCSI disks
+(3 usable primary partitions, 252 logical partitions), and 63
partitions on an IDE drive (3 usable primary partitions, 60 logical
partitions). However the normal &debian-gnu; system provides
only 20 devices for partitions, so you may not install on partitions
en/install-methods/boot-drive-files.xml : 39614 -> 68418
Index: en/install-methods/boot-drive-files.xml
===================================================================
--- en/install-methods/boot-drive-files.xml (Revision 39614)
+++ en/install-methods/boot-drive-files.xml (Revision 68418)
@@ -16,10 +16,6 @@
and burning CD images or struggling with too numerous and
unreliable floppy disks.
-</para><para arch="x86">
-
-The installer cannot boot from files on an NTFS file system.
-
</para><para arch="powerpc">
The installer cannot boot from files on an HFS+ file system. MacOS
@@ -40,7 +36,7 @@
</para>
<sect2 arch="x86" id="files-lilo">
- <title>Hard disk installer booting using <command>LILO</command> or
+ <title>Hard disk installer booting from Linux using <command>LILO</command> or
<command>GRUB</command></title>
<para>
@@ -56,8 +52,9 @@
</para><para>
-Copy the following files from the Debian archives to a
-convenient location on your hard drive, for instance to
+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>.
<itemizedlist>
@@ -82,6 +79,35 @@
</sect2>
+ <sect2 arch="x86" id="files-loadlin">
+ <title>Hard disk installer booting from DOS using <command>loadlin</command></title>
+<para>
+
+This section explains how to prepare your hard drive for booting the installer
+from DOS using <command>loadlin</command>.
+
+</para><para>
+
+Copy the following directories from a &debian; CD image to <filename>c:\</filename>.
+
+<itemizedlist>
+<listitem><para>
+
+<filename>/&x86-install-dir;</filename> (kernel binary and ramdisk image)
+
+</para></listitem>
+<listitem><para>
+
+<filename>/tools</filename> (loadlin tool)
+
+</para></listitem>
+
+</itemizedlist>
+
+</para>
+ </sect2>
+
+
<sect2 arch="powerpc" id="files-oldworld">
<title>Hard Disk Installer Booting for OldWorld Macs</title>
<para>
@@ -92,7 +118,7 @@
booting. <application>BootX</application>, launched from MacOS,
supports booting from files placed on the hard
disk. <application>BootX</application> can also be used to dual-boot
-MacOS and Linux after your Debian installation is complete. For the
+MacOS and Linux after your &debian; installation is complete. For the
Performa 6360, it appears that <command>quik</command> cannot make the
hard disk bootable. So <application>BootX</application> is required
on that model.
@@ -103,7 +129,7 @@
distribution, available from <ulink url="&url-powerpc-bootx;"></ulink>,
or in the
<filename>dists/woody/main/disks-powerpc/current/powermac</filename>
-directory on Debian http/ftp mirrors and official Debian CDs. Use
+directory on &debian; http/ftp mirrors and official &debian; CDs. Use
<application>Stuffit Expander</application> to extract it from its
archive. Within the package, there is an empty folder called
<filename>Linux Kernels</filename>. Download
@@ -132,7 +158,7 @@
</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).
en/install-methods/boot-usb-files.xml : 57590 -> 68456
Index: en/install-methods/boot-usb-files.xml
===================================================================
--- en/install-methods/boot-usb-files.xml (Revision 57590)
+++ en/install-methods/boot-usb-files.xml (Revision 68456)
@@ -6,41 +6,6 @@
<para>
-There are two installation methods possible when booting from USB stick.
-The first is to install completely from the network. The second is to
-also copy a CD image onto the USB stick and use that as a source for
-packages, possibly in combination with a mirror. This second method is
-the more common.
-
-</para><para>
-
-For the first installation method you'll need to download an installer
-image from the <filename>netboot</filename> directory (at the location
-mentioned in <xref linkend="where-files"/>) and use the
-<quote>flexible way</quote> explained below to copy the files to the USB
-stick.
-
-</para><para>
-
-Installation images for the second installation method can be found in
-the <filename>hd-media</filename> directory and either the <quote>easy
-way</quote> or the <quote>flexible way</quote> can be used to copy the
-image to the USB stick. For this installation method you will also need
-to download a CD image. The installation image and the CD image must be
-based on the same release of &d-i;. If they do not match you are likely
-to get errors<footnote>
-
-<para>
-The error message that is most likely to be displayed is that no kernel
-modules can be found. This means that the version of the kernel module
-udebs included on the CD image is different from the version of the
-running kernel.
-</para>
-
-</footnote> during the installation.
-
-</para><para>
-
To prepare the USB stick, you will need a system where GNU/Linux is
already running and where USB is supported. With current GNU/Linux systems
the USB stick should be automatically recognized when you insert it. If
@@ -52,8 +17,7 @@
inserting it. To write to your stick, you may have to turn off its write
protection switch.
-</para>
-<warning><para>
+</para><warning><para>
The procedures described in this section will destroy anything already
on the device! Make very sure that you use the correct device name for
@@ -61,33 +25,102 @@
information on for example a hard disk could be lost.
</para></warning>
+
+ <sect2 id="usb-copy-isohybrid" condition="isohybrid-supported">
+ <title>Preparing a USB stick using a hybrid CD or DVD image</title>
<para>
-Note that the USB stick should be at least 256 MB in size (smaller
-setups are possible if you follow <xref linkend="usb-copy-flexible"/>).
+Debian CD and DVD images can now be written directly a USB stick,
+which is a very easy way to make a bootable USB stick. Simply choose
+a CD or DVD image that will fit on your USB stick. See
+<xref linkend="official-cdrom"/> to get a CD or DVD image.
+</para><para>
+
+Alternatively,
+for very small USB sticks, only a few megabytes in size, you can download
+the <filename>mini.iso</filename> image from the <filename>netboot</filename>
+directory (at the location mentioned in <xref linkend="where-files"/>).
+
+</para><para>
+
+The CD or DVD image you choose should be written directly to the USB stick,
+overwriting its current contents. For example, when using an existing
+GNU/Linux system, the CD or DVD image file can be written to a USB stick
+as follows, after having made sure that the stick is unmounted:
+
+<informalexample><screen>
+<prompt>#</prompt> <userinput>cp <replaceable>debian.iso</replaceable> /dev/<replaceable>sdX</replaceable></userinput>
+<prompt>#</prompt> <userinput>sync</userinput>
+</screen></informalexample>
+
+</para><important><para>
+
+Simply writing the CD or DVD image to USB like this should work fine
+for most users. The other options below are more complex, mainly for
+people with specialised needs.
+
+</para></important>
+
+<para>
+
+The hybrid image on the stick does not occupy all the storage space, so
+it may be worth considering using the free space to hold firmware files
+or packages or any other files of your choice. This could be useful if
+you have only one stick or just want to keep everything you need on one
+device.
+
+</para><para>
+
+Create a second, FAT partition on the stick, mount the partition
+and copy or unpack the firmware onto it. For example:
+
+<informalexample><screen>
+# mount /dev/<replaceable>sdX2</replaceable> /mnt
+# cd /mnt
+# tar zxvf <replaceable>/path/to/</replaceable>firmware.tar.gz
+# cd /
+# umount /mnt
+</screen></informalexample>
+
+</para><para arch="not-s390">
+
+You might have written the <filename>mini.iso</filename> to the USB
+stick. In this case the second partition doesn't have to be created as,
+very nicely, it will already be present. Unplugging and replugging the
+USB stick should make the two partitions visible.
+
</para>
+
+
+ </sect2>
+
<sect2 id="usb-copy-easy">
- <title>Copying the files — the easy way</title>
+ <title>Manually copying files to the USB stick</title>
<para>
+An alternative way to set up your USB stick is to manually copy
+the installer files, and also a CD image to it.
+Note that the USB stick should be at least 1 GB in size (smaller
+setups are possible if you follow <xref linkend="usb-copy-flexible"/>).
+
+</para><para>
+
There is an all-in-one file <filename>hd-media/boot.img.gz</filename>
which contains all the installer files (including the kernel)
<phrase arch="x86">as well as <classname>syslinux</classname> and its
-configuration file.</phrase>
+configuration file</phrase>
<phrase arch="powerpc">as well as <classname>yaboot</classname> and its
-configuration file.</phrase>
+configuration file</phrase>.
</para><para>
Note that, although convenient, this method does have one major
-disadvantage: the logical size of the device will be limited to 256 MB,
+disadvantage: the logical size of the device will be limited to 1 GB,
even if the capacity of the USB stick is larger. You will need to
repartition the USB stick and create new file systems to get its full
capacity back if you ever want to use it for some different purpose.
-A second disadvantage is that you cannot copy a full CD image onto
-the USB stick, but only the smaller businesscard or netinst CD images.
</para><para arch="x86">
@@ -117,14 +150,14 @@
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; ISO image (netinst or full CD) to it.
Unmount the stick (<userinput>umount /mnt</userinput>) and you are done.
</para>
</sect2>
<sect2 id="usb-copy-flexible">
- <title>Copying the files — the flexible way</title>
+ <title>Manually copying files to the USB stick — the flexible way</title>
<para>
If you like more flexibility or just want to know what's going on, you
@@ -140,20 +173,4 @@
</sect2>
- <!-- TODO: doesn't this section belong later? -->
- <sect2 arch="x86">
- <title>Booting the USB stick</title>
-<warning><para>
-
-If your system refuses to boot from the memory stick, the stick may
-contain an invalid master boot record (MBR). To fix this, use the
-<command>install-mbr</command> command from the package
-<classname>mbr</classname>:
-
-<informalexample><screen>
-# install-mbr /dev/<replaceable>sdX</replaceable>
-</screen></informalexample>
-
-</para></warning>
- </sect2>
</sect1>
en/install-methods/official-cdrom.xml : 64916 -> 68366
Index: en/install-methods/official-cdrom.xml
===================================================================
--- en/install-methods/official-cdrom.xml (Revision 64916)
+++ en/install-methods/official-cdrom.xml (Revision 68366)
@@ -2,27 +2,36 @@
<!-- $Id$ -->
<sect1 id="official-cdrom">
- <title>Official &debian-gnu; CD-ROM Sets</title>
+ <title>Official &debian-gnu; CD/DVD-ROM Sets</title>
<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/DVD-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
-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
-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
-binary packages requires several CDs, it is unlikely you will need
-packages on the third CD and above. You may also consider using the
-DVD version, which saves a lot of space on your shelf and you avoid
-the CD shuffling marathon.
+You may also download the CD/DVD-ROM images from a &debian; mirror and make
+your own set, if you have a fast network connection and a CD/DVD burner
+(see the <ulink url="&url-debian-cd;">Debian CD page</ulink> and
+<ulink url="&url-debian-cd-faq;">Debian CD FAQ</ulink> for
+detailed instructions). If you have a &debian; CD/DVD set and CDs/DVDs are
+bootable on your machine<phrase arch="x86">, which is the case on all
+modern PCs</phrase>, you can skip right to
+<xref linkend="boot-installer"/>. Much effort has been expended to ensure
+the most-used files are on the first CDs and DVDs, so that a basic
+desktop installation can be done with only the first DVD or - to a limited
+extent - even with only the first CD.
</para><para>
-If your machine doesn't support CD booting, but you do have a CD set,
+As CDs have a rather limited capacity by today's standards, not all
+graphical desktop environments are installable with only the first CD;
+for some desktop
+environments a CD installation requires either network connectivity during
+the installation to download the remaining files or additional CDs.
+
+</para><para>
+
+If your machine doesn't support CD booting<phrase arch="x86"> (only relevant
+on very old PC systems)</phrase>, but you do have a CD set,
you can use an alternative strategy such as
<phrase condition="supports-floppy-boot">floppy disk,</phrase>
en/install-methods/download/arm.xml : 64916 -> 67982
Index: en/install-methods/download/arm.xml
===================================================================
--- en/install-methods/download/arm.xml (Revision 64916)
+++ en/install-methods/download/arm.xml (Revision 67982)
@@ -2,19 +2,6 @@
<!-- $Id$ -->
- <sect3 arch="arm" id="nslu2-install-files">
- <title>NSLU2 Installation Files</title>
-<para>
-
-A firmware image is provided for the Linksys NSLU2 which will automatically
-boot <classname>debian-installer</classname>. This image can be uploaded
-via the Linksys web frontend or with upslug2. This firmware image can be
-obtained from &nslu2-firmware-img;.
-
-</para>
- </sect3>
-
-
<sect3 arch="arm" id="n2100-install-files">
<title>Thecus N2100 Installation Files</title>
<para>
@@ -68,21 +55,32 @@
The installation files for the QNAP Turbo Station consist of a kernel and
ramdisk as well as a script to write these images to flash. You can obtain
-the installation files for QNAP TS-109 and TS-209 from
-&qnap-orion-firmware-img; and for QNAP TS-110, TS-119, TS-210, TS-219,
-TS-219P from &qnap-kirkwood-firmware-img;.
+the installation files for QNAP TS-11x, TS-21x and TS-41x models from
+&qnap-kirkwood-firmware-img;.
</para>
</sect3>
<sect3 arch="arm" id="marvell-install-files">
- <title>SheevaPlug and OpenRD Installation Files</title>
+ <title>Plug Computer and OpenRD Installation Files</title>
<para>
-The installation files for the Marvell SheevaPlug and OpenRD devices
-consist of a kernel and initrd for U-Boot. You can obtain these files
-from &kirkwood-marvell-firmware-img;.
+The installation files for plug computers (SheevaPlug, GuruPlug, DreamPlug etc)
+and OpenRD devices consist of a kernel and initrd for U-Boot. You can obtain
+these files from &kirkwood-marvell-firmware-img;.
</para>
</sect3>
+ <sect3 arch="arm" id="lacie-install-files">
+ <title>LaCie NASes Installation Files</title>
+<para>
+
+The installation files for LaCie NASes (Network Space v2, Network Space Max v2,
+Internet Space v2, d2 Network v2, 2Big Network v2 and 5Big Network v2) consist
+of a kernel and initrd for U-Boot. You can obtain these files from
+&lacie-kirkwood-firmware-img;.
+
+</para>
+ </sect3>
+
en/install-methods/usb-setup/x86.xml : 65196 -> 68208
Index: en/install-methods/usb-setup/x86.xml
===================================================================
--- en/install-methods/usb-setup/x86.xml (Revision 65196)
+++ en/install-methods/usb-setup/x86.xml (Revision 68208)
@@ -19,9 +19,16 @@
Don't forget to set the <quote>bootable</quote> bootable flag.
</para>
-</footnote>, and then create the filesystem using:
+</footnote>, install an MBR using:
<informalexample><screen>
+# install-mbr /dev/<replaceable>sdX</replaceable>
+</screen></informalexample>
+
+The <command>install-mbr</command> command is contained in the
+<classname>mbr</classname> &debian; package. Then create the filesystem using:
+
+<informalexample><screen>
# mkdosfs /dev/<replaceable>sdX1</replaceable>
</screen></informalexample>
@@ -95,16 +102,21 @@
append initrd=initrd.gz
</screen></informalexample>
-For the graphical installer you should add
-<userinput>vga=788</userinput> to the second line.
+For the graphical installer you should add <userinput>vga=788</userinput> to the
+second line. Other parameters can be appended as desired.
</para><para>
-If you used an <filename>hd-media</filename> image, you should now copy a
+To enable the boot prompt to permit further parameter appending, add a
+<userinput>prompt 1</userinput> line.
+
+</para><para>
+
+If you used an <filename>hd-media</filename> image, you should now copy the ISO file of a
&debian; ISO image<footnote>
<para>
-You can use either a businesscard, a netinst or a full CD image (see
+You can use either a netinst or a full CD image (see
<xref linkend="official-cdrom"/>). Be sure to select one that fits.
Note that the <quote>netboot <filename>mini.iso</filename></quote> image is
not usable for this purpose.
en/install-methods/usb-setup/powerpc.xml : 64916 -> 68208
Index: en/install-methods/usb-setup/powerpc.xml
===================================================================
--- en/install-methods/usb-setup/powerpc.xml (Revision 64916)
+++ en/install-methods/usb-setup/powerpc.xml (Revision 68208)
@@ -110,9 +110,17 @@
</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
-one that fits) onto the stick. When you are done, unmount the USB memory
+If you used an <filename>hd-media</filename> image, you should now copy the ISO file of a
+&debian; ISO image<footnote>
+
+<para>
+You can use either a netinst or a full CD image (see
+<xref linkend="official-cdrom"/>). Be sure to select one that fits.
+Note that the <quote>netboot <filename>mini.iso</filename></quote> image is
+not usable for this purpose.
+</para>
+
+</footnote> onto the stick. When you are done, unmount the USB memory
stick (<userinput>umount /mnt</userinput>).
</para>
en/install-methods/tftp/dhcp.xml : 65315 -> 67790
Index: en/install-methods/tftp/dhcp.xml
===================================================================
--- en/install-methods/tftp/dhcp.xml (Revision 65315)
+++ en/install-methods/tftp/dhcp.xml (Revision 67790)
@@ -80,7 +80,7 @@
host tftpclient {
# tftp client hardware address
hardware ethernet 00:10:DC:27:6C:15;
- filename "/pxelinux.0";
+ filename "pxelinux.0";
}
}
</screen></informalexample>
en/appendix/chroot-install.xml : 63062 -> 68478
Index: en/appendix/chroot-install.xml
===================================================================
--- en/appendix/chroot-install.xml (Revision 63062)
+++ en/appendix/chroot-install.xml (Revision 68478)
@@ -2,25 +2,25 @@
<!-- $Id$ -->
<sect1 id="linux-upgrade">
- <title>Installing &debian; from a Unix/Linux System</title>
+ <title>Installing &debian-gnu; from a Unix/Linux System</title>
<para>
-This section explains how to install &debian; from an existing
+This section explains how to install &debian-gnu; from an existing
Unix or Linux system, without using the menu-driven installer as
explained in the rest of the manual. This <quote>cross-install</quote>
-HOWTO has been requested by users switching to &debian; from
-Red Hat, Mandrake, and SUSE. In this section some familiarity with
+HOWTO has been requested by users switching to &debian-gnu; from
+Red Hat, Mandriva, 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;
+rolling. This is therefore a <quote>zero downtime</quote> &debian-gnu;
install. It's also a clever way for dealing with hardware that
otherwise doesn't play friendly with various boot or installation
media.
@@ -31,7 +31,7 @@
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 Linux 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
@@ -46,8 +46,8 @@
With your current *nix partitioning tools, repartition the hard
drive as needed, creating at least one filesystem plus swap. You
-need around 350MB of space available for a console only install,
-or about 1GB if you plan to install X (more if you intend to
+need around &base-system-size;MB of space available for a console only install,
+or about &task-desktop-lxde-inst;MB if you plan to install X (more if you intend to
install desktop environments like GNOME or KDE).
</para><para>
@@ -65,7 +65,7 @@
</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 @@
<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 @@
# 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 @@
<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
@@ -165,7 +165,7 @@
</para><para>
-If you have a &releasename; &debian; CD mounted at
+If you have a &releasename; &debian-gnu; CD mounted at
<filename>/cdrom</filename>, you could substitute a file URL instead
of the http URL: <userinput>file:/cdrom/debian/</userinput>
@@ -174,18 +174,16 @@
Substitute one of the following for <replaceable>ARCH</replaceable>
in the <command>debootstrap</command> command:
-<userinput>alpha</userinput>,
<userinput>amd64</userinput>,
-<userinput>arm</userinput>,
<userinput>armel</userinput>,
-<userinput>hppa</userinput>,
+<userinput>armhf</userinput>,
<userinput>i386</userinput>,
<userinput>ia64</userinput>,
-<userinput>m68k</userinput>,
<userinput>mips</userinput>,
<userinput>mipsel</userinput>,
<userinput>powerpc</userinput>,
-<userinput>s390</userinput>, or
+<userinput>s390</userinput>,
+<userinput>s390x</userinput>, or
<userinput>sparc</userinput>.
<informalexample><screen>
@@ -200,15 +198,15 @@
<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>
-# LANG=C chroot /mnt/debinst /bin/bash
+# LANG=C.UTF-8 chroot /mnt/debinst /bin/bash
</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>
@@ -235,8 +233,10 @@
<itemizedlist>
<listitem><para>
-create a default set of static device files using
+install the makedev package, and create a default set of static device files
+using (after chrooting)
<informalexample><screen>
+# apt-get install makedev
# cd /dev
# MAKEDEV generic
</screen></informalexample>
@@ -298,7 +298,7 @@
# 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:
@@ -335,13 +335,14 @@
<title>Setting Timezone</title>
<para>
-An option in the file <filename>/etc/default/rcS</filename> determines
+Setting the third line of the file <filename>/etc/adjtime</filename> to
+<quote>UTC</quote> or <quote>LOCAL</quote> determines
whether the system will interpret the hardware clock as being set to UTC
-or local time. The following command allows you to set that and choose
+respective local time. The following commands allow you to set that and choose
your timezone.
<informalexample><screen>
-# editor /etc/default/rcS
+# editor /etc/adjtime
# dpkg-reconfigure tzdata
</screen></informalexample>
@@ -475,8 +476,8 @@
To configure your keyboard (if needed):
<informalexample><screen>
-# aptitude install console-data
-# dpkg-reconfigure console-data
+# aptitude install console-setup
+# dpkg-reconfigure keyboard-configuration
</screen></informalexample>
</para><para>
@@ -492,49 +493,21 @@
<title>Install a Kernel</title>
<para>
-If you intend to boot this system, you probably want a Linux kernel
+If you intend to boot this system, you probably want a &arch-kernel; kernel
and a boot loader. Identify available pre-packaged kernels with:
<informalexample><screen>
-# apt-cache search linux-image
+# apt-cache search &kernelpackage;
</screen></informalexample>
</para><para>
-If you intend to use a pre-packaged kernel, you may want to create the
-configuration file <filename>/etc/kernel-img.conf</filename> before you
-do so. Here's an example file:
-
-<informalexample><screen>
-# Kernel image management overrides
-# See kernel-img.conf(5) for details
-do_symlinks = yes
-relative_links = yes
-do_bootloader = yes
-do_bootfloppy = no
-do_initrd = yes
-link_in_boot = no
-</screen></informalexample>
-
-</para><para>
-
-For detailed information about this file and the various options, consult
-its man page which will be available after installing the
-<classname>kernel-package</classname> package. We recommend that you check
-that the values are appropriate for your system.
-
-</para><para>
-
Then install the kernel package of your choice using its package name.
<informalexample><screen>
-# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</replaceable>
+# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</replaceable>
</screen></informalexample>
-If you did not create a <filename>/etc/kernel-img.conf</filename> before
-installing a pre-packaged kernel, you may be asked some questions during
-its installation that refer to it.
-
</para>
</sect2>
@@ -542,41 +515,41 @@
<title>Set up the Boot Loader</title>
<para>
-To make your &debian; system bootable, set up your boot loader to load
+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="x86">
+</para><para arch="any-x86">
-Check <userinput>info grub</userinput> or <userinput>man
-lilo.conf</userinput> for instructions on setting up the
-bootloader. If you are keeping the system you used to install Debian, just
-add an entry for the Debian install to your existing grub
-<filename>menu.lst</filename> or <filename>lilo.conf</filename>. For
+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 grub2
+<filename>grub.cfg</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>
(remember it will use
-<filename>lilo.conf</filename> relative to the system you call it from).
+<filename>lilo.conf</filename> relative to the system you call it from)</phrase>.
-</para><para arch="x86">
+</para><para arch="any-x86">
-Installing and setting up <classname>grub</classname> is as easy as:
+Installing and setting up <classname>grub2</classname> is as easy as:
<informalexample><screen>
-# aptitude install grub
+# aptitude install grub-pc
# grub-install /dev/<replaceable>hda</replaceable>
# update-grub
</screen></informalexample>
-The second command will install <command>grub</command> (in this case in
+The second command will install <command>grub2</command> (in this case in
the MBR of <literal>hda</literal>). The last command will create a sane
-and working <filename>/boot/grub/menu.lst</filename>.
+and working <filename>/boot/grub/grub.cfg</filename>.
</para><para>
Note that this assumes that a <filename>/dev/hda</filename> device file has
-been created. There are alternative methods to install <command>grub</command>,
+been created. There are alternative methods to install <command>grub2</command>,
but those are outside the scope of this appendix.
</para><para arch="x86">
@@ -594,31 +567,11 @@
label=Debian
</screen></informalexample>
-</para><para arch="x86">
-
-Depending on which bootloader you selected, you can now make some
-additional changes in <filename>/etc/kernel-img.conf</filename>.
-
-</para><para arch="x86">
-
-For the <classname>grub</classname> bootloader, you should
-set the <literal>do_bootloader</literal> option to <quote>no</quote>.
-And to automatically update your <filename>/boot/grub/menu.lst</filename>
-on installation or removal of Debian kernels, add the following lines:
-
-<informalexample><screen>
-postinst_hook = update-grub
-postrm_hook = update-grub
-</screen></informalexample>
-
-For the <classname>lilo</classname> bootloader, the value of
-<literal>do_bootloader</literal> needs to remain <quote>yes</quote>.
-
</para><para arch="powerpc">
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
@@ -646,6 +599,21 @@
</sect2>
<sect2>
+<title>Remote access: Installing SSH and setting a password</title>
+<para>
+
+In case you can login to the system via console, you can skip this section. If
+the system should be accessible via the network later on, you need to install
+SSH and set a password for root:
+
+<informalexample><screen>
+# aptitude install ssh
+# passwd
+</screen></informalexample>
+</para>
+ </sect2>
+
+ <sect2>
<title>Finishing touches</title>
<para>
en/appendix/preseed.xml : 62798 -> 68284
Index: en/appendix/preseed.xml
===================================================================
--- en/appendix/preseed.xml (Revision 62798)
+++ en/appendix/preseed.xml (Revision 68284)
@@ -93,12 +93,12 @@
<entry>hd-media <phrase condition="bootable-usb">(including usb-stick)</phrase></entry>
<entry>yes</entry>
<entry>yes</entry>
- <entry>yes<footnoteref linkend='apx-ps-net'/></entry>
+ <entry>yes<footnoteref linkend="apx-ps-net"/></entry>
</row><row condition="supports-floppy-boot">
<entry>floppy based (cd-drivers)</entry>
<entry>yes</entry>
<entry>yes</entry>
- <entry>yes<footnoteref linkend='apx-ps-net'/></entry>
+ <entry>yes<footnoteref linkend="apx-ps-net"/></entry>
</row><row condition="supports-floppy-boot">
<entry>floppy based (net-drivers)</entry>
<entry>yes</entry>
@@ -162,7 +162,7 @@
<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
@@ -254,15 +254,22 @@
For the other preseeding methods you need to tell the installer what file
to use when you boot it. This is normally done by passing the kernel a boot
parameter, either manually at boot time or by editing the bootloader
-configuration file (e.g. <filename>syslinux.cfg</filename>) and adding the
-parameter to the end of the append line(s) for the kernel.
+configuration file <phrase arch="linux-any">(e.g.
+<filename>syslinux.cfg</filename>) and adding the parameter to the end of
+the append line(s) for the kernel.</phrase><phrase arch="kfreebsd-any">(e.g.
+<filename>grub.cfg</filename>) and adding the parameter as a new
+<literal>set</literal> line for the kernel.</phrase><phrase arch="hurd-any">(e.g.
+<filename>grub.cfg</filename>) and adding the parameter to the end of the
+<filename>gnumach.gz</filename> line.</phrase>
</para><para>
If you do specify the preconfiguration file in the bootloader configuration,
you might change the configuration so you don't need to hit enter to boot the
-installer. For syslinux this means setting the timeout to <literal>1</literal>
-in <filename>syslinux.cfg</filename>.
+installer. <phrase arch="linux-any">For syslinux this means setting the timeout
+to <literal>1</literal> in <filename>syslinux.cfg</filename>.</phrase><phrase
+arch="kfrebsd-any;hurd-any">For grub this means setting the timeout to
+<literal>0</literal> in <filename>grub.cfg</filename>.</phrase>
</para><para>
@@ -292,8 +299,9 @@
<para>
Note that <filename>preseed/url</filename> can be shortened to just
-<filename>url</filename> and <filename>preseed/file</filename> to just
-<filename>file</filename> when they are passed as boot parameters.
+<filename>url</filename>, <filename>preseed/file</filename> to just
+<filename>file</filename> and <filename>preseed/file/checksum</filename> to just
+<filename>preseed-md5</filename> when they are passed as boot parameters.
</para>
</sect2>
@@ -360,7 +368,7 @@
out any options (like preconfiguration options) that it recognizes.
</para>
-<note><para>
+<note arch="linux-any"><para>
Current linux kernels (2.6.9 and later) accept a maximum of 32 command line
options and 32 environment options, including any options added by default
@@ -387,7 +395,7 @@
<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:
@@ -526,20 +534,28 @@
to separate columns a bit -->
<informaltable frame="none">
<tgroup cols="2"><tbody>
-<row><entry>auto</entry><entry>auto-install/enable</entry></row>
-<row><entry>classes</entry><entry>auto-install/classes</entry></row>
+<row><entry>priority</entry><entry>debconf/priority</entry></row>
<row><entry>fb</entry><entry>debian-installer/framebuffer</entry></row>
<row><entry>language</entry><entry>debian-installer/language</entry></row>
<row><entry>country</entry><entry>debian-installer/country</entry></row>
<row><entry>locale</entry><entry>debian-installer/locale</entry></row>
-<row><entry>priority</entry><entry>debconf/priority</entry></row>
+<row><entry>theme</entry><entry>debian-installer/theme</entry></row>
+<row><entry>auto</entry><entry>auto-install/enable</entry></row>
+<row><entry>classes</entry><entry>auto-install/classes</entry></row>
<row><entry>file</entry><entry>preseed/file</entry></row>
<row><entry>url</entry><entry>preseed/url</entry></row>
+<row><entry>domain</entry><entry>netcfg/get_domain</entry></row>
+<row><entry>hostname </entry><entry>netcfg/get_hostname</entry></row>
<row><entry>interface</entry><entry>netcfg/choose_interface</entry></row>
-<row><entry>hostname </entry><entry>netcfg/get_hostname</entry></row>
-<row><entry>domain</entry><entry>netcfg/get_domain</entry></row>
<row><entry>protocol</entry><entry>mirror/protocol</entry></row>
<row><entry>suite</entry><entry>mirror/suite</entry></row>
+<row><entry>modules</entry><entry>anna/choose_modules</entry></row>
+<row><entry>recommends</entry><entry>base-installer/install-recommends</entry></row>
+<row><entry>tasks</entry><entry>tasksel:tasksel/first</entry></row>
+<row><entry>desktop</entry><entry>tasksel:tasksel/desktop</entry></row>
+<row><entry>dmraid</entry><entry>disk-detect/dmraid/enable</entry></row>
+<row><entry>keymap</entry><entry>keyboard-configuration/xkb-keymap</entry></row>
+<row><entry>preseed-md5</entry><entry>preseed/file/checksum</entry></row>
</tbody></tgroup>
</informaltable>
@@ -554,7 +570,7 @@
to netboot, but if it appears to be an URL then installation media that
support network preseeding will download the file from the URL and use it as a
preconfiguration file. Here is an example of how to set it up in the dhcpd.conf
-for version 3 of the ISC DHCP server (the dhcp3-server Debian package).
+for version 3 of the ISC DHCP server (the dhcp3-server &debian; package).
</para>
@@ -574,10 +590,10 @@
</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>
@@ -615,7 +631,7 @@
with all leading/trailing whitespace condensed to a single space.
</para></listitem>
<listitem><para>
- For debconf variables (templates) used in the installer itself, the
+ For debconf variables (templates) used only in the installer itself, the
owner should be set to <quote>d-i</quote>; to preseed variables used
in the installed system, the name of the package that contains the
corresponding debconf template should be used. Only variables that have
@@ -708,6 +724,11 @@
relevant and will need to be replaced by debconf settings appropriate for
your architecture.
+</para><para>
+
+Details on how the different Debian Installer components actually work can be
+found in <xref linkend="module-details"/>.
+
</para>
<sect2 id="preseed-l10n">
@@ -751,40 +772,33 @@
#d-i debian-installer/country string NL
#d-i debian-installer/locale string en_GB.UTF-8
# Optionally specify additional locales to be generated.
-#d-i localechooser/supported-locales en_US.UTF-8, nl_NL.UTF-8
+#d-i localechooser/supported-locales multiselect en_US.UTF-8, nl_NL.UTF-8
</screen></informalexample>
</para><para>
-Keyboard configuration consists of selecting a keyboard architecture and a
-keymap. In most cases the correct keyboard architecture is selected by
-default, so there's normally no need to preseed it. The keymap must
-be known to the &d-i; for the selected keyboard architecture.
+Keyboard configuration consists of selecting a keymap and (for non-latin
+keymaps) a toggle key to switch between the non-latin keymap and the US keymap.
+Only basic keymap variants are available during installation. Advanced variants
+are available only in the installed system, through <command>dpkg-reconfigure
+keyboard-configuration</command>.
<informalexample role="example"><screen>
# Keyboard selection.
-#d-i console-tools/archs select at
-d-i console-keymaps-at/keymap select us
-# Example for a different keyboard architecture
-#d-i console-keymaps-usb/keymap select mac-usb-us
+# keymap is an alias for keyboard-configuration/xkb-keymap
+d-i keymap select us
+# d-i keyboard-configuration/toggle select No toggling
</screen></informalexample>
</para><para>
To skip keyboard configuration, preseed
-<classname>console-tools/archs</classname> with
+<classname>keymap</classname> with
<userinput>skip-config</userinput>.
This will result in the kernel keymap remaining active.
</para>
-<note><para>
-
-The changes in the input layer for 2.6 kernels have made the keyboard
-architecture virtually obsolete. For 2.6 kernels normally a <quote>PC</quote>
-(<userinput>at</userinput>) keymap should be selected.
-
-</para></note>
</sect2>
<sect2 id="preseed-network">
@@ -836,6 +850,10 @@
# To pick a particular interface instead:
#d-i netcfg/choose_interface select eth1
+# To set a different link detection timeout (default is 3 seconds).
+# Values are interpreted as seconds.
+#d-i netcfg/link_detection_timeout string 10
+
# If you have a slow dhcp server and the installer times out waiting for
# it, this might be useful.
#d-i netcfg/dhcp_timeout string 60
@@ -863,6 +881,11 @@
d-i netcfg/get_hostname string unassigned-hostname
d-i netcfg/get_domain string unassigned-domain
+# If you want to force a hostname, regardless of what either the DHCP
+# server returns or what the reverse DNS entry for the IP is, uncomment
+# and adjust the following line.
+#d-i netcfg/hostname string somehost
+
# Disable that annoying WEP key dialog.
d-i netcfg/wireless_wep string
# The wacky dhcp hostname that some ISPs use as a password of sorts.
@@ -897,6 +920,7 @@
# component for remote installation over SSH. This only makes sense if you
# intend to perform the remainder of the installation manually.
#d-i anna/choose_modules string network-console
+#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key
#d-i network-console/password password r00tme
#d-i network-console/password-again password r00tme
</screen></informalexample>
@@ -944,6 +968,75 @@
</sect2>
+ <sect2 id="preseed-account">
+ <title>Account setup</title>
+<para>
+
+The password for the root account and name and password for a first regular
+user's account can be preseeded. For the passwords you can use either clear
+text values or MD5 <emphasis>hashes</emphasis>.
+
+</para>
+<warning><para>
+
+Be aware that preseeding passwords is not completely secure as everyone
+with access to the preconfiguration file will have the knowledge of these
+passwords. Using MD5 hashes is considered slightly better in terms of
+security but it might also give a false sense of security as access to a
+MD5 hash allows for brute force attacks.
+
+</para></warning>
+
+<informalexample role="example"><screen>
+# Skip creation of a root account (normal user account will be able to
+# use sudo).
+#d-i passwd/root-login boolean false
+# Alternatively, to skip creation of a normal user account.
+#d-i passwd/make-user boolean false
+
+# Root password, either in clear text
+#d-i passwd/root-password password r00tme
+#d-i passwd/root-password-again password r00tme
+# or encrypted using an MD5 hash.
+#d-i passwd/root-password-crypted password [MD5 hash]
+
+# To create a normal user account.
+#d-i passwd/user-fullname string Debian User
+#d-i passwd/username string debian
+# Normal user's password, either in clear text
+#d-i passwd/user-password password insecure
+#d-i passwd/user-password-again password insecure
+# or encrypted using an MD5 hash.
+#d-i passwd/user-password-crypted password [MD5 hash]
+# Create the first user with the specified UID instead of the default.
+#d-i passwd/user-uid string 1010
+
+# The user account will be added to some standard initial groups. To
+# override that, use this.
+#d-i passwd/user-default-groups string audio cdrom video
+</screen></informalexample>
+
+<para>
+
+The <classname>passwd/root-password-crypted</classname> and
+<classname>passwd/user-password-crypted</classname> variables can also
+be preseeded with <quote>!</quote> as their value. In that case, the
+corresponding account is disabled. This may be convenient for the root
+account, provided of course that an alternative method is set up to allow
+administrative activities or root login (for instance by using SSH key
+authentication or <command>sudo</command>).
+
+</para><para>
+
+The following command can be used to generate an MD5 hash for a password:
+
+<informalexample><screen>
+$ printf "r00tme" | mkpasswd -s -m md5
+</screen></informalexample>
+
+</para>
+ </sect2>
+
<sect2 id="preseed-time">
<title>Clock and time zone setup</title>
@@ -987,7 +1080,7 @@
<filename>partman-auto-raid-recipe.txt</filename> included in the
<classname>debian-installer</classname> package.
Both files are also available from the
-<ulink url="&url-d-i-websvn;/trunk/installer/doc/devel/">&d-i; source
+<ulink url="&url-d-i-gitweb-doc-devel;">&d-i; source
repository</ulink>. Note that the supported functionality may change
between releases.
@@ -1030,6 +1123,7 @@
d-i partman-md/device_remove_md boolean true
# And the same goes for the confirmation to write the lvm partitions.
d-i partman-lvm/confirm boolean true
+d-i partman-lvm/confirm_nooverwrite boolean true
# You can choose one of the three predefined partitioning recipes:
# - atomic: all files in one partition
@@ -1084,6 +1178,9 @@
You can also use preseeding to set up partitions on software RAID arrays.
Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and
specifying spare devices.
+
+</para><para arch="any-x86">
+
If you are using RAID 1, you can preseed grub to install to all devices
used in the array; see <xref linkend="preseed-bootloader"/>.
@@ -1205,85 +1302,13 @@
# experienced users.
#d-i base-installer/install-recommends boolean false
-# Select the initramfs generator used to generate the initrd for 2.6 kernels.
-#d-i base-installer/kernel/linux/initramfs-generators string yaird
-
# The kernel image (meta) package to be installed; "none" can be used if no
# kernel is to be installed.
-#d-i base-installer/kernel/image string linux-image-2.6-486
+#d-i base-installer/kernel/image string &kernelpackage;-2.6-486
</screen></informalexample>
</sect2>
- <sect2 id="preseed-account">
- <title>Account setup</title>
-<para>
-
-The password for the root account and name and password for a first regular
-user's account can be preseeded. For the passwords you can use either clear
-text values or MD5 <emphasis>hashes</emphasis>.
-
-</para>
-<warning><para>
-
-Be aware that preseeding passwords is not completely secure as everyone
-with access to the preconfiguration file will have the knowledge of these
-passwords. Using MD5 hashes is considered slightly better in terms of
-security but it might also give a false sense of security as access to a
-MD5 hash allows for brute force attacks.
-
-</para></warning>
-
-<informalexample role="example"><screen>
-# Skip creation of a root account (normal user account will be able to
-# use sudo).
-#d-i passwd/root-login boolean false
-# Alternatively, to skip creation of a normal user account.
-#d-i passwd/make-user boolean false
-
-# Root password, either in clear text
-#d-i passwd/root-password password r00tme
-#d-i passwd/root-password-again password r00tme
-# or encrypted using an MD5 hash.
-#d-i passwd/root-password-crypted password [MD5 hash]
-
-# To create a normal user account.
-#d-i passwd/user-fullname string Debian User
-#d-i passwd/username string debian
-# Normal user's password, either in clear text
-#d-i passwd/user-password password insecure
-#d-i passwd/user-password-again password insecure
-# or encrypted using an MD5 hash.
-#d-i passwd/user-password-crypted password [MD5 hash]
-# Create the first user with the specified UID instead of the default.
-#d-i passwd/user-uid string 1010
-
-# The user account will be added to some standard initial groups. To
-# override that, use this.
-#d-i passwd/user-default-groups string audio cdrom video
-</screen></informalexample>
-
-<para>
-
-The <classname>passwd/root-password-crypted</classname> and
-<classname>passwd/user-password-crypted</classname> variables can also
-be preseeded with <quote>!</quote> as their value. In that case, the
-corresponding account is disabled. This may be convenient for the root
-account, provided of course that an alternative method is set up to allow
-administrative activities or root login (for instance by using SSH key
-authentication or <command>sudo</command>).
-
-</para><para>
-
-The following command can be used to generate an MD5 hash for a password:
-
-<informalexample><screen>
-$ printf "r00tme" | mkpasswd -s -m md5
-</screen></informalexample>
-
-</para>
- </sect2>
-
<sect2 id="preseed-apt">
<title>Apt setup</title>
<para>
@@ -1407,22 +1432,19 @@
</sect2>
- <sect2 id="preseed-bootloader">
+ <sect2 id="preseed-bootloader" arch="any-x86">
<title>Boot loader installation</title>
<informalexample role="example"><screen>
-# Grub is the default boot loader (for x86). If you want lilo installed
+<phrase arch="linux-any"># Grub is the default boot loader (for x86). If you want lilo installed
# instead, uncomment this:
#d-i grub-installer/skip boolean true
# To also skip installing lilo, and install no bootloader, uncomment this
# too:
-#d-i lilo-installer/skip boolean true
+#d-i lilo-installer/skip boolean true</phrase>
+<phrase arch="kfreebsd-any;hurd-any"># To install no bootloader, uncomment this
+#d-i grub-installer/skip boolean true</phrase>
-# With a few exceptions for unusual partitioning setups, GRUB 2 is now the
-# default. If you need GRUB Legacy for some particular reason, then
-# uncomment this:
-#d-i grub-installer/grub2_instead_of_grub_legacy boolean false
-
# This is fairly safe to set, it makes grub install automatically to the MBR
# if no other operating system is detected on the machine.
d-i grub-installer/only_debian boolean true
@@ -1438,6 +1460,8 @@
#d-i grub-installer/bootdev string (hd0,0)
# To install grub to multiple disks:
#d-i grub-installer/bootdev string (hd0,0) (hd1,0) (hd2,0)
+# To install to a particular device:
+#d-i grub-installer/bootdev string /dev/sda
# Optional password for grub, either in clear text
#d-i grub-installer/password password r00tme
@@ -1576,6 +1600,14 @@
questions that are actually displayed during an installation and not for
<quote>internal</quote> parameters.
+</para><para>
+
+For more debugging information, use the boot parameter
+<classname>DEBCONF_DEBUG=5</classname>.
+This will cause <classname>debconf</classname> to print much more detail
+about the current settings of each variable and about its progress through
+each package's installation scripts.
+
</para>
</sect2>
en/hardware/network-cards.xml : 64916 -> 68014
Index: en/hardware/network-cards.xml
===================================================================
--- en/hardware/network-cards.xml (Revision 64916)
+++ en/hardware/network-cards.xml (Revision 68014)
@@ -6,10 +6,11 @@
<para>
Almost any network interface card (NIC) supported by the &arch-kernel; kernel
-should also be supported by the installation system; modular drivers
+should also be supported by the installation system; drivers
should normally be loaded automatically.
-<phrase arch="x86">This includes most PCI and PCMCIA cards.</phrase>
+<phrase arch="x86">This includes most PCI/PCI-Express cards as well as
+PCMCIA/Express Cards on laptops.</phrase>
<phrase arch="i386">Many older ISA cards are supported as well.</phrase>
</para><para arch="sparc">
@@ -72,12 +73,7 @@
<para arch="arm">
On &arch-title;, most built-in Ethernet devices are supported and modules
-for additional PCI and USB devices are provided. The major exception is
-the IXP4xx platform (featuring devices such as the Linksys NSLU2) which
-needs a proprietary microcode for the operation of its built-in Ethernet
-device. Unofficial images for Linksys NSLU2 with this proprietary
-microcode can be obtained from the <ulink
-url="&url-slug-firmware;">Slug-Firmware site</ulink>.
+for additional PCI and USB devices are provided.
</para><para arch="x86">
@@ -91,7 +87,11 @@
Wireless networking is in general supported as well and a growing number of
wireless adapters are supported by the official &arch-kernel; kernel, although many
-of them do require firmware to be loaded. If firmware is needed, the installer
+of them do require firmware to be loaded.
+</para>
+
+<para arch="not-s390">
+If firmware is needed, the installer
will prompt you to load firmware. See <xref linkend="loading-firmware"/>
for detailed information on how to load firmware during the installation.
@@ -102,12 +102,6 @@
</para><para>
-Support for encrypted wireless during installation is currently limited to WEP.
-If your access point uses stronger encryption, it cannot be used during the
-installation process.
-
-</para><para>
-
If there is a problem with wireless and there
is no other NIC you can use during the installation, it is still
possible to install &debian-gnu; using a full CD-ROM or DVD image. Select the
en/hardware/accessibility.xml : 64829 -> 67297
Index: en/hardware/accessibility.xml
===================================================================
--- en/hardware/accessibility.xml (Revision 64829)
+++ en/hardware/accessibility.xml (Revision 67297)
@@ -23,7 +23,7 @@
Support for hardware speech synthesis devices is determined by the
underlying support found in <classname>speakup</classname>.
<classname>speakup</classname> only supports integrated boards and
-external devices connected to a serial port (no USB or serial-to-USB
+external devices connected to a serial port (no USB, serial-to-USB or PCI
adapters are supported). Details on supported hardware speech synthesis
devices can be found on the
<ulink url="&url-speakup;"><classname>speakup</classname> website</ulink>.
en/hardware/hardware-supported.xml : 61147 -> 68322
Index: en/hardware/hardware-supported.xml
===================================================================
--- en/hardware/hardware-supported.xml (Revision 61147)
+++ en/hardware/hardware-supported.xml (Revision 68322)
@@ -5,14 +5,14 @@
<title>Supported Hardware</title>
<para>
-Debian does not impose hardware requirements beyond the requirements
-of the Linux kernel and the GNU tool-sets. Therefore, any
-architecture or platform to which the Linux kernel, libc,
-<command>gcc</command>, etc. have been ported, and for which a Debian
-port exists, can run Debian. Please refer to the Ports pages at
+&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
<ulink url="&url-ports;"></ulink> for
more details on &arch-title; architecture systems which have been
-tested with Debian.
+tested with &debian-gnu;.
</para><para>
@@ -26,7 +26,7 @@
<sect2><title>Supported Architectures</title>
<para>
-Debian &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 @@
<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>
@@ -49,7 +49,7 @@
</row>
<row>
- <entry>AMD64 & Intel EM64T</entry>
+ <entry>AMD64 & Intel 64</entry>
<entry>amd64</entry>
<entry></entry>
<entry></entry>
@@ -75,13 +75,10 @@
</row>
<row>
- <entry morerows="1">HP PA-RISC</entry>
- <entry morerows="1">hppa</entry>
- <entry>PA-RISC 1.1</entry>
- <entry>32</entry>
-</row><row>
- <entry>PA-RISC 2.0</entry>
- <entry>64</entry>
+ <entry>ARM with hardware FPU</entry>
+ <entry>armhf</entry>
+ <entry>Freescale</entry>
+ <entry>mx5</entry>
</row>
<row>
@@ -149,21 +146,59 @@
<entry>tape</entry>
</row>
+<row>
+ <entry morerows="1">64bit IBM S/390</entry>
+ <entry morerows="1">s390x</entry>
+ <entry>IPL from VM-reader and DASD</entry>
+ <entry>generic</entry>
+</row><row>
+ <entry>IPL from tape</entry>
+ <entry>tape</entry>
+</row>
+
</tbody></tgroup></informaltable>
</para><para>
-This document covers installation for the
-<emphasis>&arch-title;</emphasis> architecture. If you are looking
-for information on any of the other Debian-supported architectures
+&debian; GNU/kFreeBSD &release; supports two architectures.
+
+</para><para>
+
+<informaltable>
+<tgroup cols="2">
+<thead>
+<row>
+ <entry>Architecture</entry><entry>&debian; Designation</entry>
+</row>
+</thead>
+
+<tbody>
+<row>
+ <entry>Intel x86-based</entry>
+ <entry>kfreebsd-i386</entry>
+</row>
+
+<row>
+ <entry>AMD64 & Intel 64</entry>
+ <entry>kfreebsd-amd64</entry>
+</row>
+
+</tbody></tgroup></informaltable>
+
+</para><para>
+
+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
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>
The &arch-title; architecture only supports Intel Itanium processors
-and not the much more common 64-bit processors from the EM64T family
+and not the much more common 64-bit processors from the Intel 64 family
(including e.g. the Pentium D and the Core2 Duo). Those
systems are supported by the <emphasis>amd64</emphasis> architecture
or, if you prefer a 32-bit userland, the <emphasis>i386</emphasis>
@@ -172,14 +207,15 @@
</para></caution>
<para condition="new-arch">
-This is the first official release of &debian; for the &arch-title;
+This is the first official release of &debian-gnu; for the &arch-title;
architecture. We feel that it has proven itself sufficiently to be
released. However, because it has not had the exposure (and hence
testing by users) that some other architectures have had, you may
encounter a few bugs. Use our
<ulink url="&url-bts;">Bug Tracking System</ulink> to report any
problems; make sure to mention the fact that the bug is on the
-&arch-title; platform. It can be necessary to use the
+&arch-title; platform using the <emphasis>&arch-kernel;</emphasis> kernel.
+It can be necessary to use the
<ulink url="&url-list-subscribe;">debian-&arch-listname; mailing list</ulink>
as well.
@@ -201,9 +237,14 @@
<sect2 arch="x86" id="laptops"><title>Laptops</title>
<para>
-Laptops are also supported and nowadays most laptops work out of the box.
-In case a laptop contains specialized or proprietary hardware, some specific
-functions may not be supported. To see if your particular laptop works well
+From a technical point of view, laptops are normal PCs, so all information
+regarding PC systems applies to laptops as well. Installations
+on laptops nowadays usually work out of the box, including things like
+automatically suspending the system on closing the lid and laptop specfic
+hardware buttons like those for disabling the wifi interfaces (<quote>airplane
+mode</quote>). Nonetheless sometimes the hardware vendors use specialized or
+proprietary hardware for some laptop-specific functions which
+might not be supported. To see if your particular laptop works well
with GNU/Linux, see for example the
<ulink url="&url-x86-laptop;">Linux Laptop pages</ulink>.
@@ -214,21 +255,18 @@
<title>Multiple Processors</title>
<para>
-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 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
-will hardly be noticable.
+Multiprocessor support — also called <quote>symmetric
+multiprocessing</quote> or SMP — is available for this
+architecture. Having multiple processors in a computer was originally
+only an issue for high-end server systems but has become quite common in
+recent years even for rather low-end desktop computers and laptops with
+the introduction of so called <quote>multi-core</quote> processors. These contain
+two or more processor units, called <quote>cores</quote>, in one physical chip.
</para><para>
-In order to optimize the kernel for single CPU systems, you'll have to
-replace the standard Debian kernel. 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>
-section of the kernel config.
+The standard &debian; &release; kernel image has been compiled with SMP support.
+It is also usable on non-SMP systems without problems.
</para>
</sect2>
@@ -240,14 +278,22 @@
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>
+
+Having multiple processors in a computer was originally
+only an issue for high-end server systems but has become quite common in
+recent years even for rather low-end desktop computers and laptops with
+the introduction of so called <quote>multi-core</quote> processors. These contain
+two or more processor units, called <quote>cores</quote>, in one physical chip.
+
</para><para arch="i386">
-The 486 flavour of the Debian kernel image packages for &arch-title;
+The 486 flavour of the &debian; kernel image packages for &arch-title;
is not compiled with SMP support.
</para>
@@ -259,19 +305,19 @@
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.
+only the first CPU.
</para><para>
In order to take advantage of multiple processors, you'll have to
-replace the standard Debian kernel. 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>
-section of the kernel config.
+section of the kernel config.</phrase>
</para>
</sect2>
@@ -282,7 +328,7 @@
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
@@ -296,11 +342,11 @@
</para><para>
-You can also build your own customized kernel to support SMP. You can find
+You can also build your own customized kernel to support SMP.<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>
-section of the kernel config.
+section of the kernel config.</phrase>
</para>
</sect2>
@@ -308,19 +354,20 @@
<sect2 id="gfx" arch="not-s390"><title>Graphics Card Support</title>
<para arch="x86">
-You should be using a VGA-compatible display interface for the console
-terminal. Nearly every modern display card is compatible with
-VGA. Ancient standards such CGA, MDA, or HGA should also work,
-assuming you do not require X11 support. Note that X11 is not used
-during the installation process described in this document.
-
+&debian;'s support for graphical interfaces is determined by the
+underlying support found in X.Org's X11 system. On modern PCs,
+having a graphical display usually works out of the box. Whether
+advanced graphics card features such as 3D-hardware acceleration
+or hardware-accelerated video are available, depends on the
+actual graphics hardware used in the system and in some cases
+on the installation of additional <quote>firmware</quote> images (see <xref
+linkend="hardware-firmware"/>). In very few cases there have
+been reports about hardware on which installation of additional graphics
+card firmware was required even for basic graphics support, but
+these have been rare exceptions.
</para><para>
-
-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
+Details on supported graphics cards and pointing devices can be found at
+<ulink url="&url-xorg;"></ulink>. &debian; &release; ships
with X.Org version &x11ver;.
</para><para arch="mips">
@@ -370,24 +417,45 @@
to be loaded into the device before it can become operational. This is most
common for network interface cards (especially wireless NICs), but for example
some USB devices and even some hard disk controllers also require firmware.
+With many graphics cards, basic functionality is available without
+additional firmware, but the use of advanced features requires an
+appropriate firmware file to be installed in the system.
</para><para>
+On many older devices which require firmware to work, the firmware file was
+permanently placed in an EEPROM/Flash chip on the device itself by the
+manufacturer. Nowadays most new devices do not have the firmware embedded
+this way anymore, so the firmware file must be uploaded into the device by
+the host operating system every time the system boots.
+
+</para><para>
+
In most cases firmware is non-free according to the criteria used by the
-&debian; project and thus cannot be included in the main distribution
+&debian-gnu; project and thus cannot be included in the main distribution
or in the installation system. If the device driver itself is included in
-the distribution and if &debian; legally can distribute the firmware,
+the distribution and if &debian-gnu; legally can distribute the firmware,
it will often be available as a separate package from the non-free section
of the archive.
</para><para>
However, this does not mean that such hardware cannot be used during an
-installation. Starting with &debian; 5.0, &d-i; supports loading
+installation. Starting with &debian-gnu; 5.0, &d-i; supports loading
firmware files or packages containing firmware from a removable medium,
-such as a floppy disk or USB stick.
+such as a USB stick.
See <xref linkend="loading-firmware"/> for detailed information on how to
load firmware files or packages during the installation.
+</para><para>
+
+If the &d-i; prompts for a firmware file and you do not have this firmware
+file available or do not want to install a non-free firmware file on your
+system, you can try to proceed without loading the firmware. There are
+several cases where a driver prompts for additional firmware because it may
+be needed under certain circumstances, but the device does work without it
+on most systems (this e.g. happens with certain network cards using the tg3
+driver).
+
</para>
</sect1>
en/hardware/buying-hardware.xml : 64916 -> 68011
Index: en/hardware/buying-hardware.xml
===================================================================
--- en/hardware/buying-hardware.xml (Revision 64916)
+++ en/hardware/buying-hardware.xml (Revision 68011)
@@ -36,63 +36,52 @@
Some hardware manufacturers simply won't tell us how to write drivers
for their hardware. Others won't allow us access to the documentation
without a non-disclosure agreement that would prevent us from
-releasing the &arch-kernel; source code.
+releasing the driver's source code, which is one of the central
+elements of free software.
+Since we haven't been granted access to usable documentation on these
+devices, they simply won't work under &arch-kernel;.
</para><para>
-Since we haven't been granted access to the documentation on these
-devices, they simply won't work under &arch-kernel;. You can help by asking
-the manufacturers of such hardware to release the documentation. If
-enough people ask, they will realize that the free software community
-is an important market.
+In many cases there are standards (or at least some de-facto standards)
+describing how an operating system and its device drivers communicate with a
+certain class of devices. All devices which comply to such a
+(de-facto-)standard can be used with a single generic device driver and no
+device-specific drivers are required. With some kinds of hardware (e.g.
+USB <quote>Human Interface Devices</quote>, i.e. keyboards, mice, etc., and USB mass
+storage devices like USB flash disks and memory card readers) this works
+very well and practically every device sold in the market is
+standards-compliant.
-</para>
-</sect2>
+</para><para>
+In other fields, among them e.g. printers, this is unfortunately not the
+case. While there are many printers which can be addressed via a small set
+of (de-facto-)standard control languages and therefore can be made to work
+without problems in any operating system, there are quite a few models which
+only understand proprietary control commands for which no usable
+documentation is available and therefore either cannot be used at
+all on free operating systems or can only be used with a vendor-supplied
+closed-source driver.
- <sect2 arch="any-x86"><title>Windows-specific Hardware</title>
-<para>
-
-A disturbing trend is the proliferation of Windows-specific modems and
-printers. In some cases these are specially designed to be operated by
-the Microsoft Windows operating system and bear the legend <quote>WinModem</quote>
-or <quote>Made especially for Windows-based computers</quote>. This
-is generally done by removing the embedded processors of the hardware
-and shifting the work they do over to a Windows driver that is run by
-your computer's main CPU. This strategy makes the hardware less
-expensive, but the savings are often <emphasis>not</emphasis> passed on to the
-user and this hardware may even be more expensive than equivalent
-devices that retain their embedded intelligence.
-
</para><para>
-You should avoid Windows-specific hardware for two reasons. The first
-is that the manufacturers do not generally make the resources
-available to write a &arch-kernel; driver. Generally, the hardware and
-software interface to the device is proprietary, and documentation is
-not available without a non-disclosure agreement, if it is available
-at all. This precludes it being used for free software, since free
-software writers disclose the source code of their programs. The
-second reason is that when devices like these have had their embedded
-processors removed, the operating system must perform the work of the
-embedded processors, often at <emphasis>real-time</emphasis> priority,
-and thus the CPU is not available to run your programs while it is
-driving these devices. Since the typical Windows user does not
-multi-process as intensively as a &arch-kernel; user, the manufacturers hope
-that the Windows user simply won't notice the burden this hardware
-places on their CPU. However, any multi-processing operating system,
-even Windows 2000 or XP, suffers from degraded performance when
-peripheral manufacturers skimp on the embedded processing power of
-their hardware.
+Even if there is a vendor-provided closed-source driver for such hardware
+when purchasing the device, the practical lifespan of the device is limited
+by driver availability. Nowadays product cycles have become short and it is
+not uncommon that a short time after a consumer device has ceased
+production, no driver updates get made available any more by the
+manufacturer. If the old closed-source driver does not work anymore after a
+system update, an otherwise perfectly working device becomes unusable due to
+lacking driver support and there is nothing that can be done in this case.
+You should therefore avoid buying closed hardware in the first place,
+regardless of the operating system you want to use it with.
</para><para>
-You can help improve this situation by encouraging these manufacturers
-to release the documentation and other resources necessary for us to
-program their hardware, but the best strategy is simply to avoid this
-sort of hardware<phrase arch="linux-any"> until it is listed as working
-in the <ulink url="&url-hardware-howto;">Linux Hardware Compatibility
-HOWTO</ulink></phrase>.
+You can help improve this situation by encouraging manufacturers of closed
+hardware to release the documentation and other resources necessary for us
+to provide free drivers for their hardware.
</para>
</sect2>
en/hardware/supported-peripherals.xml : 64720 -> 67991
Index: en/hardware/supported-peripherals.xml
===================================================================
--- en/hardware/supported-peripherals.xml (Revision 64720)
+++ en/hardware/supported-peripherals.xml (Revision 67991)
@@ -11,18 +11,15 @@
</para><para arch="x86">
-USB hardware generally works fine, only some
-USB keyboards may require additional configuration
-(see <xref linkend="hardware-issues"/>).
+USB hardware generally works fine. On some very old PC systems some
+USB keyboards may require additional configuration (see <xref linkend="hardware-issues"/>).
+On modern PCs, USB keyboards and mice work without requiring any
+specific configuration.
-</para><para arch="x86">
+</para>
-Again, see the
-<ulink url="&url-hardware-howto;">Linux Hardware Compatibility HOWTO</ulink>
-to determine whether your specific hardware is supported by Linux.
+<para arch="s390">
-</para><para arch="s390">
-
Package installations from XPRAM and tape are not supported by this
system. All packages that you want to install need to be available on a
DASD or over the network using NFS, HTTP or FTP.
en/hardware/installation-media.xml : 64916 -> 67991
Index: en/hardware/installation-media.xml
===================================================================
--- en/hardware/installation-media.xml (Revision 64916)
+++ en/hardware/installation-media.xml (Revision 67991)
@@ -7,8 +7,7 @@
<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;. 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.
@@ -29,32 +28,21 @@
</para>
</sect2>
- <sect2><title>CD-ROM/DVD-ROM</title>
+ <sect2 arch="not-s390"><title>CD-ROM/DVD-ROM</title>
<note><para>
Whenever you see <quote>CD-ROM</quote> in this manual, it applies to both
CD-ROMs and DVD-ROMs, because both technologies are really
-the same from the operating system's point of view, except for some very
-old nonstandard CD-ROM drives which are neither SCSI nor IDE/ATAPI.
+the same from the operating system's point of view.
</para></note><para>
-CD-ROM based installation is supported for some architectures.
-On machines which support bootable CD-ROMs, you should be able to do a
-completely
-<phrase arch="not-s390">floppy-less</phrase>
-<phrase arch="s390">tape-less</phrase>
-installation. Even if your system doesn't
-support booting from a CD-ROM, you can use the CD-ROM in conjunction
-with the other techniques to install your system, once you've booted
-up by other means; see <xref linkend="boot-installer"/>.
+CD-ROM based installation is supported for most architectures.
</para><para arch="x86">
-SCSI, SATA and IDE/ATAPI CD-ROMs are supported. The <ulink
-url="&url-cd-howto;">Linux CD-ROM HOWTO</ulink> contains in-depth information
-on using CD-ROMs with Linux.
+On PCs SATA, IDE/ATAPI and SCSI CD-ROMs are supported.
</para><para arch="x86">
@@ -79,32 +67,16 @@
</para>
</sect2>
- <sect2><title>Hard Disk</title>
-
-<para>
-
-Booting the installation system directly from a hard disk is another option
-for many architectures. This will require some other operating system
-to load the installer onto the hard disk.
-
-</para><para arch="sparc">
-
-Although the &arch-title; does not allow booting from SunOS
-(Solaris), you can install from a SunOS partition (UFS slices).
-
-</para>
- </sect2>
-
<sect2 condition="bootable-usb"><title>USB Memory Stick</title>
<para>
-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
-necessary) for recovering the system. This is also useful for small
-systems which have no room for unnecessary drives.
+USB flash disks a.k.a. USB memory sticks have become a commonly
+used and cheap storage device. Most modern computer systems
+also allow booting the &d-i; from such a stick.
+Many modern computer systems, in particular netbooks and thin laptops, do not have
+a CD/DVD-ROM drive anymore at all and booting from USB media ist
+the standard way of installing a new operating system on them.
</para>
</sect2>
@@ -124,7 +96,14 @@
</para><para condition="supports-tftp">
You can also <emphasis>boot</emphasis> the installation system over the
-network. <phrase arch="mips;mipsel">This is the preferred installation technique
+network without needing any local media like CDs/DVDs or USB sticks. If
+you already have a netboot-infrastructure available (i.e. you are already
+running DHCP and TFTP services in your network), this allows an easy and fast
+deployment of a large number of machines. Setting up the necessary
+infrastructure requires a certain level of technical experience, so this is
+not recommended for novice users.
+
+<phrase arch="mips;mipsel">This is the preferred installation technique
for &arch-title;.</phrase>
</para><para condition="supports-nfsroot">
@@ -135,6 +114,25 @@
</para>
</sect2>
+
+ <sect2><title>Hard Disk</title>
+
+<para>
+
+Booting the installation system directly from a hard disk is another option
+for many architectures. This will require some other operating system
+to load the installer onto the hard disk. This method is only recommended
+for special cases when no other installation method is available.
+
+</para><para arch="sparc">
+
+Although the &arch-title; does not allow booting from SunOS
+(Solaris), you can install from a SunOS partition (UFS slices).
+
+</para>
+ </sect2>
+
+
<sect2><title>Un*x or GNU system</title>
<para>
@@ -144,7 +142,8 @@
manual. This kind of install may be useful for users with otherwise
unsupported hardware or on hosts which can't afford downtime. If you
are interested in this technique, skip to the <xref
-linkend="linux-upgrade"/>.
+linkend="linux-upgrade"/>. This installation method is only recommended
+for advanced users when no other installation method is available.
</para>
</sect2>
@@ -153,21 +152,16 @@
<para>
-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
-installed on the widest array of hardware.
-
+The &debian; installer contains a kernel which is built to maximize the
+number of systems it runs on.
</para><para arch="x86">
+Generally, the &debian; installation system includes support for IDE (also
+known as PATA) drives, SATA and SCSI controllers and drives, USB, and
+FireWire. The supported file systems include FAT, Win-32 FAT extensions
+(VFAT) and NTFS.
-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.
+<!--
</para><para arch="i386">
Disk interfaces that emulate the <quote>AT</quote> hard disk interface
@@ -175,6 +169,7 @@
SCSI disk controllers from many different manufacturers are supported. See the
<ulink url="&url-hardware-howto;">Linux Hardware Compatibility HOWTO</ulink>
for more details.
+-->
</para><para arch="sparc">
en/hardware/supported/arm.xml : 64916 -> 67982
Index: en/hardware/supported/arm.xml
===================================================================
--- en/hardware/supported/arm.xml (Revision 64916)
+++ en/hardware/supported/arm.xml (Revision 67982)
@@ -42,32 +42,18 @@
</varlistentry>
<varlistentry>
-<term>IXP4xx</term>
-<listitem><para>
-
-The IXP4xx platform is based on Intel's XScale ARM core. Currently, only
-one IXP4xx based system is supported, the Linksys NSLU2.
-The Linksys NSLU2 (Network Storage Link for USB 2.0 Disk Drives) is a small
-device which allows you to easily provide storage via the network. It
-comes with an Ethernet connection and two USB ports to which hard drives
-can be connected. There is an external site with <ulink
-url="&url-arm-cyrius-nslu2;">installation instructions</ulink>.
-
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
<term>Kirkwood</term>
<listitem><para>
Kirkwood is a system on a chip (SoC) from Marvell that integrates an ARM
CPU, Ethernet, SATA, USB, and other functionality in one chip. We
-currently support the following Kirkwood based devices: OpenRD (OpenRD-Base
-and OpenRD-Client), <ulink
-url="&url-arm-cyrius-sheevaplug;">SheevaPlug</ulink> and <ulink
-url="&url-arm-cyrius-qnap-kirkwood;">QNAP Turbo Station</ulink> (TS-110,
-TS-119, TS-210, TS-219 and TS-219P; the TS-410 and TS-419P are not yet
-supported).
+currently support the following Kirkwood based devices: OpenRD
+(OpenRD-Base, OpenRD-Client and OpenRD-Ultimate), <ulink
+url="&url-arm-cyrius-sheevaplug;">plug computers (SheevaPlug, GuruPlug and
+DreamPlug)</ulink>, <ulink url="&url-arm-cyrius-qnap-kirkwood;">QNAP
+Turbo Station</ulink> (all TS-11x, TS-21x and TS-41x models), and LaCie
+NASes (Network Space v2, Network Space Max v2, Internet Space v2, d2
+Network v2, 2Big Network v2 and 5Big Network v2).
</para></listitem>
</varlistentry>
@@ -81,9 +67,8 @@
Network Attached Storage (NAS) devices on the market that are based on an
Orion chip. We currently support the following Orion based devices: <ulink
url="&url-arm-cyrius-kuroboxpro;">Buffalo Kurobox</ulink>, <ulink
-url="&url-arm-cyrius-mv2120;">HP mv2120</ulink>, <ulink
-url="&url-arm-cyrius-qnap;">QNAP Turbo Station</ulink> (TS-109, TS-209 and
-TS-409).
+url="&url-arm-cyrius-dns323;">D-Link DNS-323</ulink> and <ulink
+url="&url-arm-cyrius-mv2120;">HP mv2120</ulink>.
</para></listitem>
</varlistentry>
en/hardware/supported/i386.xml : 65170 -> 68322
Index: en/hardware/supported/i386.xml
===================================================================
--- en/hardware/supported/i386.xml (Revision 65170)
+++ en/hardware/supported/i386.xml (Revision 68322)
@@ -54,7 +54,7 @@
</para>
<note><para>
-If your system has a 64-bit processor from the AMD64 or Intel EM64T families,
+If your system has a 64-bit processor from the AMD64 or Intel 64 families,
you will probably want to use the installer for the amd64 architecture instead
of the installer for the (32-bit) i386 architecture.
en/hardware/supported/s390.xml : 39895 -> 67087
Index: en/hardware/supported/s390.xml
===================================================================
--- en/hardware/supported/s390.xml (Revision 39895)
+++ en/hardware/supported/s390.xml (Revision 67087)
@@ -2,20 +2,32 @@
<!-- $Id$ -->
- <sect2 arch="s390"><title>S/390 and zSeries machine types</title>
+ <sect2 arch="s390"><title>zSeries and System z machine types</title>
<para>
-Complete information regarding supported S/390 and zSeries machines can
-be found in IBM's Redbook
-<ulink url="http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg246264.pdf";>
-Linux for IBM eServer zSeries and S/390: Distributions</ulink> in
-chapter 2.1 or at the
-<ulink url="http://www-128.ibm.com/developerworks/linux/linux390/index.html";>zSeries
-page at the developerWorks</ulink>.
-In short, G5, Multiprise 3000, G6 and all zSeries are fully supported;
-Multiprise 2000, G3 and G4 machines are supported with IEEE floating
-point emulation and thus degraded performance.
+Since &debian; Squeeze, support for booting in ESA/390 mode was dropped.
+Your machine needs to support the z/Architecture, 64-bit support is
+mandatory. The userland of the s390 port is still compiled for ESA/390,
+though. All zSeries and System z hardware is fully supported.
+&arch-title; support software is included from the kernel 3.1 development
+stream. The most current information about IBM's Linux support can be found at
+the
+<ulink url="http://www.ibm.com/developerworks/linux/linux390/development_technical.html";>
+Linux on <trademark class="registered">System z</trademark> page on
+developerWorks</ulink>.
+
</para>
</sect2>
+ <sect2 arch="s390"><title>PAV and HyperPAV</title>
+<para>
+
+PAV and HyperPAV are supported transparently, multipathing is not needed to
+take advantage of these storage system features. Be sure to configure the
+devices during DASD device selection. The alias devices will not be
+offered neither for formatting, partitioning nor direct use.
+
+</para>
+ </sect2>
+
en/hardware/supported/amd64.xml : 39870 -> 68331
Index: en/hardware/supported/amd64.xml
===================================================================
--- en/hardware/supported/amd64.xml (Revision 39870)
+++ en/hardware/supported/amd64.xml (Revision 68331)
@@ -1,24 +1,13 @@
<!-- retain these comments for translator revision tracking -->
-<!-- $Id: i386.xml 39614 2006-08-07 15:50:11Z fjp $ -->
+<!-- $Id$ -->
-
- <sect2 arch="amd64"><title>CPU, Main Boards, and Video Support</title>
+ <sect2 arch="amd64"><title>CPU Support</title>
<para>
-Complete information concerning supported peripherals can be found at
-<ulink url="&url-hardware-howto;">Linux Hardware Compatibility HOWTO</ulink>.
-This section merely outlines the basics.
+Both AMD64 and Intel 64 processors are supported.
</para>
- <sect3><title>CPU</title>
-<para>
-
-Both AMD64 and Intel EM64t processors are supported.
-
-</para>
- </sect3>
-
<!-- Not sure if this is relevant for AMD64; AFAIK only PCI supported
<sect3 id="bus"><title>I/O Bus</title>
<para>
Eigenschaftsänderungen: en/hardware/supported/amd64.xml
___________________________________________________________________
Hinzugefügt: svn:keywords
+ Id
Reply to: