none

1 files changed, 11 insertions, 24 deletions

diff --git a/Hurd/DebianXorg.mdwn b/Hurd/DebianXorg.mdwn
index 1208b95c..28409171 100644
--- a/Hurd/DebianXorg.mdwn
+++ b/Hurd/DebianXorg.mdwn
@@ -26,33 +26,22 @@ Symbolic links to repeaters should also be created:
 
 ### <a name="Selecting_amp_Configuring_Packag"> Selecting &amp; Configuring Packages </a>
 
-BDd: You currently need to pull a couple of packages from youpi's repo.
-
-You will need several X packages. The `xserver-xorg` brings you most of what you need:
-
-* `xserver-xorg`
-* `xfonts-base`
-* `xfonts-100dpi`
-* `xfonts-75dpi`
-* `xfonts-scalable`
-* `xbase-clients`
-* `xutils`
-* `rxvt`
-* ... as well as your window manager of choice:
-  * WindowMaker, `wmaker`
-  * FVWM, `fvwm`
-  * Blackbox, `blackbox`
-  * TWM, `twm`
-
-I know that Window Maker works, however, I cannot attest to the others. xfce4 is broken.
+BDd: You currently need to pull the xserver-xorg package from <http://dept-info.labri.fr/~thibault/debian-hurd/>.
+
+The `x-window-system-core` package brings you most of what you need for a base, plus you need to choose a window manager:
+
+* WindowMaker, `wmaker`
+* FVWM, `fvwm`
+* Blackbox, `blackbox`
+* TWM, `twm`
+
+I know that Window Maker works, however, I cannot attest to the others. xfce4 is currently broken.
 
 The recommended way of configuring X is using the `xserver-xorg` debconf template, eg:
 
     # dpkg-reconfigure xserver-xorg
 
-This currently seems to be broken in the Debian package so you will probably have to create xorg.conf by hand.
-
-It may be easier to just copy a working configuration from another operating system on the same computer and place it in `/etc/X11/xorg.conf`, but this is discouraged as you would have to remove some sections by hand.
+This currently seems to be broken in the Debian package so it may be easier to just copy a working configuration from another operating system on the same computer and place it in `/etc/X11/xorg.conf`. You need to edit the mouse settings by hand according to the below example, though.
 
 **_IMPORTANT:_** when you configure X, make sure you do **NOT** enable the `speedo` and `dri` modules because they are currently broken.
 
@@ -120,8 +109,6 @@ Here is an example of my xorg.conf:
        Option      "CorePointer"
        Option      "Device"      "/dev/mouse"
        Option      "Protocol"      "osmouse"
-       Option      "Emulate3Buttons"   "true"
-       Option      "ZAxisMapping"      "4 5"
     EndSection
 
     Section "InputDevice"