Clean up the section on Configuring X11:

- Reorder the first two paragraphs [1]
- Retire information concerning no longer relevant Xorg versions

PR:		docs/162154 [1]
Reported by:	R. Clayton <rclayton at monmouth dot edu>
Reviewed by:	gjb
This commit is contained in:
Manolis Kiagias 2011-10-30 17:29:14 +00:00
parent a7c304c534
commit 1c8ade92db
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=37879

View file

@ -397,14 +397,8 @@
<sect2> <sect2>
<title>Configuring X11</title> <title>Configuring X11</title>
<para>As of version 7.3, <application>&xorg;</application> can <para><application>&xorg;</application>
often work without any configuration file by simply typing at uses <acronym>HAL</acronym> to autodetect keyboards and mice.
prompt:</para>
<screen>&prompt.user; <userinput>startx</userinput></screen>
<para>Starting with version 7.4, <application>&xorg;</application>
can use <acronym>HAL</acronym> to autodetect keyboards and mice.
The <filename role="package">sysutils/hal</filename> and The <filename role="package">sysutils/hal</filename> and
<filename role="package">devel/dbus</filename> ports are installed <filename role="package">devel/dbus</filename> ports are installed
as dependencies of <filename role="package">x11/xorg</filename>, but as dependencies of <filename role="package">x11/xorg</filename>, but
@ -416,7 +410,13 @@ dbus_enable="YES"</programlisting>
<para>These services should be started (either manually or by <para>These services should be started (either manually or by
rebooting) before further <application>&xorg;</application> rebooting) before further <application>&xorg;</application>
configuration is attempted.</para> configuration or use is attempted.</para>
<para><application>&xorg;</application> can
often work without any further configuration steps by simply typing at
prompt:</para>
<screen>&prompt.user; <userinput>startx</userinput></screen>
<para>The automatic configuration may fail to work with some hardware, <para>The automatic configuration may fail to work with some hardware,
or may not set things up quite as desired. In these cases, manual or may not set things up quite as desired. In these cases, manual
@ -456,15 +456,7 @@ dbus_enable="YES"</programlisting>
<para>The next step is to test the existing <para>The next step is to test the existing
configuration to verify that <application>&xorg;</application> configuration to verify that <application>&xorg;</application>
can work with the graphics can work with the graphics
hardware on the target system. In <application>&xorg;</application> hardware on the target system. Type:</para>
versions up to 7.3, type:</para>
<screen>&prompt.root; <userinput>Xorg -config xorg.conf.new</userinput></screen>
<para>Starting with <application>&xorg;</application> 7.4 and above,
this test produces a black screen which may make it difficult
to diagnose whether X11 is working properly. The older behavior
is still available by using the <option>retro</option> option:</para>
<screen>&prompt.root; <userinput>Xorg -config xorg.conf.new -retro</userinput></screen> <screen>&prompt.root; <userinput>Xorg -config xorg.conf.new -retro</userinput></screen>
@ -483,15 +475,14 @@ dbus_enable="YES"</programlisting>
</keycombo>.</para> </keycombo>.</para>
<note> <note>
<para>In <application>&xorg;</application> versions up to 7.3, <para>The
the
<keycombo action="simul"> <keycombo action="simul">
<keycap>Ctrl</keycap> <keycap>Ctrl</keycap>
<keycap>Alt</keycap> <keycap>Alt</keycap>
<keycap>Backspace</keycap> <keycap>Backspace</keycap>
</keycombo> key combination could be used to break out of </keycombo> key combination may also be used to break out of
<application>&xorg;</application>. To enable it in <application>&xorg;</application>. To enable it,
version 7.4 and later, you can either type the following you can either type the following
command from any X terminal emulator:</para> command from any X terminal emulator:</para>
<screen>&prompt.user; <userinput>setxkbmap -option terminate:ctrl_alt_bksp</userinput></screen> <screen>&prompt.user; <userinput>setxkbmap -option terminate:ctrl_alt_bksp</userinput></screen>
@ -526,8 +517,9 @@ dbus_enable="YES"</programlisting>
<para>If the mouse does not work, you will need to first <para>If the mouse does not work, you will need to first
configure it before proceeding. See <xref linkend="mouse"> configure it before proceeding. See <xref linkend="mouse">
in the &os; install chapter. Additionally, starting with version in the &os; install chapter. In recent
7.4, the <literal>InputDevice</literal> sections in <application>Xorg</application> versions,
the <literal>InputDevice</literal> sections in
<filename>xorg.conf</filename> are ignored in favor of the <filename>xorg.conf</filename> are ignored in favor of the
autodetected devices. To restore the old behavior, add the autodetected devices. To restore the old behavior, add the
following line to the <literal>ServerLayout</literal> or following line to the <literal>ServerLayout</literal> or
@ -540,8 +532,8 @@ dbus_enable="YES"</programlisting>
switching).</para> switching).</para>
<note> <note>
<para>As previously explained since version 7.4, by default, <para>As previously explained
the <application>hald</application> daemon will the <application>hald</application> daemon will, by default,
automatically detect your keyboard. There are chances that automatically detect your keyboard. There are chances that
your keyboard layout or model will not be correct, desktop your keyboard layout or model will not be correct, desktop
environments like <application>GNOME</application>, environments like <application>GNOME</application>,