diff options
Diffstat (limited to 'fi/boot-installer')
-rw-r--r-- | fi/boot-installer/i386.xml | 13 | ||||
-rw-r--r-- | fi/boot-installer/m68k.xml | 14 | ||||
-rw-r--r-- | fi/boot-installer/parameters.xml | 11 | ||||
-rw-r--r-- | fi/boot-installer/trouble.xml | 14 |
4 files changed, 16 insertions, 36 deletions
diff --git a/fi/boot-installer/i386.xml b/fi/boot-installer/i386.xml index 01f694f23..ab9e91b25 100644 --- a/fi/boot-installer/i386.xml +++ b/fi/boot-installer/i386.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 31616 untranslated --> +<!-- original version: 33725 untranslated --> <sect2 arch="i386"><title>Booting from a CD-ROM</title> @@ -9,7 +9,7 @@ <!-- CD #1 of official Debian CD-ROM sets for &arch-title; will present a <prompt>boot:</prompt> prompt on most hardware. Press -<keycap>F3</keycap> to see the list of kernel options available +<keycap>F4</keycap> to see the list of kernel options available from which to boot. Just type your chosen flavor name (idepci, vanilla, compact, bf24) at the <prompt>boot:</prompt> prompt followed by &enterkey;. @@ -157,7 +157,7 @@ image=/boot/newinstall/vmlinuz label=newinstall initrd=/boot/newinstall/initrd.gz root=/dev/ram0 - append="<phrase condition="sarge">devfs=mount,dall </phrase>ramdisk_size=12000" + append="ramdisk_size=12000" </screen></informalexample> For more details, refer to the @@ -180,9 +180,7 @@ kernel (hd0,0)/boot/newinstall/vmlinuz root=/dev/ram0 ramdisk_size=12000 initrd (hd0,0)/boot/newinstall/initrd.gz </screen></informalexample> -and reboot. <phrase condition="sarge">If the boot fails, you can try adding -<userinput>devfs=mount,dall</userinput> to the <quote>kernel</quote> line. -</phrase> +and reboot. </para><para> @@ -342,8 +340,7 @@ parameters. Information on available boot methods and on boot parameters which might be useful can be found by pressing <keycap>F2</keycap> through -<phrase condition="sarge"><keycap>F7</keycap></phrase><phrase -condition="etch"><keycap>F8</keycap></phrase>. If you add any parameters to +<keycap>F8</keycap>. If you add any parameters to the boot command line, be sure to type the boot method (the default is <userinput>linux</userinput>) and a space before the first parameter (e.g., <userinput>linux debconf/priority=medium</userinput>). diff --git a/fi/boot-installer/m68k.xml b/fi/boot-installer/m68k.xml index 1dc18c6ec..83fcced23 100644 --- a/fi/boot-installer/m68k.xml +++ b/fi/boot-installer/m68k.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 30283 untranslated --> +<!-- original version: 33725 untranslated --> <sect2 arch="m68k"><title>Choosing an Installation Method</title> @@ -11,23 +11,13 @@ linux kernel. The installer should also require less memory when using a 2.4.x linux kernel as 2.2.x support requires a fixed-sized ramdisk and 2.4.x uses tmpfs. -</para><para condition="etch"> +</para><para> If you are using a 2.2.x linux kernel, then you need to use the &ramdisksize; kernel parameter. </para><para> -</para><para condition="sarge"> - -Also, if you are using a 2.2.x linux kernel, then you must make sure you -are using a ramdisk built to accommodate it, see the -<ulink url="&disturl;/main/installer-&architecture;/current/images/MANIFEST">MANIFEST</ulink>. -In general, this means you need to use the initrd22.gz ramdisk from the respective -directory. - -</para><para> - Make sure <userinput>root=/dev/ram</userinput> is one of your kernel parameters. diff --git a/fi/boot-installer/parameters.xml b/fi/boot-installer/parameters.xml index 5cd71f381..5367bf52b 100644 --- a/fi/boot-installer/parameters.xml +++ b/fi/boot-installer/parameters.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 30084 untranslated --> +<!-- original version: 33725 untranslated --> <sect1 id="boot-parms"><title>Boot Parameters</title> <para> @@ -77,9 +77,8 @@ The installation system recognizes a few additional boot parameters<footnote> Note that the kernel accepts a maximum of 8 command line options and 8 environment options (including any options added by default for the installer). If these numbers are exceeded, 2.4 kernels will drop any -excess options and 2.6 kernels will panic. -<phrase condition="etch">With kernel 2.6.9 or newer, you can use 32 -command line options and 32 environment options.</phrase> +excess options and 2.6 kernels will panic. With kernel 2.6.9 or newer, +you can use 32 command line options and 32 environment options. </para> @@ -305,7 +304,7 @@ automating the install. See <xref linkend="automatic-install"/>. </para></listitem> </varlistentry> -<varlistentry condition="etch"> +<varlistentry> <term>cdrom-detect/eject</term> <listitem><para> @@ -335,7 +334,7 @@ If you are using a 2.2.x kernel, you may need to set &ramdisksize;. </para></listitem> </varlistentry> -<varlistentry condition="etch"> +<varlistentry> <term>rescue/enable</term> <listitem><para> diff --git a/fi/boot-installer/trouble.xml b/fi/boot-installer/trouble.xml index 11769486f..6413f4833 100644 --- a/fi/boot-installer/trouble.xml +++ b/fi/boot-installer/trouble.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 32427 untranslated --> +<!-- original version: 33725 untranslated --> <sect1 id="boot-troubleshooting"> <title>Troubleshooting the Installation Process</title> @@ -199,15 +199,9 @@ custom kernel later (see <xref linkend="kernel-baking"/>). If you get through the initial boot phase but cannot complete the install, the bug reporter menu choice may be helpful. -<phrase condition="sarge"> -It copies system error logs and configuration information to a user-supplied -floppy. -</phrase> -<phrase condition="etch"> It lets you store system error logs and configuration information from the installer to a floppy, or download them in a web browser. -</phrase> - + This information may provide clues as to what went wrong and how to fix it. If you are submitting a bug report you may want to attach this information to the bug report. @@ -216,7 +210,7 @@ this information to the bug report. Other pertinent installation messages may be found in <filename>/var/log/</filename> during the -installation, and <filename>/var/log/debian-installer/</filename> +installation, and <filename>/var/log/installer/</filename> after the computer has been booted into the installed system. </para> @@ -231,7 +225,7 @@ encourage installation reports to be sent even if the installation is successful, so that we can get as much information as possible on the largest number of hardware configurations. -</para><para condition="etch"> +</para><para> If you have a working Debian system, the easiest way to send an installation report is to install the installation-report and reportbug packages |