Gentoo Archives: gentoo-doc-cvs

From: "Joshua Saddler (nightmorph)" <nightmorph@g.o>
To: gentoo-doc-cvs@l.g.o
Subject: [gentoo-doc-cvs] gentoo commit in xml/htdocs/doc/en: xorg-config.xml
Date: Wed, 09 Dec 2009 01:35:18
Message-Id: E1NIBSJ-0005PR-C4@stork.gentoo.org
1 nightmorph 09/12/09 01:35:03
2
3 Modified: xorg-config.xml
4 Log:
5 The big Xorg HOWOTO rewrite. This should take into account all the xserver 1.5 and 1.6 changes. I emphasized HAL/evdev for device management and configuration. xorg.conf is really only used as a last resort for things like display resolution. bug 267769.
6
7 Revision Changes Path
8 1.32 xml/htdocs/doc/en/xorg-config.xml
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.32&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.32&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?r1=1.31&r2=1.32
13
14 Index: xorg-config.xml
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
17 retrieving revision 1.31
18 retrieving revision 1.32
19 diff -u -r1.31 -r1.32
20 --- xorg-config.xml 2 Oct 2009 07:37:57 -0000 1.31
21 +++ xorg-config.xml 9 Dec 2009 01:35:03 -0000 1.32
22 @@ -1,8 +1,8 @@
23 <?xml version='1.0' encoding='UTF-8'?>
24 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
25 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.31 2009/10/02 07:37:57 nightmorph Exp $ -->
26 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.32 2009/12/09 01:35:03 nightmorph Exp $ -->
27
28 -<guide link="/doc/en/xorg-config.xml">
29 +<guide>
30 <title>The X Server Configuration HOWTO</title>
31
32 <author title="Author">
33 @@ -22,8 +22,8 @@
34 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
35 <license/>
36
37 -<version>1.22</version>
38 -<date>2009-10-02</date>
39 +<version>1.23</version>
40 +<date>2009-12-08</date>
41
42 <chapter>
43 <title>What is the X Window Server?</title>
44 @@ -88,31 +88,53 @@
45 <chapter>
46 <title>Installing Xorg</title>
47 <section>
48 +<title>Kernel configuration</title>
49 <body>
50
51 <p>
52 -Before installing Xorg you have to configure two important variables in the
53 +By default, Xorg uses <c>evdev</c>, a generic input driver. You'll need to
54 +activate support for <c>evdev</c> by making a change to your kernel
55 +configuration. (Read the
56 +<uri link="/doc/en/kernel-config.xml">Kernel Configuration Guide</uri> if you
57 +don't know how to setup your kernel.)
58 +</p>
59 +
60 +<pre caption="Enabling evdev in the kernel">
61 +Device Drivers ---&gt;
62 + Input device support ---&gt;
63 + &lt;*&gt; Event interface
64 +</pre>
65 +
66 +</body>
67 +</section>
68 +<section>
69 +<title>make.conf configuration</title>
70 +<body>
71 +
72 +<p>
73 +Before you install Xorg, you have to configure two important variables in the
74 <path>/etc/make.conf</path> file.
75 </p>
76
77 <p>
78 -The first one is <c>VIDEO_CARDS</c>. This is used to set the video drivers that
79 -you intend to use and is usually based on the kind and brand of card you have.
80 -The most common settings are <c>nvidia</c> for Nvidia cards or <c>fglrx</c> for
81 -ATI Radeon cards. Those are the proprietary drivers from Nvidia and ATI
82 -respectively. If you would like to use the open source versions, use <c>nv</c>
83 -rather than <c>nvidia</c> in the variable, but bear in mind that using this
84 -driver means no 3D acceleration at all. The free <c>radeon</c> and
85 -<c>radeonhd</c> drivers for ATI cards support 3D acceleration on older Radeons
86 -but don't yet support all the features of the newer ones. <c>VIDEO_CARDS</c> may
87 -contain more than one driver, in this case list of them should be separated with
88 -spaces.
89 +The first variable is <c>VIDEO_CARDS</c>. This is used to set the video drivers
90 +that you intend to use and is usually based on the kind and brand of card you
91 +have. The most common settings are <c>nvidia</c> for Nvidia cards or
92 +<c>fglrx</c> for ATI Radeon cards. Those are the proprietary drivers from Nvidia
93 +and ATI respectively. If you would like to use the open source nVidia driver,
94 +use <c>nv</c> rather than <c>nvidia</c> in the variable, but bear in mind that
95 +using this driver means no 3D acceleration at all. The free <c>radeon</c> and
96 +<c>radeonhd</c> drivers are available for ATI cards, and are more or less the
97 +equal of the proprietary <c>fglrx</c> driver. The <c>intel</c> driver may be
98 +used for desktops or laptops with common Intel integrated graphics chipsets.
99 +<c>VIDEO_CARDS</c> may contain more than one driver, in this case list of them
100 +should be separated with spaces.
101 </p>
102
103 <p>
104 The second variable is <c>INPUT_DEVICES</c> and is used to determine which
105 drivers are to be built for input devices. In most cases setting it to
106 -<c>keyboard mouse</c> should work just fine. If you use alternative input
107 +<c>evdev</c> should work just fine. If you use alternative input
108 devices, such as a Synaptics touchpad for a laptop, be sure to add it to
109 <c>INPUT_DEVICES</c>.
110 </p>
111 @@ -123,27 +145,27 @@
112 </p>
113
114 <pre caption="Sample make.conf entries">
115 -<comment>(For mouse and keyboard support)</comment>
116 -INPUT_DEVICES="keyboard mouse"
117 +<comment>(For mouse, keyboard, and Synaptics touchpad support)</comment>
118 +INPUT_DEVICES="evdev synaptics"
119 <comment>(For Nvidia cards)</comment>
120 VIDEO_CARDS="nvidia"
121 <comment>(OR, for ATI Radeon cards)</comment>
122 -VIDEO_CARDS="fglrx"
123 +VIDEO_CARDS="radeon"
124 </pre>
125
126 -<p>
127 -More instructions on how to configure nVidia and ATI cards can be found in
128 -<uri link="/doc/en/nvidia-guide.xml">Gentoo Linux nVidia Guide</uri> and in
129 +<note>
130 +More instructions on how to configure nVidia and ATI cards can be found in the
131 +<uri link="/doc/en/nvidia-guide.xml">Gentoo Linux nVidia Guide</uri> and in the
132 <uri link="/doc/en/ati-faq.xml">Gentoo Linux ATI FAQ</uri>. If you don't know
133 which drivers you should choose, refer to these guides for more information.
134 -</p>
135 +</note>
136
137 -<note>
138 +<p>
139 If the suggested settings don't work for you, you should run <c>emerge -pv
140 xorg-server</c>, check all the options available and choose those which apply to
141 -your system. The example is for the amd64 architecture and
142 -<c>xorg-server-1.2</c>.
143 -</note>
144 +your system. This example is for a system with a keyboard, mouse, Synaptics
145 +touchpad, and a Radeon video card.
146 +</p>
147
148 <pre caption="Displaying all the driver options available">
149 # <i>emerge -pv xorg-server</i>
150 @@ -151,16 +173,17 @@
151 These are the packages that would be merged, in order:
152
153 Calculating dependencies... done!
154 -[ebuild R ] x11-base/xorg-server-1.2.0-r3 USE="dri nptl xorg (-3dfx) -debug
155 --dmx -ipv6 -kdrive -minimal -sdl -xprint" INPUT_DEVICES="keyboard mouse -acecad
156 --aiptek -calcomp -citron -digitaledge -dmc -dynapro -elo2300 -elographics -evdev
157 --fpit -hyperpen -jamstudio -joystick -magellan -microtouch -mutouch -palmax
158 --penmount -spaceorb -summa -synaptics -tek4957 -ur98 -vmmouse -void -wacom"
159 -VIDEO_CARDS="nvidia -apm -ark -chips -cirrus -cyrix -dummy -epson -fbdev -fglrx
160 --glint -i128 (-i740) -i810 (-impact) (-imstt) -mach64 -mga -neomagic (-newport)
161 -(-nsc) -nv -r128 -radeon -rendition -s3 -s3virge -savage -siliconmotion -sis
162 --sisusb (-sunbw2) (-suncg14) (-suncg3) (-suncg6) (-sunffb) (-sunleo) (-suntcx)
163 --tdfx -tga -trident -tseng -v4l -vesa -vga -via -vmware -voodoo" 0 kB
164 +[ebuild R ] x11-base/xorg-server-1.6.3.901-r2 USE="hal nptl xorg -debug
165 +-dmx -ipv6 -kdrive -minimal -sdl -tslib" 0 kB
166 +[ebuild R ] x11-base/xorg-drivers-1.6 INPUT_DEVICES="evdev synaptics
167 +-acecad -aiptek -citron -elographics -fpit -hyperpen -joystick -keyboard -mouse
168 +-mutouch -penmount -tslib -virtualbox -vmmouse -void -wacom"
169 +VIDEO_CARDS="radeon -apm -ark -ast -chips -cirrus -dummy -epson -fbdev -fglrx
170 +(-geode) -glint -i128 (-i740) (-impact) (-imstt) -intel -mach64 -mga -neomagic
171 +(-newport) -nv -nvidia -r128 -radeonhd -rendition -s3 -s3virge -savage
172 +-siliconmotion -sis -sisusb (-sunbw2) (-suncg14) (-suncg3) (-suncg6) (-sunffb)
173 +(-sunleo) (-suntcx) -tdfx -tga -trident -tseng -v4l (-vermilion) -vesa -via
174 +-virtualbox -vmware (-voodoo) (-xgi)" 0 kB
175 </pre>
176
177 <p>
178 @@ -173,14 +196,14 @@
179
180 <note>
181 You could install the <c>xorg-x11</c> metapackage instead of the more
182 -lightweight xorg-server. Functionally, <c>xorg-x11</c> and <c>xorg-server</c>
183 -are the same. However, <c>xorg-x11</c> brings in many more packages that
184 -you probably don't need, such as a huge assortment of fonts in many different
185 -languages. They're not necessary for a working desktop.
186 +lightweight <c>xorg-server</c>. Functionally, <c>xorg-x11</c> and
187 +<c>xorg-server</c> are the same. However, <c>xorg-x11</c> brings in many more
188 +packages that you probably don't need, such as a huge assortment of fonts in
189 +many different languages. They're not necessary for a working desktop.
190 </note>
191
192 <p>
193 -When the installation is finished, you might need to re-initialise some
194 +When the installation is finished, you will need to re-initialise some
195 environment variables before you continue. Just run <c>env-update</c> followed
196 by <c>source /etc/profile</c> and you're all set.
197 </p>
198 @@ -193,12 +216,126 @@
199 </body>
200 </section>
201 </chapter>
202 +
203 <chapter>
204 <title>Configuring Xorg</title>
205 <section>
206 -<title>The xorg.conf File</title>
207 +<title>Using HAL</title>
208 +<body>
209 +
210 +<p>
211 +Recent X server versions are designed to work out-of-the-box, with no need to
212 +manually configure Xorg's configuration files.
213 +</p>
214 +
215 +<p>
216 +You should first try <uri link="#using_startx">starting X</uri> without creating
217 +<path>/etc/X11/xorg.conf</path>.
218 +</p>
219 +
220 +<p>
221 +If Xorg won't start (if there's something wrong with the screen, or with your
222 +keyboard/mouse), then you can try fixing problems by using the right
223 +configuration files.
224 +</p>
225 +
226 +<p>
227 +By default, Xorg uses HAL (Hardware Abstraction Layer) to detect and configure
228 +devices such as keyboards and mice.
229 +</p>
230 +
231 +<p>
232 +HAL comes with many premade device rules, also called policies. These policy
233 +files are available in <path>/usr/share/hal/fdi/policy/</path>. Just find a few
234 +that suit your needs most closely and copy them to
235 +<path>/etc/hal/fdi/policy/</path>.
236 +</p>
237 +
238 +<impo>
239 +Do not edit the files in <path>/usr/share/hal/fdi/</path>! Just copy the ones
240 +you need, and edit them once they're placed in the proper <path>/etc</path>
241 +location.
242 +</impo>
243 +
244 +<p>
245 +For example, to get a basic working keyboard/mouse combination, you could copy
246 +the following files to <path>/etc/hal/fdi/policy/</path>:
247 +</p>
248 +
249 +<pre caption="Using HAL policy files">
250 +# <i>cp /usr/share/hal/fdi/policy/10osvendor/10-input-policy.fdi /etc/hal/fdi/policy</i>
251 +# <i>cp /usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi /etc/hal/fdi/policy</i>
252 +</pre>
253 +
254 +<p>
255 +There are several other HAL policies in <path>/usr/share/hal/fdi/</path> that
256 +may interest you, such as laptop configurations, storage device handling, power
257 +management, and more. Just copy any of the policies to
258 +<path>/etc/hal/fdi/policy/</path>.
259 +</p>
260 +
261 +<p>
262 +You can edit the policy files in <path>/etc/hal/fdi/policy</path> to your
263 +liking. You may want to make a few tweaks or to expose additional
264 +functionality. Let's go through an example of tweaking a HAL policy.
265 +</p>
266 +
267 +<p>
268 +One very convenient trick is to kill the X server entirely by pressing
269 +Ctrl-Alt-Backspace. This is useful when your X server is malfunctioning, frozen,
270 +etc. It's not as extreme as rebooting the whole machine with Ctrl-Alt-Del.
271 +</p>
272 +
273 +<p>
274 +Recent X server versions disabled this key combination by default. However, you
275 +can reenable it by copying <path>10-x11-input.fdi</path> to
276 +<path>/etc/hal/fdi/policy</path> and editing it. You'll need to add just one
277 +line to the appropriate section, as shown below:
278 +</p>
279 +
280 +<pre caption="Editing 10-x11-input.fdi">
281 +<comment>(Open the file in your preferred editor)</comment>
282 +# <i>nano -w /etc/hal/fdi/policy/10-x11-input.fdi</i>
283 +<comment>(Find the "input.keys" section)</comment>
284 +&lt;match key="info.capabilities" contains="input.keys"&gt;
285 +<comment>(Add the "terminate" merge string as shown)</comment>
286 +&lt;match key="info.capabilities" contains="input.keys"&gt;
287 + &lt;merge key="input.x11_driver" type="string"&gt;keyboard&lt;/merge&gt;
288 + <i>&lt;merge key="input.xkb.options" type="string"&gt;terminate:ctrl_alt_bksp&lt;/merge>&gt;</i>
289 + &lt;match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
290 + string="Linux"&gt;
291 + &lt;merge key="input.x11_driver" type="string"&gt;evdev&lt;merge&gt;
292 + &lt;/match&gt;
293 + &lt;/match&gt;
294 +</pre>
295 +
296 +<p>
297 +There, now you have a handy way of killing an unresponsive X server. This is
298 +useful when programs have frozen your display entirely, or when configuring and
299 +tweaking your Xorg environment. Be careful when killing your desktop with this
300 +key combination -- most programs really don't like it when you end them this
301 +way, and you may lose some (or all) of what you were working on.
302 +</p>
303 +
304 +<p>
305 +Hopefully just working with the HAL policy files results in a working X desktop.
306 +If Xorg still won't start, or there's some other problem, then you'll need to
307 +manually configure <path>xorg.conf</path> as shown in the next section.
308 +</p>
309 +
310 +</body>
311 +</section>
312 +<section>
313 +<title>The xorg.conf file</title>
314 <body>
315
316 +<note>
317 +Configuring <path>xorg.conf</path> should be seen as a "last resort" option. It
318 +really desirable to run without one if possible, and to do all your
319 +configuration via HAL policy files. If you still can't get a working
320 +configuration, then read on.
321 +</note>
322 +
323 <p>
324 The configuration file of Xorg is called <path>xorg.conf</path> and it resides
325 in <path>/etc/X11</path>. Xorg provides an example configuration as
326 @@ -208,18 +345,13 @@
327 </p>
328
329 <pre caption="Reading the xorg.conf man page">
330 -# <i>man 5 xorg.conf</i>
331 +$ <i>man 5 xorg.conf</i>
332 </pre>
333
334 -<p>
335 -Happy reading for those of you willing to. We surely don't so we'll continue
336 -with checking out how we can create the file automatically.
337 -</p>
338 -
339 </body>
340 </section>
341 <section>
342 -<title>Default: Automatic Generation of xorg.conf</title>
343 +<title>Automatic Generation of xorg.conf</title>
344 <body>
345
346 <p>
347 @@ -248,41 +380,11 @@
348
349 <p>
350 If all goes well, you should see a simple black and white pattern. Verify if
351 -your mouse works correctly and if the resolution is good. If you received errors
352 -about "/dev/mouse", try changing your mouse device to <c>/dev/input/mice</c> in
353 -the "InputDevice" section of <path>xorg.conf</path>. You might not be able to
354 -deduce the exact resolution, but you should be able to see if it's too low. You
355 -can exit any time by pressing Ctrl-Alt-Backspace.
356 -</p>
357 -
358 -</body>
359 -</section>
360 -<section>
361 -<title>Alternative: Semi-Automatic Generation of xorg.conf</title>
362 -<body>
363 -
364 -<p>
365 -Xorg provides a tool called <c>xorgconfig</c> which will ask you for various
366 -information regarding your system (graphical adapter, keyboard, ...). Based on
367 -your input it will create a <path>xorg.conf</path> file.
368 -</p>
369 -
370 -<pre caption="Semi-Automatic Generation of xorg.conf">
371 -# <i>xorgconfig</i>
372 -</pre>
373 -
374 -<p>
375 -Another tool, also provided by Xorg, is <c>xorgcfg</c>, which will first
376 -attempt to run <c>Xorg -configure</c> and then start the X server for more
377 -final tweaking.
378 +your mouse works correctly and if the resolution is good. You might not be able
379 +to deduce the exact resolution, but you should be able to see if it's too low.
380 +You can exit any time by pressing Ctrl-Alt-Backspace.
381 </p>
382
383 -<pre caption="Using xorgcfg">
384 -# <i>xorgcfg</i>
385 -<comment>(In case X crashes or the configuration fails, try:)</comment>
386 -# <i>xorgcfg -textmode</i>
387 -</pre>
388 -
389 </body>
390 </section>
391 <section>
392 @@ -292,7 +394,7 @@
393 <p>
394 Let us copy over the <path>xorg.conf.new</path> to
395 <path>/etc/X11/xorg.conf</path> now, so we won't have to continuously run
396 -<c>X -config</c> -- typing just <c>X</c> or <c>startx</c> is easier. :)
397 +<c>X -config</c> -- typing just <c>startx</c> is easier. :)
398 </p>
399
400 <pre caption="Copying over xorg.conf">
401 @@ -306,9 +408,9 @@
402 <body>
403
404 <p>
405 -Now try <c>startx</c> to start up your X server. <c>startx</c> is a script
406 +Now try <c>startx</c> to start up your X server. <c>startx</c> is a script
407 that executes an <e>X session</e>, that is, it starts the X servers and some
408 -graphical applications on top of it. It decides which applications to run
409 +graphical applications on top of it. It decides which applications to run
410 using the following logic:
411 </p>
412
413 @@ -341,25 +443,26 @@
414 <c>twm</c>. To finish the twm session, type in <c>exit</c> or Ctrl-D in the
415 upcoming xterms. You can also kill the X session using the Ctrl-Alt-Backspace
416 combination. This will however make X exit disgracefully -- something that you
417 -might not always want. It doesn't hurt though. :)
418 +might not always want.
419 </p>
420
421 </body>
422 </section>
423 </chapter>
424 +
425 <chapter>
426 -<title>Tweaking xorg.conf</title>
427 +<title>Tweaking X settings</title>
428 <section>
429 <title>Setting your Resolution</title>
430 <body>
431
432 <p>
433 If you feel that the screen resolution is wrong, you will need to check two
434 -sections in your configuration. First of all, you have the <e>Screen</e> section
435 -which lists the resolutions, if any that your X server will run at. By
436 -default, this section might not list any resolutions at all. If this is the
437 -case, Xorg will estimate the resolutions based on the information in the
438 -second section, <e>Monitor</e>.
439 +sections in your <path>xorg.conf</path> configuration. First of all, you have
440 +the <e>Screen</e> section which lists the resolutions, if any that your X server
441 +will run at. By default, this section might not list any resolutions at all. If
442 +this is the case, Xorg will estimate the resolutions based on the information in
443 +the second section, <e>Monitor</e>.
444 </p>
445
446 <p>
447 @@ -367,9 +470,7 @@
448 <c>VertRefresh</c> in the <e>Monitor</e> section to compute valid resolutions.
449 For now, leave these settings as-is. Only when the changes to the <e>Screen</e>
450 section (which we will describe in a minute) don't work, then you will need to
451 -look up the specs for your monitor and fill in the correct values. You can also
452 -use a tool that searches for your monitor's specs, such as
453 -<c>sys-apps/ddcxinfo-knoppix</c>.
454 +look up the specs for your monitor and fill in the correct values.
455 </p>
456
457 <warn>
458 @@ -382,7 +483,7 @@
459 <p>
460 Now let us change the resolutions. In the next example from
461 <path>/etc/X11/xorg.conf</path> we add the <c>Modes</c> lines and the
462 -<c>DefaultDepth</c> so that our X server starts with 24 bits at 1024x768 by
463 +<c>DefaultDepth</c> so that our X server starts with 24 bits at 1440x900 by
464 default. Don't mind the given strings -- they are examples and will most likely
465 differ from the settings on your system.
466 </p>
467 @@ -390,13 +491,13 @@
468 <pre caption="Changing the Screen section in /etc/X11/xorg.conf">
469 Section "Screen"
470 Identifier "Default Screen"
471 - Device "S3 Inc. ProSavage KN133 [Twister K]"
472 + Device "RadeonHD 4550"
473 Monitor "Generic Monitor"
474 <i>DefaultDepth 24</i>
475 <comment># Skipping some text to improve readability</comment>
476 SubSection "Display"
477 Depth 24
478 - <i>Modes "1024x768"</i>
479 + <i>Modes "1440x900"</i>
480 EndSubSection
481 EndSection
482 </pre>
483 @@ -408,82 +509,47 @@
484 </body>
485 </section>
486 <section>
487 -<title>Configuring your Keyboard</title>
488 -<body>
489 -
490 -<p>
491 -To setup X to use an international keyboard, search for the <e>InputDevice</e>
492 -section that configures the keyboard and add the <c>XkbLayout</c> option to
493 -point to the keyboard layout you want. As an example, we show you how to apply
494 -for the Belgian layout. Just substitute the country-keycode with yours:
495 -</p>
496 -
497 -<pre caption="Changing the keyboard layout">
498 -Section "InputDevice"
499 - Identifier "Generic Keyboard"
500 - Driver "keyboard"
501 - Option "CoreKeyboard"
502 - Option "XkbRules" "xorg"
503 - Option "XkbModel" "pc105"
504 - <i>Option "XkbLayout" "be"</i>
505 -EndSection
506 -</pre>
507 -
508 -</body>
509 -</section>
510 -<section>
511 -<title>Configuring your Mouse</title>
512 +<title>Configuring your keyboard</title>
513 <body>
514
515 <p>
516 -If your mouse isn't working, you will first need to find out if it is detected
517 -by the kernel at all. Mice are (device-wise) seen as
518 -<path>/dev/input/mouse0</path> (or <path>/dev/input/mice</path> if you want to
519 -use several mice). In some cases <path>/dev/psaux</path> is used. In either
520 -case you can check if the devices do represent
521 -your mouse by checking the output of those files when you move your mouse. You
522 -will usually see some junk on your screen. To end the session press
523 -<c>Ctrl-C</c>.
524 +To setup X to use an international keyboard, you can copy the content of
525 +<path>/usr/share/doc/hal-*/*/use-estonian-layout.fdi.bz2</path> to
526 +<path>/etc/hal/fdi/policy/10-xinput-configuration.fdi</path>:
527 </p>
528
529 -<pre caption="Checking the device files">
530 -# <i>cat /dev/input/mouse0</i>
531 -<comment>(Don't forget to press Ctrl-C to end this)</comment>
532 +<pre caption="Using an existing config file">
533 +# <i>bzcat /usr/share/doc/hal-*/*/use-estonian-layout.fdi > /etc/hal/fdi/policy/10-xinput-configuration.fdi</i>
534 </pre>
535
536 <p>
537 -If your mouse isn't detected, verify if all the necessary modules are loaded.
538 +Now you can just edit <path>10-xinput-configuration.fdi</path> and change the
539 +Estonian keyboard layout (<c>ee</c>) to your own, such as Great Britain
540 +(<b>gb</b>) or Polish (<b>pl</b>).
541 </p>
542
543 <p>
544 -If your mouse is detected, fill in the device in the appropriate
545 -<e>InputDevice</e> section. In the next example you'll see we also set two other
546 -options: <c>Protocol</c> (which lists the mouse protocol to be used -- most
547 -users will use PS/2 or IMPS/2) and <c>ZAxisMapping</c> (which allows for the
548 -mousewheel (if applicable) to be used).
549 +When you're finished, run <c>/etc/init.d/hald restart</c> as root to make sure
550 +that HAL picks up your configuration file changes.
551 </p>
552
553 -<pre caption="Changing the mouse settings in Xorg">
554 -Section "InputDevice"
555 - Identifier "TouchPad Mouse"
556 - Driver "mouse"
557 - Option "CorePointer"
558 - <i>Option "Device" "/dev/input/mouse0"</i>
559 - <i>Option "Protocol" "IMPS/2"</i>
560 - <i>Option "ZAxisMapping" "4 5"</i>
561 -EndSection
562 -</pre>
563 +</body>
564 +</section>
565 +<section>
566 +<title>Finishing up</title>
567 +<body>
568
569 <p>
570 -Run <c>startx</c> and be happy about the result. :) Congratulations, you now
571 +Run <c>startx</c> and be happy about the result. Congratulations, you now
572 (hopefully) have a working Xorg on your system. The next step is to remove this
573 -ugly lightweight window manager and use a high-feature one (or even a desktop
574 -environment) such as KDE or GNOME, but that's not part of this guide. :)
575 +ugly lightweight window manager (twm) and use a high-feature one (or even a
576 +desktop environment) such as KDE or GNOME, but that's not part of this guide.
577 </p>
578
579 </body>
580 </section>
581 </chapter>
582 +
583 <chapter>
584 <title>Resources</title>
585 <section>
586 @@ -491,9 +557,10 @@
587 <body>
588
589 <p>
590 -First of all, <c>man xorg.conf</c> provides a quick yet complete reference
591 -about the syntax used by the configuration file. Be sure to have it open on a
592 -terminal near you when you edit your configuration file!
593 +First of all, <c>man xorg.conf</c> and <c>man evdev</c> provide quick yet
594 +complete references about the syntax used by these configuration files. Be sure
595 +to have them open on a terminal near you when you edit your configuration
596 +files!
597 </p>
598
599 <p>
600 @@ -510,24 +577,9 @@
601 <p>
602 There are also many online resources on editing <path>xorg.conf</path>. We only
603 list few of them here, be sure to <uri link="http://www.google.com">Google</uri>
604 -for more. :) As <path>xorg.conf</path> and <path>XF86Config</path> (the
605 -configuration file for the XFree86 project) use the
606 -same syntax for most configuration options and more information about
607 -<path>XF86Config</path> is available, we'll list those resources as well.
608 +for more.
609 </p>
610
611 -<ul>
612 - <li>
613 - <uri link="http://tldp.org/HOWTO/XFree-Local-multi-user-HOWTO/">The XFree
614 - Local Multi-User HOWTO</uri>
615 - </li>
616 - <li>
617 - <uri
618 - link="http://www-106.ibm.com/developerworks/edu/os-dw-linuxxwin-i.html">An
619 - Introduction to XFree 4.x</uri> by Chris Houser
620 - </li>
621 -</ul>
622 -
623 </body>
624 </section>
625 <section>
626 @@ -542,9 +594,9 @@
627 </p>
628
629 <p>
630 -If you're upgrading to xorg-server-1.5 from an earlier version, then be sure to
631 +If you're upgrading to xorg-server-1.6 from an earlier version, then be sure to
632 read the <uri
633 -link="/proj/en/desktop/x/x11/xorg-server-1.5-upgrade-guide.xml">migration
634 +link="/proj/en/desktop/x/x11/xorg-server-1.6-upgrade-guide.xml">migration
635 guide</uri>.
636 </p>