summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolger Wansing <linux@wansing-online.de>2014-08-19 20:20:50 +0000
committerHolger Wansing <linux@wansing-online.de>2014-08-19 20:20:50 +0000
commit384e1b8d7730c6c88a9720ab32ff9c4c48446ad9 (patch)
tree43b03509752bb19444210d86698445d2482e188b
parent46c9f11b002da0bfa6c0a04494d32982f6d82ec8 (diff)
downloadinstallation-guide-384e1b8d7730c6c88a9720ab32ff9c4c48446ad9.zip
Update manual for graphical installer being the default installer
under i386 and amd64 for Jessie
-rw-r--r--debian/changelog2
-rw-r--r--en/boot-installer/x86.xml10
-rw-r--r--en/using-d-i/using-d-i.xml16
3 files changed, 19 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog
index a161f1186..391ed6c39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -59,6 +59,8 @@ installation-guide (201312xx) UNRELEASED; urgency=low
* Drop s390, ia64 and sparc from control / archlist files for Jessie
(means dropping installation-guide-s390 and installation-guide-sparc
packages)
+ * Update manual for graphical installer being the default installer
+ under i386 and amd64 for Jessie.
* Move contents of 'Graphical installer' appendix to regular parts
of the manual.
diff --git a/en/boot-installer/x86.xml b/en/boot-installer/x86.xml
index 8c4739fab..ee3f3b1a9 100644
--- a/en/boot-installer/x86.xml
+++ b/en/boot-installer/x86.xml
@@ -398,11 +398,11 @@ number of options.
</para><para>
-For a normal installation, select either the <quote>Install</quote> or
-the <quote>Graphical install</quote> entry &mdash; using either the
-arrow keys on your keyboard or by typing the first (highlighted) letter, the
-<quote>Install</quote> entry is already selected by default &mdash; and press
-&enterkey; to boot the installer.
+For a normal installation, select either the <quote>Graphical install</quote> or
+the <quote>Install</quote> entry &mdash; using either the
+arrow keys on your keyboard or by typing the first (highlighted) letter &mdash;
+and press &enterkey; to boot the installer. The
+<quote>Graphical install</quote> entry is already selected by default.
</para><para>
diff --git a/en/using-d-i/using-d-i.xml b/en/using-d-i/using-d-i.xml
index 9b0e8bf83..70b19e7a0 100644
--- a/en/using-d-i/using-d-i.xml
+++ b/en/using-d-i/using-d-i.xml
@@ -57,14 +57,22 @@ they are installed, you will need to start the installer in
the boot argument <userinput>priority=low</userinput>.
Expert mode gives you full control over &d-i;.
-</para><para condition="gtk">
+</para><para condition="x86">
For this architecture the &d-i; supports two different user interfaces: a
-character-based one and a graphical one. The character-based interface is
-used by default unless you selected the <quote>Graphical install</quote>
-option in the initial boot menu. For more information about the
+graphical one and a character-based one. The graphical interface is
+used by default unless you select an <quote>Install</quote>
+option in the boot menu. For more information about the
graphical installer, please refer to <xref linkend="graphical"/>.
+</para><para condition="powerpc">
+
+For this architecture the &d-i; supports two different user interfaces: a
+character-based one and a graphical one. The character-based interface is
+used by default unless you select the <quote>Graphical install</quote>
+option on purpose. For more information about the graphical installer, please
+refer to <xref linkend="graphical"/>.
+
</para><para condition="not-gtk">
For this architecture the installer uses a character-based user interface.