summaryrefslogtreecommitdiff
path: root/en
diff options
context:
space:
mode:
authorSamuel Thibault <sthibault@debian.org>2010-09-16 23:27:30 +0000
committerSamuel Thibault <sthibault@debian.org>2010-09-16 23:27:30 +0000
commit87ab377750a0944f5246d55264a97b2bd67fe2b8 (patch)
tree0e39bc0bf0dc1e1e764ab366e96596c071b2e93f /en
parentf37ec6e62df14ad84472fc51b873d1c6f66fa37f (diff)
downloadinstallation-guide-87ab377750a0944f5246d55264a97b2bd67fe2b8.zip
* Fix "post-install" part for non-Linux ports.
Diffstat (limited to 'en')
-rw-r--r--en/boot-installer/trouble.xml2
-rw-r--r--en/hardware/hardware-supported.xml12
-rw-r--r--en/hardware/installation-media.xml4
-rw-r--r--en/post-install/further-reading.xml2
-rw-r--r--en/post-install/kernel-baking.xml2
-rw-r--r--en/post-install/mail-setup.xml2
-rw-r--r--en/post-install/new-to-unix.xml2
-rw-r--r--en/post-install/rescue.xml2
-rw-r--r--en/post-install/shutdown.xml4
9 files changed, 16 insertions, 16 deletions
diff --git a/en/boot-installer/trouble.xml b/en/boot-installer/trouble.xml
index a07914193..22669f4fe 100644
--- a/en/boot-installer/trouble.xml
+++ b/en/boot-installer/trouble.xml
@@ -465,7 +465,7 @@ peripherals you don't own. You may also see the system pause for a
while. This happens when it is waiting for a device to respond, and
that device is not present on your system. If you find the time it
takes to boot the system unacceptably long, you can create a
-custom kernel later (see <xref linkend="kernel-baking"/>).
+custom kernel later <phrase arch="linux-any">(see <xref linkend="kernel-baking"/>)</phrase>.
</para>
</sect2>
diff --git a/en/hardware/hardware-supported.xml b/en/hardware/hardware-supported.xml
index b5f2ac2c3..ca21f27cd 100644
--- a/en/hardware/hardware-supported.xml
+++ b/en/hardware/hardware-supported.xml
@@ -253,11 +253,11 @@ will hardly be noticable.
</para><para>
In order to optimize the kernel for single CPU systems, you'll have to
-replace the standard Debian kernel. You can find a discussion of how
+replace the standard Debian kernel.<phrase arch="linux-any"> You can find a discussion of how
to do this in <xref linkend="kernel-baking"/>. At this time
(kernel version &kernelversion;) the way you disable SMP is to deselect
<quote>&smp-config-option;</quote> in the <quote>&smp-config-section;</quote>
-section of the kernel config.
+section of the kernel config.</phrase>
</para>
</sect2>
@@ -296,11 +296,11 @@ 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>
@@ -325,11 +325,11 @@ appropriate kernel package.
</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>
diff --git a/en/hardware/installation-media.xml b/en/hardware/installation-media.xml
index d8d938ec5..ec7986ea7 100644
--- a/en/hardware/installation-media.xml
+++ b/en/hardware/installation-media.xml
@@ -156,8 +156,8 @@ linkend="linux-upgrade"/>.
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 (see <xref linkend="kernel-baking"/> to learn how to
-build your own kernel). Support for the widest possible range of
+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.
diff --git a/en/post-install/further-reading.xml b/en/post-install/further-reading.xml
index 9f52631b0..c49c26239 100644
--- a/en/post-install/further-reading.xml
+++ b/en/post-install/further-reading.xml
@@ -37,7 +37,7 @@ Mail List Subscription</ulink> page.
Last, but not least, the <ulink url="http://lists.debian.org/">Debian Mailing
List Archives</ulink> contain a wealth of information on Debian.
-</para><para>
+</para><para arch="linux-any">
A general source of information on GNU/Linux is the
<ulink url="http://www.tldp.org/">Linux Documentation Project</ulink>.
diff --git a/en/post-install/kernel-baking.xml b/en/post-install/kernel-baking.xml
index 9a2d65832..d3fad6c5d 100644
--- a/en/post-install/kernel-baking.xml
+++ b/en/post-install/kernel-baking.xml
@@ -1,7 +1,7 @@
<!-- retain these comments for translator revision tracking -->
<!-- $Id$ -->
- <sect1 id="kernel-baking"><title>Compiling a New Kernel</title>
+ <sect1 arch="linux-any" id="kernel-baking"><title>Compiling a New Kernel</title>
<para>
Why would someone want to compile a new kernel? It is often not
diff --git a/en/post-install/mail-setup.xml b/en/post-install/mail-setup.xml
index 6251d0438..1e65b58b1 100644
--- a/en/post-install/mail-setup.xml
+++ b/en/post-install/mail-setup.xml
@@ -58,7 +58,7 @@ in combination with the traditional Linux tools.
Even if you are planning to use a graphical mail program, it is important
that a traditional MTA/MDA is also installed and correctly set up on your
-Linux system. Reason is that various utilities running on the
+&debian; system. Reason is that various utilities running on the
system<footnote>
<para>
diff --git a/en/post-install/new-to-unix.xml b/en/post-install/new-to-unix.xml
index 50284c380..c28cd9d00 100644
--- a/en/post-install/new-to-unix.xml
+++ b/en/post-install/new-to-unix.xml
@@ -12,7 +12,7 @@ in the <ulink url="&url-debian-reference;">Debian Reference</ulink>.
This <ulink url="&url-unix-faq;">list of Unix FAQs</ulink> contains a
number of UseNet documents which provide a nice historical reference.
-</para><para>
+</para><para arch="linux-any">
Linux is an implementation of Unix. The
<ulink url="&url-ldp;">Linux Documentation Project (LDP)</ulink>
diff --git a/en/post-install/rescue.xml b/en/post-install/rescue.xml
index 6feaff0c9..614738534 100644
--- a/en/post-install/rescue.xml
+++ b/en/post-install/rescue.xml
@@ -42,7 +42,7 @@ If possible, the installer will now present you with a shell prompt in the
file system you selected, which you can use to perform any necessary
repairs.
-<phrase arch="x86">
+<phrase arch="any-x86">
For example, if you need to reinstall the GRUB boot loader into the master
boot record of the first hard disk, you could enter the command
<userinput>grub-install '(hd0)'</userinput> to do so.
diff --git a/en/post-install/shutdown.xml b/en/post-install/shutdown.xml
index 1bcf78855..7fe11a87f 100644
--- a/en/post-install/shutdown.xml
+++ b/en/post-install/shutdown.xml
@@ -7,9 +7,9 @@
<para>
-To shut down a running Linux system, you must not reboot with the
+To shut down a running &debian; system, you must not reboot with the
reset switch on the front or back of your computer, or just turn off
-the computer. Linux should be shut down in a controlled manner,
+the computer. &debian; should be shut down in a controlled manner,
otherwise files might get lost and/or disk damage might occur. If you run a
desktop environment, there is usually an option to <quote>log out</quote>
available from the application menu that allows you to shutdown (or reboot)