From 853017d2c0211f190a1c7a984fc27fd463f29b46 Mon Sep 17 00:00:00 2001
From: Frans Pop <elendil@planet.nl>
Date: Mon, 22 Jan 2007 23:19:19 +0000
Subject: Update of untranslated documents

---
 nl/appendix/chroot-install.xml       |  4 +-
 nl/appendix/files.xml                | 91 +++++++++++++++++++++---------------
 nl/appendix/preseed.xml              |  4 +-
 nl/boot-installer/boot-installer.xml |  4 +-
 4 files changed, 59 insertions(+), 44 deletions(-)

diff --git a/nl/appendix/chroot-install.xml b/nl/appendix/chroot-install.xml
index 5961526f7..97f9ca09b 100644
--- a/nl/appendix/chroot-install.xml
+++ b/nl/appendix/chroot-install.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 44016 untranslated -->
+<!-- original version: 44410 untranslated -->
 
  <sect1 id="linux-upgrade">
  <title>Installing &debian; from a Unix/Linux System</title>
@@ -145,7 +145,7 @@ the files.
 
 <command>debootstrap</command> can download the needed files directly
 from the archive when you run it. You can substitute any Debian
-archive mirror for <userinput>http.us.debian.org/debian</userinput> in
+archive mirror for <userinput>&archive-mirror;/debian</userinput> in
 the command example below, preferably a mirror close to you
 network-wise. Mirrors are listed at
 <ulink url="http://www.debian.org/misc/README.mirrors"></ulink>.
diff --git a/nl/appendix/files.xml b/nl/appendix/files.xml
index 18288c192..b464dc9e7 100644
--- a/nl/appendix/files.xml
+++ b/nl/appendix/files.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 43841 untranslated -->
+<!-- original version: 44406 untranslated -->
 
 
  <sect1 id="linuxdevices"><title>Linux Devices</title>
@@ -115,53 +115,68 @@ The most important device files are listed in the tables below.
 
 </para>
 
-  <sect2>
-<title>Setting Up Your Mouse</title>
-
+  <sect2 arch="not-s390" id="device-mouse">
+  <title>Setting Up Your Mouse</title>
 <para>
 
-The mouse can be used in both the Linux console (with gpm) and the X window
-environment. The two uses can be made compatible if the gpm repeater is used
-to allow the signal to flow to the X server as shown:
-
-<informalexample><screen>
-mouse =&gt; /dev/psaux  =&gt; gpm =&gt; /dev/gpmdata -&gt; /dev/mouse =&gt; X
-         /dev/ttyS0             (repeater)        (symlink)
-         /dev/ttyS1
-</screen></informalexample>
-
-Set the repeater protocol to be raw (in <filename>/etc/gpm.conf</filename>) while
-setting X to the original mouse protocol in <filename>/etc/X11/XF86Config</filename>
-or <filename>/etc/X11/XF86Config-4</filename>.
+The mouse can be used in both the Linux console (with gpm) and the X
+window environment. Normally, this is a simple matter of installing
+<filename>gpm</filename> and the X server itself. Both should be
+configured to use <filename>/dev/input/mice</filename> as the mouse
+device. The correct mouse protocol is named <userinput>exps2</userinput>
+in gpm, and <userinput>ExplorerPS/2</userinput> in X. The respective
+configuration files are <filename>/etc/gpm.conf</filename> and
+<filename>/etc/X11/xorg.conf</filename>.
 
 </para><para>
 
-This approach to use gpm even in X has advantages when the mouse is
-unplugged inadvertently.  Simply restarting gpm with
-
-<informalexample><screen>
-# /etc/init.d/gpm restart
-</screen></informalexample>
-
-will re-connect the mouse in software without restarting X.
-
-</para><para>
+Certain kernel modules must be loaded in order for your mouse to work.
+In most cases the correct modules are autodetected, but not always for
+old-style serial and bus mice<footnote>
 
