summaryrefslogtreecommitdiff
path: root/en
diff options
context:
space:
mode:
Diffstat (limited to 'en')
-rw-r--r--en/appendix/graphical.xml117
-rw-r--r--en/appendix/random-bits.xml1
-rw-r--r--en/boot-installer/x86.xml80
-rw-r--r--en/using-d-i/using-d-i.xml38
4 files changed, 117 insertions, 119 deletions
diff --git a/en/appendix/graphical.xml b/en/appendix/graphical.xml
index 5030a6d85..67c575a36 100644
--- a/en/appendix/graphical.xml
+++ b/en/appendix/graphical.xml
@@ -1,119 +1,2 @@
<!-- retain these comments for translator revision tracking -->
<!-- $Id$ -->
-
- <sect1 condition="gtk" id="graphical">
- <title>The Graphical Installer</title>
-<para>
-
-The graphical version of the installer is only available for a limited
-number of architectures, including &arch-title;. The functionality of
-the graphical installer is essentially the same as that of the regular
-installer as it basically uses the same programs, but with a different
-frontend.
-
-</para><para>
-
-Although the functionality is identical, the graphical installer still has
-a few significant advantages. The main advantage is that it supports more
-languages, namely those that use a character set that cannot be displayed
-with the regular <quote>newt</quote> frontend. It also has a few usability
-advantages such as the option to use a mouse, and in some cases several
-questions can be displayed on a single screen.
-
-</para><para arch="any-x86">
-
-The graphical installer is available with all CD images and with the
-hd-media installation method. To boot the graphical installer simply select
-the relevant option from the boot menu. Expert and rescue mode for the
-graphical installer can be selected from the <quote>Advanced options</quote>
-menu. The previously used boot methods <userinput>installgui</userinput>,
-<userinput>expertgui</userinput> and <userinput>rescuegui</userinput> can
-still be used from the boot prompt which is shown after selecting the
-<quote>Help</quote> option in the boot menu.
-
-</para><para arch="any-x86">
-
-There is also a graphical installer image that can be netbooted. And there
-is a special <quote>mini</quote> ISO image<footnote id="gtk-miniiso">
-
-<para>
-The mini ISO image can be downloaded from a &debian; mirror as described
-in <xref linkend="downloading-files"/>.
-Look for <filename>netboot/gtk/mini.iso</filename>.
-</para>
-
-</footnote>, which is mainly useful for testing.
-
-</para><para arch="powerpc">
-
-For &arch-title;, currently only an experimental <quote>mini</quote> ISO
-image is available<footnote id="gtk-miniiso">
-
-<para>
-The mini ISO image can be downloaded from a &debian; mirror as described
-in <xref linkend="downloading-files"/>.
-Look for <filename>netboot/gtk/mini.iso</filename>.
-</para>
-
-</footnote>. It should work on almost all PowerPC systems that have
-an ATI graphical card, but is unlikely to work on other systems.
-
-</para><para>
-
-Just as with the regular installer it is possible to add boot parameters
-when starting the graphical installer.
-
-</para>
-<note><para>
-
-The graphical installer requires significantly more memory to run than
-the regular installer: &minimum-memory-gtk;. If insufficient memory is
-available, it will automatically fall back to the regular
-<quote>newt</quote> frontend.
-
-</para><para>
-
-If the amount of memory in your system is below &minimum-memory;,
-the graphical installer may fail to boot at all while booting the
-regular installer would still work. Using the regular installer is
-recommended for systems with little available memory.
-
-</para></note>
-
- <sect2 id="gtk-using">
- <title>Using the graphical installer</title>
-<para>
-
-As already mentioned, the graphical installer basically works the same as
-the regular installer and thus the rest of this manual can be used to guide
-you through the installation process.
-
-</para><para>
-
-If you prefer using the keyboard over the mouse, there are two things you
-need to know. To expand a collapsed list (used for example for the selection
-of countries within continents), you can use the <keycap>+</keycap> and
-<keycap>-</keycap> keys. For questions where more than one item can be
-selected (e.g. task selection), you first need to tab to the
-&BTN-CONT; button after making your selections; hitting
-enter will toggle a selection, not activate &BTN-CONT;.
-
-</para><para>
-
-If a dialog offers additional help information, a <guibutton>Help</guibutton>
-button will be displayed. The help information can be accessed either by
-activating the button or by pressing the <keycap>F1</keycap> key.
-
-</para><para>
-
-To switch to another console, you will also need to use the
-<keycap>Ctrl</keycap> key, just as with the X Window System. For example,
-to switch to VT2 (the first debug shell) you would use: <keycombo>
-<keycap>Ctrl</keycap> <keycap>Left Alt</keycap> <keycap>F2</keycap>
-</keycombo>. The graphical installer itself runs on VT5, so you can use
-<keycombo> <keycap>Left Alt</keycap> <keycap>F5</keycap> </keycombo>
-to switch back.
-
-</para>
- </sect2>
- </sect1>
diff --git a/en/appendix/random-bits.xml b/en/appendix/random-bits.xml
index d3aa6bd33..206e4fd12 100644
--- a/en/appendix/random-bits.xml
+++ b/en/appendix/random-bits.xml
@@ -7,6 +7,5 @@
&chroot-install.xml;
&plip.xml;
&pppoe.xml;
-&graphical.xml;
</appendix>
diff --git a/en/boot-installer/x86.xml b/en/boot-installer/x86.xml
index 4a1ea3675..8c4739fab 100644
--- a/en/boot-installer/x86.xml
+++ b/en/boot-installer/x86.xml
@@ -473,3 +473,83 @@ to the boot prompt, as described in the help text.
</para>
</sect2>
+
+ <sect2 condition="gtk" id="graphical">
+ <title>The Graphical Installer</title>
+<para>
+
+The graphical version of the installer is only available for a limited
+number of architectures, including &arch-title;. The functionality of
+the graphical installer is essentially the same as that of the regular
+installer as it basically uses the same programs, but with a different
+frontend.
+
+</para><para>
+
+Although the functionality is identical, the graphical installer still has
+a few significant advantages. The main advantage is that it supports more
+languages, namely those that use a character set that cannot be displayed
+with the regular <quote>newt</quote> frontend. It also has a few usability
+advantages such as the option to use a mouse, and in some cases several
+questions can be displayed on a single screen.
+
+</para><para arch="any-x86">
+
+The graphical installer is available with all CD images and with the
+hd-media installation method. To boot the graphical installer simply select
+the relevant option from the boot menu. Expert and rescue mode for the
+graphical installer can be selected from the <quote>Advanced options</quote>
+menu. The previously used boot methods <userinput>installgui</userinput>,
+<userinput>expertgui</userinput> and <userinput>rescuegui</userinput> can
+still be used from the boot prompt which is shown after selecting the
+<quote>Help</quote> option in the boot menu.
+
+</para><para arch="any-x86">
+
+There is also a graphical installer image that can be netbooted. And there
+is a special <quote>mini</quote> ISO image<footnote id="gtk-miniiso">
+
+<para>
+The mini ISO image can be downloaded from a &debian; mirror as described
+in <xref linkend="downloading-files"/>.
+Look for <filename>netboot/gtk/mini.iso</filename>.
+</para>
+
+</footnote>, which is mainly useful for testing.
+
+</para><para arch="powerpc">
+
+For &arch-title;, currently only an experimental <quote>mini</quote> ISO
+image is available<footnote id="gtk-miniiso">
+
+<para>
+The mini ISO image can be downloaded from a &debian; mirror as described
+in <xref linkend="downloading-files"/>.
+Look for <filename>netboot/gtk/mini.iso</filename>.
+</para>
+
+</footnote>. It should work on almost all PowerPC systems that have
+an ATI graphical card, but is unlikely to work on other systems.
+
+</para><para>
+
+Just as with the regular installer it is possible to add boot parameters
+when starting the graphical installer.
+
+</para>
+<note><para>
+
+The graphical installer requires significantly more memory to run than
+the regular installer: &minimum-memory-gtk;. If insufficient memory is
+available, it will automatically fall back to the regular
+<quote>newt</quote> frontend.
+
+</para><para>
+
+If the amount of memory in your system is below &minimum-memory;,
+the graphical installer may fail to boot at all while booting the
+regular installer would still work. Using the regular installer is
+recommended for systems with little available memory.
+
+</para></note>
+ </sect2>
diff --git a/en/using-d-i/using-d-i.xml b/en/using-d-i/using-d-i.xml
index 1a0dc1dad..9b0e8bf83 100644
--- a/en/using-d-i/using-d-i.xml
+++ b/en/using-d-i/using-d-i.xml
@@ -119,8 +119,44 @@ installation, and <filename>/var/log/installer/</filename>
after the computer has been booted into the installed system.
</para>
- </sect1>
+ <sect2 id="gtk-using">
+ <title>Using the graphical installer</title>
+<para>
+
+The graphical installer basically works the same as
+the regular installer and thus the rest of this manual can be used to guide
+you through the installation process.
+
+</para><para>
+
+If you prefer using the keyboard over the mouse, there are two things you
+need to know. To expand a collapsed list (used for example for the selection
+of countries within continents), you can use the <keycap>+</keycap> and
+<keycap>-</keycap> keys. For questions where more than one item can be
+selected (e.g. task selection), you first need to tab to the
+&BTN-CONT; button after making your selections; hitting
+enter will toggle a selection, not activate &BTN-CONT;.
+
+</para><para>
+
+If a dialog offers additional help information, a <guibutton>Help</guibutton>
+button will be displayed. The help information can be accessed either by
+activating the button or by pressing the <keycap>F1</keycap> key.
+
+</para><para>
+
+To switch to another console, you will also need to use the
+<keycap>Ctrl</keycap> key, just as with the X Window System. For example,
+to switch to VT2 (the first debug shell) you would use: <keycombo>
+<keycap>Ctrl</keycap> <keycap>Left Alt</keycap> <keycap>F2</keycap>
+</keycombo>. The graphical installer itself runs on VT5, so you can use
+<keycombo> <keycap>Left Alt</keycap> <keycap>F5</keycap> </keycombo>
+to switch back.
+
+</para>
+ </sect2>
+ </sect1>
<sect1 id="modules-list"><title>Components Introduction</title>
<para>