diff options
| -rw-r--r-- | build/entities/common.ent | 2 | ||||
| -rw-r--r-- | build/entities/urls.ent | 2 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | en/appendix/files.xml | 2 | ||||
| -rw-r--r-- | en/appendix/preseed.xml | 12 | ||||
| -rw-r--r-- | en/hardware/hardware-supported.xml | 12 |
6 files changed, 17 insertions, 14 deletions
diff --git a/build/entities/common.ent b/build/entities/common.ent index 42db4d26d..7e5094a4e 100644 --- a/build/entities/common.ent +++ b/build/entities/common.ent @@ -72,7 +72,7 @@ <!ENTITY low-mem-threshold "5¬ation-megabytes;"> <!-- version of X11 shipping with the current release --> -<!ENTITY x11ver "4.3.0"> +<!ENTITY x11ver "6.9"> <!-- an example of adding another image to lilo.conf, cf en/post-install.sgml etc. --> diff --git a/build/entities/urls.ent b/build/entities/urls.ent index 25965b849..df87c9d90 100644 --- a/build/entities/urls.ent +++ b/build/entities/urls.ent @@ -269,6 +269,8 @@ removed and text documention at link directs one to a URL that is broken." --> <!ENTITY url-xfree86-cardlist "&url-xfree86;cardlist.html"> +<!ENTITY url-xorg "http://xorg.freedesktop.org/"> + <!ENTITY url-simtel "ftp://ftp.simtel.net/pub/simtelnet/msdos/"> diff --git a/debian/changelog b/debian/changelog index b6c6362ad..023674060 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ installation-guide (2006XXXX) UNRELEASED; urgency=low [ Colin Watson ] * Add a few more supports-floppy-boot and bootable-usb conditionals to make it easier to turn all this off in rebuilds of the manual. + * Etch uses X.Org 6.9, and xserver-xorg instead of xserver-xfree86. -- Frans Pop <fjp@debian.org> Wed, 4 Jan 2006 23:03:45 +0100 diff --git a/en/appendix/files.xml b/en/appendix/files.xml index 3b81ebe48..b8facd70e 100644 --- a/en/appendix/files.xml +++ b/en/appendix/files.xml @@ -153,7 +153,7 @@ 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-xfree86;current/mouse.html">README.mouse</ulink>. +<ulink url="&url-xorg;current/doc/html/mouse.html">README.mouse</ulink>. </para><para arch="powerpc"> diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml index aadb0f48c..65fcce490 100644 --- a/en/appendix/preseed.xml +++ b/en/appendix/preseed.xml @@ -879,23 +879,23 @@ configurator does not do fully automatic configuration of everything. <informalexample role="example"><screen> # X can detect the right driver for some cards, but if you're preseeding, # you override whatever it chooses. Still, vesa will work most places. -#xserver-xfree86 xserver-xfree86/config/device/driver select vesa +#xserver-xorg xserver-xorg/config/device/driver select vesa # A caveat with mouse autodetection is that if it fails, X will retry it # over and over. So if it's preseeded to be done, there is a possibility of # an infinite loop if the mouse is not autodetected. -#xserver-xfree86 xserver-xfree86/autodetect_mouse boolean true +#xserver-xorg xserver-xorg/autodetect_mouse boolean true # Monitor autodetection is recommended. -xserver-xfree86 xserver-xfree86/autodetect_monitor boolean true +xserver-xorg xserver-xorg/autodetect_monitor boolean true # Uncomment if you have an LCD display. -#xserver-xfree86 xserver-xfree86/config/monitor/lcd boolean true +#xserver-xorg xserver-xorg/config/monitor/lcd boolean true # X has three configuration paths for the monitor. Here's how to preseed # the "medium" path, which is always available. The "simple" path may not # be available, and the "advanced" path asks too many questions. -xserver-xfree86 xserver-xfree86/config/monitor/selection-method \ +xserver-xorg xserver-xorg/config/monitor/selection-method \ select medium -xserver-xfree86 xserver-xfree86/config/monitor/mode-list \ +xserver-xorg xserver-xorg/config/monitor/mode-list \ select 1024x768 @ 60 Hz </screen></informalexample> diff --git a/en/hardware/hardware-supported.xml b/en/hardware/hardware-supported.xml index bd9712a3a..440d64e23 100644 --- a/en/hardware/hardware-supported.xml +++ b/en/hardware/hardware-supported.xml @@ -226,15 +226,15 @@ during the installation process described in this document. </para><para> Debian's support for graphical interfaces is determined by the -underlying support found in XFree86's X11 system. Most AGP, PCI and -PCIe video cards work under XFree86. Details on supported graphics +underlying support found in X.Org's X11 system. Most AGP, PCI and +PCIe video cards work under X.Org. Details on supported graphics buses, cards, monitors, and pointing devices can be found at -<ulink url="&url-xfree86;"></ulink>. Debian &release; ships -with XFree86 version &x11ver;. +<ulink url="&url-xorg;"></ulink>. Debian &release; ships +with X.Org version &x11ver;. </para><para arch="mips"> -The XFree86 X11 window system is only supported on the SGI Indy. The +The X.Org X11 window system is only supported on the SGI Indy. The Broadcom BCM91250A evaluation board has standard 3.3v PCI slots and supports VGA emulation or Linux framebuffer on a selected range of graphics cards. A <ulink url="&url-bcm91250a-hardware;">compatibility listing</ulink> for @@ -242,7 +242,7 @@ the BCM91250A is available. </para><para arch="mipsel"> -The XFree86 X11 window system is supported on some DECstation models. The +The X.Org X11 window system is supported on some DECstation models. The Broadcom BCM91250A evaluation board has standard 3.3v PCI slots and supports VGA emulation or Linux framebuffer on a selected range of graphics cards. A <ulink url="&url-bcm91250a-hardware;">compatibility listing</ulink> for |