summaryrefslogtreecommitdiff
path: root/nl/hardware
diff options
context:
space:
mode:
Diffstat (limited to 'nl/hardware')
-rw-r--r--nl/hardware/installation-media.xml28
-rw-r--r--nl/hardware/memory-disk-requirements.xml9
-rw-r--r--nl/hardware/supported/i386.xml12
3 files changed, 25 insertions, 24 deletions
diff --git a/nl/hardware/installation-media.xml b/nl/hardware/installation-media.xml
index 4fe874b25..54a4518e9 100644
--- a/nl/hardware/installation-media.xml
+++ b/nl/hardware/installation-media.xml
@@ -1,5 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 41881 untranslated -->
+<!-- original version: 43730 untranslated -->
<sect1 id="installation-media">
<title>Installation Media</title>
@@ -168,23 +168,27 @@ systems which have no room for unnecessary drives.
<sect2><title>Network</title>
-<para condition="supports-tftp">
+<para>
+
+The network can be used during the installtion to retrieve files needed
+for the installation. Whether the network is used or not depends on the
+installation method you choose and your answers to certain questions that
+will be asked during the installation. The installation system supports
+most types of network connection (including PPPoE, but not ISDN or PPP),
+via either HTTP or FTP. After the installation is completed, you can also
+configure your system to use ISDN and PPP.
+
+</para><para condition="supports-tftp">
-You can also <emphasis>boot</emphasis> your system over the network.
-<phrase arch="mips">This is the preferred installation technique for
-Mips.</phrase>
+You can also <emphasis>boot</emphasis> the installation system over the
+network. <phrase arch="mips">This is the preferred installation technique
+for &arch-title;.</phrase>
</para><para condition="supports-nfsroot">
Diskless installation, using network booting from a local area network
and NFS-mounting of all local filesystems, is another option.
-</para><para>
-
-After the operating system kernel is installed, you can install the
-rest of your system via any sort of network connection (including
-PPP after installation of the base system), via FTP or HTTP.
-
</para>
</sect2>
@@ -193,7 +197,7 @@ PPP after installation of the base system), via FTP or HTTP.
<para>
If you are running another Unix-like system, you could use it to install
-&debian; without using the &d-i; described in the rest of the
+&debian; without using the &d-i; described in the rest of this
manual. This kind of install may be useful for users with otherwise
unsupported hardware or on hosts which can't afford downtime. If you
are interested in this technique, skip to the <xref
diff --git a/nl/hardware/memory-disk-requirements.xml b/nl/hardware/memory-disk-requirements.xml
index e048007b8..3dd58e495 100644
--- a/nl/hardware/memory-disk-requirements.xml
+++ b/nl/hardware/memory-disk-requirements.xml
@@ -1,5 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 28672 untranslated -->
+<!-- original version: 43735 untranslated -->
<sect1 id="memory-disk-requirements">
<title>Memory and Disk Space Requirements</title>
@@ -7,11 +7,8 @@
<para>
You must have at least &minimum-memory; of memory and &minimum-fs-size; of hard disk
-space. For a minimal console-based system (all standard packages),
-250MB is required. If you want to install a reasonable amount of
-software, including the X Window System, and some development programs
-and libraries, you'll need at least 400MB. For a more or less complete
-desktop system, you'll need a few gigabytes.
+space. Note that these are really bare-minimum numbers. For more realistic
+figures, see <xref linkend="minimum-hardware-reqts"/>.
</para><para arch="m68k">
diff --git a/nl/hardware/supported/i386.xml b/nl/hardware/supported/i386.xml
index b21c7d1ba..4f3a0021b 100644
--- a/nl/hardware/supported/i386.xml
+++ b/nl/hardware/supported/i386.xml
@@ -1,5 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 43254 untranslated -->
+<!-- original version: 43730 untranslated -->
<sect2 arch="i386"><title>CPU, Main Boards, and Video Support</title>
@@ -16,13 +16,13 @@ This section merely outlines the basics.
Nearly all x86-based (IA-32) processors still in use in personal computers
are supported, including all varieties of Intel's "Pentium" series.
-This also includes 32-bit AMD and VIA (former Cyrix) processors, and new
+This also includes 32-bit AMD and VIA (former Cyrix) processors, and
processors like the Athlon XP and Intel P4 Xeon.
</para>
<note><para>
-If your system has a 64-bit AMD64, Intel EM64T or Intel Core 2 Duo processor,
+If your system has a 64-bit processor from the AMD64 or Intel EM64T families,
you will probably want to use the installer for the amd64 architecture instead
of the installer for the (32-bit) i386 architecture.
@@ -30,9 +30,9 @@ of the installer for the (32-bit) i386 architecture.
<para>
However, Debian GNU/Linux &releasename; will <emphasis>not</emphasis> run
-on 386 or earlier processors. Despite the architecture name "i386", Debian
-Sarge has <emphasis>dropped support</emphasis> for actual 80386 processors
-(and their clones), which were supported by earlier releases<footnote>
+on 386 or earlier processors. Despite the architecture name "i386", support
+for actual 80386 processors (and their clones) was dropped with the Sarge
+(r3.1) release of Debian<footnote>
<para>
We have long tried to avoid this, but in the end it was necessary due a