-If gpm is disabled or not installed for some reason, make sure to set X to
-read directly from a mouse device such as /dev/psaux. For details, refer
-to the 3-Button Mouse mini-Howto at
-<filename>/usr/share/doc/HOWTO/en-txt/mini/3-Button-Mouse.gz</filename>,
-<userinput>man gpm</userinput>,
-<filename>/usr/share/doc/gpm/FAQ.gz</filename>, and
-<ulink url="&url-xorg;current/doc/html/mouse.html">README.mouse</ulink>.
+<para>
+Serial mice usually have a 9-hole D-shaped connector; bus mice have an
+8-pin round connector, not to be confused with the 6-pin round connector
+of a PS/2 mouse or the 4-pin round connector of an ADB mouse.
+</para>
 
-</para><para arch="powerpc">
+</footnote>, which are quite rare except on very old computers. Summary
+of Linux kernel modules needed for different mouse types:
+ 
+<informaltable><tgroup cols="2"><thead>
+<row>
+  <entry>Module</entry>
+  <entry>Description</entry>
+</row>
+</thead><tbody>
+<row>
+  <entry>psmouse</entry>
+  <entry>PS/2 mice (should be autodetected)</entry>
+</row>
+<row>
+  <entry>usbhid</entry>
+  <entry>USB mice (should be autodetected)</entry>
+</row>
+<row>
+  <entry>sermouse</entry>
+  <entry>Most serial mice</entry>
+</row>
+<row>
+  <entry>logibm</entry>
+  <entry>Bus mouse connected to Logitech adapter card</entry>
+</row>
+<row>
+  <entry>inport</entry>
+  <entry>Bus mouse connected to ATI or Microsoft InPort card</entry>
+</row>
+</tbody></tgroup></informaltable>
 
-For PowerPC, in <filename>/etc/X11/XF86Config</filename> or
-<filename>/etc/X11/XF86Config-4</filename>, set the mouse device to
-<userinput>"/dev/input/mice"</userinput>.
+To load a mouse driver module, you can use the <command>modconf</command>
+command (from the package with the same name) and look in the category
+<userinput>kernel/drivers/input/mouse</userinput>.
 
 </para><para arch="powerpc">
+<!-- FJP 20070122: Unsure if this is still valid -->
 
 Modern kernels give you the capability to emulate a three-button mouse
 when your mouse only has one button. Just add the following lines to
diff --git a/nl/appendix/preseed.xml b/nl/appendix/preseed.xml
index afb0eb2dd..ad9546615 100644
--- a/nl/appendix/preseed.xml
+++ b/nl/appendix/preseed.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 44376 untranslated -->
+<!-- original version: 44410 untranslated -->
 
 <!--
 Be careful with the format of this file as it is parsed to generate
@@ -830,7 +830,7 @@ same as <classname>mirror/suite</classname>.
 
 <informalexample role="example"><screen>
 d-i mirror/country string enter information manually
-d-i mirror/http/hostname string http.us.debian.org
+d-i mirror/http/hostname string &archive-mirror;
 d-i mirror/http/directory string /debian
 d-i mirror/http/proxy string
 
diff --git a/nl/boot-installer/boot-installer.xml b/nl/boot-installer/boot-installer.xml
index 47a05d855..2e9d6a7ae 100644
--- a/nl/boot-installer/boot-installer.xml
+++ b/nl/boot-installer/boot-installer.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 43782 untranslated -->
+<!-- original version: 44407 untranslated -->
 
 <chapter id="boot-installer"><title>Booting the Installation System</title>
 
@@ -10,7 +10,7 @@
 
 <!-- This info is so architecture dependent, that I have turned the   -->
 <!-- structure inside out for this chapter. Each arch has a document. -->
-<!-- Note: archs hppa and mipsel are currently missing -->
+<!-- Note: arch hppa is currently missing -->
 
 <note condition="gtk"><para>
 
-- 
cgit v1.2.3