summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nl/appendix/preseed.xml3
-rw-r--r--nl/hardware/hardware-supported.xml15
2 files changed, 15 insertions, 3 deletions
diff --git a/nl/appendix/preseed.xml b/nl/appendix/preseed.xml
index e0d59d7e9..984ad25da 100644
--- a/nl/appendix/preseed.xml
+++ b/nl/appendix/preseed.xml
@@ -1,5 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 60479 untranslated -->
+<!-- original version: 60603 untranslated -->
<!--
Be careful with the format of this file as it is parsed to generate
@@ -963,6 +963,7 @@ correct one will be selected before using preseeding.
<informalexample role="example"><screen>
# If the system has free space you can choose to only partition that space.
+# This is only honoured if partman-auto/method (below) is not set.
#d-i partman-auto/init_automatically_partition select biggest_free
# Alternatively, you can specify a disk to partition. The device name must
diff --git a/nl/hardware/hardware-supported.xml b/nl/hardware/hardware-supported.xml
index 32516a1ca..d8d38a96f 100644
--- a/nl/hardware/hardware-supported.xml
+++ b/nl/hardware/hardware-supported.xml
@@ -1,5 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 59840 untranslated -->
+<!-- original version: 60991 untranslated -->
<sect1 id="hardware-supported">
<title>Supported Hardware</title>
@@ -186,7 +186,18 @@ 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.
-</para><para condition="new-arch">
+</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
+(including e.g. the Pentium&nbsp;D and the Core2&nbsp;Duo). Those
+systems are supported by the <emphasis>amd64</emphasis> architecture
+or, if you prefer a 32-bit userland, the <emphasis>i386</emphasis>
+architecture.
+
+</para></caution>
+<para condition="new-arch">
This is the first official release of &debian; for the &arch-title;
architecture. We feel that it has proven itself sufficiently to be