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, 23 Mar 2011 09:04:10
Message-Id: 20110323090351.EFF8A20054@flycatcher.gentoo.org
1 nightmorph 11/03/23 09:03:51
2
3 Modified: xorg-config.xml
4 Log:
5 update Xorg guide for the HAL removal. this took many hours, spread out over many weeks. there may still be a few things to add, but this will do as a working basic installation/walkthrough. bug 349698.
6
7 Revision Changes Path
8 1.45 xml/htdocs/doc/en/xorg-config.xml
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.45&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.45&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?r1=1.44&r2=1.45
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.44
18 retrieving revision 1.45
19 diff -u -r1.44 -r1.45
20 --- xorg-config.xml 2 Mar 2011 08:16:43 -0000 1.44
21 +++ xorg-config.xml 23 Mar 2011 09:03:51 -0000 1.45
22 @@ -1,6 +1,6 @@
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.44 2011/03/02 08:16:43 nightmorph Exp $ -->
26 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.45 2011/03/23 09:03:51 nightmorph Exp $ -->
27
28 <guide>
29 <title>The X Server Configuration HOWTO</title>
30 @@ -22,8 +22,8 @@
31 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
32 <license/>
33
34 -<version>6</version>
35 -<date>2011-03-02</date>
36 +<version>7</version>
37 +<date>2011-03-23</date>
38
39 <chapter>
40 <title>What is the X Window Server?</title>
41 @@ -148,7 +148,7 @@
42
43 <p>
44 Next, configure your kernel to use the proper KMS driver for your video card.
45 -Intel, nVidia, and ATI are the most common cards, so follow code listing for
46 +Intel, nVidia, and AMD/ATI are the most common cards, so follow code listing for
47 your card below.
48 </p>
49
50 @@ -185,12 +185,12 @@
51 </pre>
52
53 <p>
54 -For newer ATI cards (<uri link="/doc/en/ati-faq.xml">RadeonHD 2000 and
55 +For newer AMD/ATI cards (<uri link="/doc/en/ati-faq.xml">RadeonHD 2000 and
56 up</uri>), you will need to emerge <c>radeon-ucode</c>. Once you have installed
57 <c>radeon-ucode</c>, configure your kernel as shown:
58 </p>
59
60 -<pre caption="ATI settings">
61 +<pre caption="AMD/ATI settings">
62 <comment>(Setup the kernel to use the radeon-ucode firmware)</comment>
63 Device Drivers ---&gt;
64 Generic Driver Options ---&gt;
65 @@ -252,8 +252,8 @@
66 </p>
67
68 <note>
69 -You may also try the proprietary drivers from nVidia and ATI, <c>nvidia</c> and
70 -<c>fglrx</c> respectively. However, setting up the proprietary drivers is
71 +You may also try the proprietary drivers from nVidia and AMD/ATI, <c>nvidia</c>
72 +and <c>fglrx</c> respectively. However, setting up the proprietary drivers is
73 beyond the scope of this guide. Please read the <uri
74 link="/doc/en/nvidia-guide.xml">Gentoo Linux nVidia Guide</uri> and <uri
75 link="/doc/en/ati-faq.xml">Gentoo Linux ATI FAQ</uri>. If you don't know which
76 @@ -288,7 +288,7 @@
77 INPUT_DEVICES="evdev synaptics"
78 <comment>(For nVidia cards)</comment>
79 VIDEO_CARDS="nouveau"
80 -<comment>(OR, for ATI Radeon cards)</comment>
81 +<comment>(For AMD/ATI cards)</comment>
82 VIDEO_CARDS="radeon"
83 </pre>
84
85 @@ -321,6 +321,9 @@
86 </p>
87
88 <pre caption="Installing Xorg">
89 +<comment>(Make sure udev is in your USE flags)</comment>
90 +# <i>echo "x11-base/xorg-server udev" >> /etc/portage/package.use</i>
91 +<comment>(Install Xorg)</comment>
92 # <i>emerge xorg-server</i>
93 </pre>
94
95 @@ -334,8 +337,7 @@
96
97 <p>
98 When the installation is finished, you will need to re-initialise some
99 -environment variables before you continue. Just run <c>env-update</c> followed
100 -by <c>source /etc/profile</c> and you're all set.
101 +environment variables before you continue:
102 </p>
103
104 <pre caption="Re-initialising the environment variables">
105 @@ -343,216 +345,57 @@
106 # <i>source /etc/profile</i>
107 </pre>
108
109 -<p>
110 -Now it's time to start the Hardware Abstraction Layer (HAL) daemon and set it to
111 -automatically start each time you boot. This is necessary to get a working X
112 -environment, otherwise your input devices won't be detected and you'll probably
113 -just get a blank screen. We'll cover HAL more in the <uri
114 -link="#using_hal">next section</uri>.
115 -</p>
116 -
117 -<pre caption="Starting HAL">
118 -# <i>/etc/init.d/hald start</i>
119 -# <i>rc-update add hald default</i>
120 -</pre>
121 -
122 </body>
123 </section>
124 </chapter>
125
126 <chapter>
127 <title>Configuring Xorg</title>
128 -<section id="using_hal">
129 -<title>Using HAL</title>
130 +<section>
131 <body>
132
133 <p>
134 The X server is designed to work out-of-the-box, with no need to manually edit
135 -Xorg's configuration files.
136 -</p>
137 -
138 -<p>
139 -You should first try <uri link="#using_startx">starting X</uri> without creating
140 -<path>/etc/X11/xorg.conf</path>.
141 -</p>
142 -
143 -<p>
144 -If Xorg won't start (if there's something wrong with the screen, or with your
145 -keyboard/mouse), then you can try fixing problems by using the right
146 -configuration files.
147 -</p>
148 -
149 -<p>
150 -By default, Xorg uses HAL (Hardware Abstraction Layer) to detect and configure
151 -devices such as keyboards and mice.
152 +Xorg's configuration files. It should detect and configure devices such as
153 +displays, keyboards, and mice.
154 </p>
155
156 <p>
157 -HAL comes with many premade device rules, also called policies. These policy
158 -files are available in <path>/usr/share/hal/fdi/policy/</path>. Just find a few
159 -that suit your needs most closely and copy them to
160 -<path>/etc/hal/fdi/policy/</path>.
161 -</p>
162 -
163 -<impo>
164 -Do not edit the files in <path>/usr/share/hal/fdi/</path>! Just copy the ones
165 -you need, and edit them once they're placed in the proper <path>/etc</path>
166 -location.
167 -</impo>
168 -
169 -<p>
170 -For example, to get a basic working keyboard/mouse combination, you could copy
171 -the following files to <path>/etc/hal/fdi/policy/</path>:
172 -</p>
173 -
174 -<pre caption="Using HAL policy files">
175 -# <i>cp /usr/share/hal/fdi/policy/10osvendor/10-input-policy.fdi /etc/hal/fdi/policy</i>
176 -# <i>cp /usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi /etc/hal/fdi/policy</i>
177 -</pre>
178 -
179 -<p>
180 -There are several other HAL policies in <path>/usr/share/hal/fdi/</path> that
181 -may interest you, such as laptop configurations, storage device handling, power
182 -management, and more. Just copy any of the policies to
183 -<path>/etc/hal/fdi/policy/</path>.
184 -</p>
185 -
186 -<impo>
187 -Remember, <e>every</e> time you finish making changes to HAL policy files, you
188 -need to restart the HAL daemon by running <c>/etc/init.d/hald restart</c>.
189 -</impo>
190 -
191 -<p>
192 -You can edit the policy files in <path>/etc/hal/fdi/policy</path> to your
193 -liking. You may want to make a few tweaks or to expose additional
194 -functionality. Let's go through an example of tweaking a HAL policy.
195 -</p>
196 -
197 -<p>
198 -One very convenient trick is to kill the X server entirely by pressing
199 -Ctrl-Alt-Backspace. This is useful when your X server is malfunctioning, frozen,
200 -etc. It's not as extreme as rebooting the whole machine with Ctrl-Alt-Del.
201 -</p>
202 -
203 -<p>
204 -Recent X server versions disabled this key combination by default. However, you
205 -can reenable it by copying <path>10-x11-input.fdi</path> to
206 -<path>/etc/hal/fdi/policy</path> and editing it. You'll need to add just one
207 -line to the appropriate section, as shown below:
208 -</p>
209 -
210 -<pre caption="Editing 10-x11-input.fdi">
211 -<comment>(Open the file in your preferred editor)</comment>
212 -# <i>nano -w /etc/hal/fdi/policy/10-x11-input.fdi</i>
213 -<comment>(Find the "input.keys" section)</comment>
214 -&lt;match key="info.capabilities" contains="input.keys"&gt;
215 -<comment>(Add the "terminate" merge string as shown)</comment>
216 -&lt;match key="info.capabilities" contains="input.keys"&gt;
217 - &lt;merge key="input.x11_driver" type="string"&gt;keyboard&lt;/merge&gt;
218 - <i>&lt;merge key="input.xkb.options" type="string"&gt;terminate:ctrl_alt_bksp&lt;/merge&gt;</i>
219 - &lt;match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
220 - string="Linux"&gt;
221 - &lt;merge key="input.x11_driver" type="string"&gt;evdev&lt;merge&gt;
222 - &lt;/match&gt;
223 - &lt;/match&gt;
224 -</pre>
225 -
226 -<p>
227 -Once you're done, run <c>/etc/init.d/hald restart</c> so that HAL picks up your
228 -changes.
229 -</p>
230 -
231 -<p>
232 -There, now you have a handy way of killing an unresponsive X server. This is
233 -useful when programs have frozen your display entirely, or when configuring and
234 -tweaking your Xorg environment. Be careful when killing your desktop with this
235 -key combination -- most programs really don't like it when you end them this
236 -way, and you may lose some (or all) of what you were working on.
237 -</p>
238 -
239 -<p>
240 -Hopefully just working with the HAL policy files results in a working X desktop.
241 -If Xorg still won't start, or there's some other problem, then you'll need to
242 -manually configure <path>xorg.conf</path> as shown in the next section.
243 +You should first try <uri link="#using_startx">starting X</uri> without editing
244 +any configuration files. If Xorg won't start, or there's some other problem,
245 +then you'll need to manually configure Xorg as shown in the next section.
246 </p>
247
248 </body>
249 </section>
250 <section>
251 -<title>The xorg.conf file</title>
252 +<title>The xorg.conf.d directory</title>
253 <body>
254
255 <note>
256 -Configuring <path>xorg.conf</path> should be seen as a "last resort" option. It
257 -really desirable to run without one if possible, and to do all your
258 -configuration via HAL policy files. If you still can't get a working
259 -configuration, then read on.
260 +Configuring files in <path>xorg.conf.d</path> should be seen as a "last resort"
261 +option. It really desirable to run without any special configuration if
262 +possible. If you still can't get a working configuration, then read on.
263 </note>
264
265 <p>
266 -The configuration file of Xorg is called <path>xorg.conf</path> and it resides
267 -in <path>/etc/X11</path>. Xorg provides an example configuration as
268 -<path>/etc/X11/xorg.conf.example</path> which you can use to create your own
269 -configuration. It is heavily commented, but if you are in need of more
270 -documentation regarding the syntax, don't hesitate to read the man page:
271 +The configuration files of Xorg are stored in
272 +<path>/etc/X11/xorg.conf.d/</path>. Each file is given a unique name and ends in
273 +<path>.conf</path>. If the filenames start with a number, then Xorg will read
274 +the files in numeric order. <path>10-evdev.conf</path> will be read before
275 +<path>20-synaptics.conf</path>, and so on. You don't <e>have</e> to give them
276 +numbers, but it may help you organize them.
277 </p>
278
279 -<pre caption="Reading the xorg.conf man page">
280 -$ <i>man 5 xorg.conf</i>
281 -</pre>
282 -
283 -</body>
284 -</section>
285 -<section>
286 -<title>Automatic Generation of xorg.conf</title>
287 -<body>
288 -
289 -<p>
290 -Xorg itself is able to guess most parameters for you. In most cases, you
291 -will only have to change some lines to get the resolution you want up and
292 -running. If you are interested in more in-depth tweaking, be sure to check the
293 -resources at the end of this chapter. But first, let us generate a (hopefully
294 -working) Xorg configuration file.
295 -</p>
296 -
297 -<pre caption="Generating an xorg.conf file">
298 -# <i>Xorg -configure</i>
299 -</pre>
300 -
301 -<p>
302 -Be sure to read the last lines printed on your screen when Xorg has finished
303 -probing your hardware. If it tells you it failed at some point, you're forced to
304 -manually write an <path>xorg.conf</path> file. Assuming that it didn't fail, it
305 -will have told you that it has written <path>/root/xorg.conf.new</path> ready
306 -for you to test. So let's test. :)
307 -</p>
308 -
309 -<pre caption="Testing the xorg.conf.new file">
310 -# <i>X -retro -config /root/xorg.conf.new</i>
311 -</pre>
312 -
313 -<p>
314 -If all goes well, you should see a simple black and white pattern. Verify if
315 -your mouse works correctly and if the resolution is good. You might not be able
316 -to deduce the exact resolution, but you should be able to see if it's too low.
317 -You can exit any time by pressing Ctrl-Alt-Backspace.
318 -</p>
319 -
320 -</body>
321 -</section>
322 -<section>
323 -<title>Copying over xorg.conf</title>
324 -<body>
325 -
326 -<p>
327 -Let us copy over the <path>xorg.conf.new</path> to
328 -<path>/etc/X11/xorg.conf</path> now, so we won't have to continuously run
329 -<c>X -config</c> -- typing just <c>startx</c> is easier. :)
330 -</p>
331 -
332 -<pre caption="Copying over xorg.conf">
333 -# <i>cp /root/xorg.conf.new /etc/X11/xorg.conf</i>
334 -</pre>
335 +<note>
336 +Xorg provides example configurations in
337 +<path>/usr/share/doc/xorg-server-${version}/xorg.conf.example.bz2</path>. You
338 +can use these to create your own configuration files in
339 +<path>/etc/X11/xorg.conf.d/</path>. The examples are heavily commented, but if
340 +you are in need of more documentation regarding the syntax, read <c>man
341 +xorg.conf</c>. Other examples can be found in the <uri
342 +link="#resources">Resources</uri> chapter at the end of this guide.
343 +</note>
344
345 </body>
346 </section>
347 @@ -562,7 +405,7 @@
348
349 <p>
350 Now try <c>startx</c> to start up your X server. <c>startx</c> is a script
351 -that executes an <e>X session</e>, that is, it starts the X server and some
352 +that executes an <e>X session</e>; that is, it starts the X server and some
353 graphical applications on top of it. It decides which applications to run
354 using the following logic:
355 </p>
356 @@ -590,23 +433,17 @@
357 </pre>
358
359 <p>
360 -You can kill the X session by using the Ctrl-Alt-Backspace key combination. This
361 -will, however, make X exit disgracefully -- something that you might not always
362 -want.
363 -</p>
364 -
365 -<p>
366 If you haven't yet installed a window manager, all you'll see is a black screen.
367 Since this can also be a sign that something's wrong, you may want to emerge
368 <c>twm</c> and <c>xterm</c> <e>only to test X</e>.
369 </p>
370
371 <p>
372 -Once those two programs are installed, run <c>startx</c> again. A few xterm
373 -windows should appear, making it easier to verify that X is working correctly.
374 -Once you're satisfied with the results, run <c>emerge --unmerge twm xterm</c> as
375 -root to get rid of the testing packages. You won't need them once you've setup a
376 -proper desktop environment.
377 +Once those two programs are installed, run <c>startx</c> again. A few
378 +<c>xterm</c> windows should appear, making it easier to verify that X is working
379 +correctly. Once you're satisfied with the results, run <c>emerge --unmerge twm
380 +xterm</c> as root to get rid of the testing packages. You won't need them once
381 +you've setup a proper desktop environment.
382 </p>
383
384 </body>
385 @@ -621,41 +458,27 @@
386
387 <p>
388 If you feel that the screen resolution is wrong, you will need to check two
389 -sections in your <path>xorg.conf</path> configuration. First of all, you have
390 -the <e>Screen</e> section which lists the resolutions, if any that your X server
391 -will run at. By default, this section might not list any resolutions at all. If
392 -this is the case, Xorg will estimate the resolutions based on the information in
393 -the second section, <e>Monitor</e>.
394 +sections in your <path>xorg.conf.d</path> configuration. First of all, you have
395 +the <e>Screen</e> section which lists the resolutions that your X server will
396 +run at. This section might not list any resolutions at all. If this is the case,
397 +Xorg will estimate the resolutions based on the information in the second
398 +section, <e>Monitor</e>.
399 </p>
400
401 <p>
402 -What happens is that Xorg checks the settings of <c>HorizSync</c> and
403 -<c>VertRefresh</c> in the <e>Monitor</e> section to compute valid resolutions.
404 -For now, leave these settings as-is. Only when the changes to the <e>Screen</e>
405 -section (which we will describe in a minute) don't work, then you will need to
406 -look up the specs for your monitor and fill in the correct values.
407 -</p>
408 -
409 -<warn>
410 -Do <b>not</b> "just" change the values of these two monitor related variables
411 -without consulting the technical specifications of your monitor. Setting
412 -incorrect values lead to out-of-sync errors at best and smoked up screens at
413 -worst.
414 -</warn>
415 -
416 -<p>
417 Now let us change the resolution. In the next example from
418 -<path>/etc/X11/xorg.conf</path> we add the <c>PreferredMode</c> line so that our
419 -X server starts at 1440x900 by default. Don't mind the given strings -- they are
420 -examples and will most likely differ from the settings on your system. However,
421 -the <c>Option</c> in the <c>Device</c> section must match the name of your
422 +<path>/etc/X11/xorg.conf.d/40-monitor.conf</path> we add the
423 +<c>PreferredMode</c> line so that our X server starts at 1440x900 by default.
424 +The <c>Option</c> in the <c>Device</c> section must match the name of your
425 monitor (<c>DVI-0</c>), which can be obtained by running <c>xrandr</c>. You'll
426 need to <c>emerge xrandr</c> just long enough to get this information. The
427 argument after the monitor name (in the <c>Device</c> section) must match the
428 <c>Identifier</c> in the <c>Monitor</c> section.
429 </p>
430
431 -<pre caption="Changing the Monitor section in /etc/X11/xorg.conf">
432 +<pre caption="Changing the Monitor section">
433 +# <i>nano -w /etc/X11/xorg.conf.d/40-monitor.conf</i>
434 +
435 Section "Device"
436 Identifier "RadeonHD 4550"
437 Option "Monitor-DVI-0" "DVI screen"
438 @@ -677,24 +500,24 @@
439 <body>
440
441 <p>
442 -You can configure more than one monitor in <path>/etc/X11/xorg.conf</path>. All
443 -you have to do is give each monitor an identifer, then list its physical
444 +You can configure more than one monitor in <path>/etc/X11/xorg.conf.d/</path>.
445 +All you have to do is give each monitor an identifer, then list its physical
446 position, such as "RightOf" or "Above" another monitor. The following example
447 shows how to configure a DVI and a VGA monitor, with the VGA monitor as the
448 right-hand screen:
449 </p>
450
451 -<pre caption="Configuring multiple monitors in xorg.conf">
452 +<pre caption="Configuring multiple monitors">
453 +# <i>nano -w /etc/X11/xorg.conf.d/40-monitor.conf</i>
454 +
455 Section "Device"
456 Identifier "RadeonHD 4550"
457 Option "Monitor-DVI-0" "DVI screen"
458 Option "Monitor-VGA-0" "VGA screen"
459 EndSection
460 -
461 Section "Monitor"
462 Identifier "DVI screen"
463 EndSection
464 -
465 Section "Monitor"
466 Identifier "VGA screen"
467 Option "RightOf" "DVI screen"
468 @@ -708,24 +531,34 @@
469 <body>
470
471 <p>
472 -To setup X to use an international keyboard, you can copy the content of
473 -<path>/usr/share/doc/hal-*/*/use-estonian-layout.fdi.bz2</path> to
474 -<path>/etc/hal/fdi/policy/10-xinput-configuration.fdi</path>:
475 -</p>
476 -
477 -<pre caption="Using an existing config file">
478 -# <i>bzcat /usr/share/doc/hal-*/*/use-estonian-layout.fdi.bz2 > /etc/hal/fdi/policy/10-xinput-configuration.fdi</i>
479 +To setup X to use an international keyboard, you just have to create the
480 +appropriate config file in <path>/etc/X11/xorg.conf.d/</path>. This example
481 +features a Czech keyboard layout:
482 +</p>
483 +
484 +<pre caption="Using an international keyboard">
485 +# <i>nano -w /etc/X11/xorg.conf.d/30-keyboard.conf</i>
486 +
487 +Section "InputClass"
488 + Identifier "keyboard-all"
489 + Driver "evdev"
490 + Option "XkbLayout" "us,cz"
491 + Option "XkbModel" "logitech_g15"
492 + Option "XkbRules" "xorg"
493 + Option "XkbOptions" "grp:alt_shift_toggle,grp:switch,grp_led:scroll,compose:rwin,terminate:ctrl_alt_bksp"
494 + Option "XkbVariant" ",qwerty"
495 + MatchIsKeyboard "on"
496 +EndSection
497 </pre>
498
499 <p>
500 -Now you can just edit <path>10-xinput-configuration.fdi</path> and change the
501 -Estonian keyboard layout (<c>ee</c>) to your own, such as Great Britain
502 -(<b>gb</b>) or Polish (<b>pl</b>).
503 -</p>
504 -
505 -<p>
506 -When you're finished, run <c>/etc/init.d/hald restart</c> as root to make sure
507 -that HAL picks up your configuration file changes.
508 +The "terminate" command (<c>terminate:ctrl_alt_bksp</c>) lets you kill the X
509 +session by using the Ctrl-Alt-Backspace key combination. This will, however,
510 +make X exit disgracefully -- something that you might not always want. It can be
511 +useful when programs have frozen your display entirely, or when you're
512 +configuring and tweaking your Xorg environment. Be careful when killing your
513 +desktop with this key combination -- most programs really don't like it when you
514 +end them this way, and you may lose some (or all) of what you were working on.
515 </p>
516
517 </body>
518 @@ -737,42 +570,32 @@
519 <p>
520 Run <c>startx</c> and be happy about the result. Congratulations, you now
521 (hopefully) have a working Xorg on your system. The next step is to install a
522 -useful window manager or desktop environment such as KDE, GNOME, or
523 -Xfce, but that's not part of this guide.
524 +useful window manager or desktop environment such as KDE, GNOME, or Xfce, but
525 +that's not part of this guide. Information on installing these desktop
526 +environments can be found in our <uri link="/doc/en/?catid=desktop">Gentoo
527 +Desktop Documentation Resources</uri>.
528 </p>
529
530 </body>
531 </section>
532 </chapter>
533
534 -<chapter>
535 +<chapter id="resources">
536 <title>Resources</title>
537 <section>
538 -<title>Creating and Tweaking xorg.conf</title>
539 +<title>Creating and editing config files</title>
540 <body>
541
542 <p>
543 First of all, <c>man xorg.conf</c> and <c>man evdev</c> provide quick yet
544 complete references about the syntax used by these configuration files. Be sure
545 -to have them open on a terminal near you when you edit your configuration
546 -files!
547 -</p>
548 -
549 -<p>
550 -Also, be sure to look at <path>/etc/X11/xorg.conf.example</path>; you may wish
551 -to copy this and use it as a foundation for writing your own
552 -<path>xorg.conf</path>.
553 +to have them open on a terminal when you edit your configuration files!
554 </p>
555
556 <p>
557 -You may find the X.org <uri link="http://www.x.org/wiki/FAQ">FAQ</uri> provided
558 -on their website, in addition to their other documentation.
559 -</p>
560 -
561 -<p>
562 -There are also many online resources on editing <path>xorg.conf</path>. We only
563 -list few of them here, be sure to <uri link="http://www.google.com">Google</uri>
564 -for more.
565 +There are also many online resources on editing config files in
566 +<path>/etc/X11/</path>. We only list few of them here; be sure to <uri
567 +link="http://www.google.com">Google</uri> for more.
568 </p>
569
570 </body>
571 @@ -789,12 +612,17 @@
572 </p>
573
574 <p>
575 -If you're upgrading to <c>xorg-server</c> 1.8 from an earlier version, then be
576 +If you're upgrading to <c>xorg-server</c> 1.9 from an earlier version, then be
577 sure to read the <uri
578 -link="/proj/en/desktop/x/x11/xorg-server-1.8-upgrade-guide.xml">migration
579 +link="/proj/en/desktop/x/x11/xorg-server-1.9-upgrade-guide.xml">migration
580 guide</uri>.
581 </p>
582
583 +<p>
584 +X.org provides many <uri link="http://www.x.org/wiki/FAQ">FAQs</uri> on their
585 +website, in addition to their other documentation.
586 +</p>
587 +
588 </body>
589 </section>
590 </chapter>