* [gentoo-commits] gentoo commit in xml/htdocs/doc/en: xorg-config.xml
@ 2010-10-25 7:38 Joshua Saddler (nightmorph)
0 siblings, 0 replies; 24+ messages in thread
From: Joshua Saddler (nightmorph) @ 2010-10-25 7:38 UTC (permalink / raw
To: gentoo-commits
nightmorph 10/10/25 07:38:17
Modified: xorg-config.xml
Log:
update xorg-drivers example for the removal of xf86-video-radeonhd
Revision Changes Path
1.42 xml/htdocs/doc/en/xorg-config.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.42&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.42&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?r1=1.41&r2=1.42
Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- xorg-config.xml 12 Oct 2010 23:13:18 -0000 1.41
+++ xorg-config.xml 25 Oct 2010 07:38:17 -0000 1.42
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.41 2010/10/12 23:13:18 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.42 2010/10/25 07:38:17 nightmorph Exp $ -->
<guide>
<title>The X Server Configuration HOWTO</title>
@@ -22,8 +22,8 @@
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
<license/>
-<version>3</version>
-<date>2010-10-12</date>
+<version>4</version>
+<date>2010-10-25</date>
<chapter>
<title>What is the X Window Server?</title>
@@ -297,15 +297,15 @@
These are the packages that would be merged, in order:
Calculating dependencies... done!
-[ebuild R ] x11-base/xorg-drivers-1.8 INPUT_DEVICES="evdev synaptics
+[ebuild R ] x11-base/xorg-drivers-1.9 INPUT_DEVICES="evdev synaptics
-acecad -aiptek -elographics% -fpit% -joystick -keyboard -mouse -penmount -tslib
-virtualbox -vmmouse -void -wacom"
VIDEO_CARDS="radeon -apm -ark -ast -chips -cirrus -dummy -epson -fbdev -fglrx
(-geode) -glint -i128 (-i740) (-impact) -intel -mach64 -mga -neomagic (-newport)
--nouveau -nv -nvidia -r128 -radeonhd -rendition -s3 -s3virge -savage
--siliconmotion -sis -sisusb (-sunbw2) (-suncg14) (-suncg3) (-suncg6) (-sunffb)
-(-sunleo) (-suntcx) -tdfx -tga -trident -tseng -v4l -vesa -via -virtualbox
--vmware (-voodoo) (-xgi)" 0 kB
+-nouveau -nv -nvidia -r128 -rendition -s3 -s3virge -savage -siliconmotion -sis
+-sisusb (-sunbw2) (-suncg14) (-suncg3) (-suncg6) (-sunffb) (-sunleo) (-suntcx)
+-tdfx -tga -trident -tseng -v4l -vesa -via -virtualbox -vmware (-voodoo) (-xgi)"
+0 kB
</pre>
<p>
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo commit in xml/htdocs/doc/en: xorg-config.xml
@ 2013-08-01 18:24 Sven Vermeulen (swift)
0 siblings, 0 replies; 24+ messages in thread
From: Sven Vermeulen (swift) @ 2013-08-01 18:24 UTC (permalink / raw
To: gentoo-commits
swift 13/08/01 18:24:47
Modified: xorg-config.xml
Log:
Xorg configuration is now at https://wiki.gentoo.org/wiki/Xorg/Configuration
Revision Changes Path
1.52 xml/htdocs/doc/en/xorg-config.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.52&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.52&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?r1=1.51&r2=1.52
Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- xorg-config.xml 22 Jul 2013 13:23:01 -0000 1.51
+++ xorg-config.xml 1 Aug 2013 18:24:47 -0000 1.52
@@ -1,8 +1,8 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.51 2013/07/22 13:23:01 swift Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.52 2013/08/01 18:24:47 swift Exp $ -->
-<guide>
+<guide disclaimer="obsolete" redirect="https://wiki.gentoo.org/wiki/Xorg/Configuration">
<title>The X Server Configuration HOWTO</title>
<author title="Author">
@@ -22,8 +22,8 @@
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
<license/>
-<version>13</version>
-<date>2013-07-22</date>
+<version>14</version>
+<date>2013-08-01</date>
<chapter>
<title>What is the X Window Server?</title>
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo commit in xml/htdocs/doc/en: xorg-config.xml
@ 2012-06-14 6:48 Joshua Saddler (nightmorph)
0 siblings, 0 replies; 24+ messages in thread
From: Joshua Saddler (nightmorph) @ 2012-06-14 6:48 UTC (permalink / raw
To: gentoo-commits
nightmorph 12/06/14 06:48:33
Modified: xorg-config.xml
Log:
update firmware/graphics driver stuff, thanks to chithanh for the patch via bug #419487
Revision Changes Path
1.49 xml/htdocs/doc/en/xorg-config.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.49&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.49&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?r1=1.48&r2=1.49
Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- xorg-config.xml 2 Sep 2011 19:07:12 -0000 1.48
+++ xorg-config.xml 14 Jun 2012 06:48:33 -0000 1.49
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.48 2011/09/02 19:07:12 swift Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.49 2012/06/14 06:48:33 nightmorph Exp $ -->
<guide>
<title>The X Server Configuration HOWTO</title>
@@ -22,8 +22,8 @@
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
<license/>
-<version>10</version>
-<date>2011-09-02</date>
+<version>11</version>
+<date>2012-06-13</date>
<chapter>
<title>What is the X Window Server?</title>
@@ -162,8 +162,7 @@
/dev/agpgart (AGP Support) --->
<*> Intel 440LX/BX/GX, I8xx and E7x05 chipset support
Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) --->
- <*> Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)
- i915 driver
+ <*> Intel 8xx/9xx/G3x/G4x/HD Graphics
[*] Enable modesetting on intel by default
</pre>
@@ -172,16 +171,10 @@
</p>
<pre caption="nVidia settings">
-<comment>(Enable DRM)</comment>
Device Drivers --->
Graphics support --->
- <*> Direct Rendering Manager --->
-
-<comment>(Nouveau is currently in the Staging drivers section)</comment>
-Device Drivers --->
- Staging drivers --->
- [ ] Exclude Staging drivers from being built
- <*> Nouveau (nVidia) cards
+ Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) --->
+ <*> Nouveau (nVidia) cards
</pre>
<p>
@@ -198,22 +191,33 @@
[*] Include in-kernel firmware blobs in kernel binary
<comment># RadeonHD 2000, 3000, and 4000 series cards:</comment>
(radeon/R600_rlc.bin radeon/R700_rlc.bin) External firmware blobs
- <comment># RadeonHD 5000, a.k.a Evergreen, and newer cards:</comment>
+ <comment># RadeonHD 5000, a.k.a Evergreen:</comment>
(radeon/CEDAR_me.bin radeon/CEDAR_pfp.bin radeon/CEDAR_rlc.bin
radeon/CYPRESS_me.bin radeon/CYPRESS_pfp.bin radeon/CYPRESS_rlc.bin
radeon/JUNIPER_me.bin radeon/JUNIPER_pfp.bin radeon/JUNIPER_rlc.bin
radeon/REDWOOD_me.bin radeon/REDWOOD_pfp.bin
radeon/REDWOOD_rlc.bin) External firmware blobs
- <comment># Radeon HD 6000 series Fusion APUs:</comment>
+ <comment># Radeon HD 6000/7300 series Fusion APUs:</comment>
(radeon/PALM_me.bin radeon/PALM_pfp.bin radeon/SUMO2_me.bin
radeon/SUMO2_pfp.bin radeon/SUMO_me.bin radeon/SUMO_pfp.bin
radeon/SUMO_rlc.bin) External firmware blobs
- <comment># Radeon HD 6400-6900 aka. Northern Islands:</comment>
+ <comment># Radeon HD 6400-7600 aka. Northern Islands:</comment>
(radeon/BARTS_mc.bin radeon/BARTS_me.bin radeon/BARTS_pfp.bin
radeon/BTC_rlc.bin radeon/CAICOS_mc.bin radeon/CAICOS_me.bin
radeon/CAICOS_pfp.bin radeon/CAYMAN_mc.bin radeon/CAYMAN_me.bin
radeon/CAYMAN_pfp.bin radeon/CAYMAN_rlc.bin radeon/TURKS_mc.bin
radeon/TURKS_me.bin radeon/TURKS_pfp.bin) External firmware blobs
+ <comment># Radeon HD 7500/7600 series Fusion APUs:</comment>
+ (radeon/ARUBA_me.bin radeon/ARUBA_pfp.bin radeon/ARUBA_rlc.bin)
+ External firmware blobs
+ <comment># Radeon HD 7700-7900 aka. Southern Islands:</comment>
+ (radeon/PITCAIRN_ce.bin radeon/PITCAIRN_mc.bin radeon/PITCAIRN_me.bin
+ radeon/PITCAIRN_pfp.bin radeon/PITCAIRN_rlc.bin radeon/TAHITI_ce.bin
+ radeon/TAHITI_mc.bin radeon/TAHITI_me.bin radeon/TAHITI_pfp.bin
+ radeon/TAHITI_rlc.bin radeon/VERDE_ce.bin radeon/VERDE_mc.bin
+ radeon/VERDE_me.bin radeon/VERDE_pfp.bin radeon/VERDE_rlc.bin)
+ External firmware blobs
+ <comment># all:</comment>
(/lib/firmware/) Firmware blobs root directory
<comment>(Enable Radeon KMS support)</comment>
^ permalink raw reply [flat|nested] 24+ messages in thread* [gentoo-commits] gentoo commit in xml/htdocs/doc/en: xorg-config.xml
@ 2011-09-02 19:07 Sven Vermeulen (swift)
0 siblings, 0 replies; 24+ messages in thread
From: Sven Vermeulen (swift) @ 2011-09-02 19:07 UTC (permalink / raw
To: gentoo-commits
swift 11/09/02 19:07:13
Modified: xorg-config.xml
Log:
Fix #379391 - Prefix bin files with "radeon/" as suggested by kahrl@gmx.net
Revision Changes Path
1.48 xml/htdocs/doc/en/xorg-config.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.48&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.48&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?r1=1.47&r2=1.48
Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- xorg-config.xml 23 Aug 2011 15:04:51 -0000 1.47
+++ xorg-config.xml 2 Sep 2011 19:07:12 -0000 1.48
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.47 2011/08/23 15:04:51 swift Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.48 2011/09/02 19:07:12 swift Exp $ -->
<guide>
<title>The X Server Configuration HOWTO</title>
@@ -22,8 +22,8 @@
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
<license/>
-<version>9</version>
-<date>2011-08-23</date>
+<version>10</version>
+<date>2011-09-02</date>
<chapter>
<title>What is the X Window Server?</title>
@@ -205,13 +205,14 @@
radeon/REDWOOD_me.bin radeon/REDWOOD_pfp.bin
radeon/REDWOOD_rlc.bin) External firmware blobs
<comment># Radeon HD 6000 series Fusion APUs:</comment>
- (radeon/PALM_me.bin radeon/PALM_pfp.bin SUMO2_me.bin SUMO2_pfp.bin
- SUMO_me.bin SUMO_pfp.bin radeon/SUMO_rlc.bin) External firmware blobs
+ (radeon/PALM_me.bin radeon/PALM_pfp.bin radeon/SUMO2_me.bin
+ radeon/SUMO2_pfp.bin radeon/SUMO_me.bin radeon/SUMO_pfp.bin
+ radeon/SUMO_rlc.bin) External firmware blobs
<comment># Radeon HD 6400-6900 aka. Northern Islands:</comment>
(radeon/BARTS_mc.bin radeon/BARTS_me.bin radeon/BARTS_pfp.bin
radeon/BTC_rlc.bin radeon/CAICOS_mc.bin radeon/CAICOS_me.bin
- radeon/CAICOS_pfp.bin CAYMAN_mc.bin
- CAYMAN_me.bin CAYMAN_pfp.bin CAYMAN_rlc.bin radeon/TURKS_mc.bin
+ radeon/CAICOS_pfp.bin radeon/CAYMAN_mc.bin radeon/CAYMAN_me.bin
+ radeon/CAYMAN_pfp.bin radeon/CAYMAN_rlc.bin radeon/TURKS_mc.bin
radeon/TURKS_me.bin radeon/TURKS_pfp.bin) External firmware blobs
(/lib/firmware/) Firmware blobs root directory
^ permalink raw reply [flat|nested] 24+ messages in thread* [gentoo-commits] gentoo commit in xml/htdocs/doc/en: xorg-config.xml
@ 2011-08-23 15:04 Sven Vermeulen (swift)
0 siblings, 0 replies; 24+ messages in thread
From: Sven Vermeulen (swift) @ 2011-08-23 15:04 UTC (permalink / raw
To: gentoo-commits
swift 11/08/23 15:04:51
Modified: xorg-config.xml
Log:
Bug #379391 - Remove Radeon HD 62°00/6300 as this is now part of the 6000 series
Revision Changes Path
1.47 xml/htdocs/doc/en/xorg-config.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.47&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.47&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?r1=1.46&r2=1.47
Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- xorg-config.xml 23 Aug 2011 14:43:41 -0000 1.46
+++ xorg-config.xml 23 Aug 2011 15:04:51 -0000 1.47
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.46 2011/08/23 14:43:41 swift Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.47 2011/08/23 15:04:51 swift Exp $ -->
<guide>
<title>The X Server Configuration HOWTO</title>
@@ -22,7 +22,7 @@
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
<license/>
-<version>8</version>
+<version>9</version>
<date>2011-08-23</date>
<chapter>
@@ -207,9 +207,6 @@
<comment># Radeon HD 6000 series Fusion APUs:</comment>
(radeon/PALM_me.bin radeon/PALM_pfp.bin SUMO2_me.bin SUMO2_pfp.bin
SUMO_me.bin SUMO_pfp.bin radeon/SUMO_rlc.bin) External firmware blobs
- <comment># Radeon HD 6200/6300 aka. Ontario/Zacate:</comment>
- (radeon/PALM_me.bin radeon/PALM_pfp.bin radeon/SUMO_rlc.bin) External
- firmware blobs
<comment># Radeon HD 6400-6900 aka. Northern Islands:</comment>
(radeon/BARTS_mc.bin radeon/BARTS_me.bin radeon/BARTS_pfp.bin
radeon/BTC_rlc.bin radeon/CAICOS_mc.bin radeon/CAICOS_me.bin
^ permalink raw reply [flat|nested] 24+ messages in thread* [gentoo-commits] gentoo commit in xml/htdocs/doc/en: xorg-config.xml
@ 2011-08-23 14:43 Sven Vermeulen (swift)
0 siblings, 0 replies; 24+ messages in thread
From: Sven Vermeulen (swift) @ 2011-08-23 14:43 UTC (permalink / raw
To: gentoo-commits
swift 11/08/23 14:43:41
Modified: xorg-config.xml
Log:
Fix bug #379391 - Update xorg-config to include firmware information on latest radeon stuff. Thanks to chithanh@g.o for reporting/content
Revision Changes Path
1.46 xml/htdocs/doc/en/xorg-config.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.46&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.46&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?r1=1.45&r2=1.46
Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- xorg-config.xml 23 Mar 2011 09:03:51 -0000 1.45
+++ xorg-config.xml 23 Aug 2011 14:43:41 -0000 1.46
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.45 2011/03/23 09:03:51 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.46 2011/08/23 14:43:41 swift Exp $ -->
<guide>
<title>The X Server Configuration HOWTO</title>
@@ -22,8 +22,8 @@
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
<license/>
-<version>7</version>
-<date>2011-03-23</date>
+<version>8</version>
+<date>2011-08-23</date>
<chapter>
<title>What is the X Window Server?</title>
@@ -186,8 +186,9 @@
<p>
For newer AMD/ATI cards (<uri link="/doc/en/ati-faq.xml">RadeonHD 2000 and
-up</uri>), you will need to emerge <c>radeon-ucode</c>. Once you have installed
-<c>radeon-ucode</c>, configure your kernel as shown:
+up</uri>), you will need to emerge <c>radeon-ucode</c> or
+<c>linux-firmware</c>. Once you have installed one of these packages,
+configure your kernel as shown:
</p>
<pre caption="AMD/ATI settings">
@@ -203,14 +204,18 @@
radeon/JUNIPER_me.bin radeon/JUNIPER_pfp.bin radeon/JUNIPER_rlc.bin
radeon/REDWOOD_me.bin radeon/REDWOOD_pfp.bin
radeon/REDWOOD_rlc.bin) External firmware blobs
+ <comment># Radeon HD 6000 series Fusion APUs:</comment>
+ (radeon/PALM_me.bin radeon/PALM_pfp.bin SUMO2_me.bin SUMO2_pfp.bin
+ SUMO_me.bin SUMO_pfp.bin radeon/SUMO_rlc.bin) External firmware blobs
<comment># Radeon HD 6200/6300 aka. Ontario/Zacate:</comment>
(radeon/PALM_me.bin radeon/PALM_pfp.bin radeon/SUMO_rlc.bin) External
firmware blobs
<comment># Radeon HD 6400-6900 aka. Northern Islands:</comment>
(radeon/BARTS_mc.bin radeon/BARTS_me.bin radeon/BARTS_pfp.bin
radeon/BTC_rlc.bin radeon/CAICOS_mc.bin radeon/CAICOS_me.bin
- radeon/CAICOS_pfp.bin radeon/TURKS_mc.bin radeon/TURKS_me.bin
- radeon/TURKS_pfp.bin) External firmware blobs
+ radeon/CAICOS_pfp.bin CAYMAN_mc.bin
+ CAYMAN_me.bin CAYMAN_pfp.bin CAYMAN_rlc.bin radeon/TURKS_mc.bin
+ radeon/TURKS_me.bin radeon/TURKS_pfp.bin) External firmware blobs
(/lib/firmware/) Firmware blobs root directory
<comment>(Enable Radeon KMS support)</comment>
^ permalink raw reply [flat|nested] 24+ messages in thread* [gentoo-commits] gentoo commit in xml/htdocs/doc/en: xorg-config.xml
@ 2011-03-23 9:03 Joshua Saddler (nightmorph)
0 siblings, 0 replies; 24+ messages in thread
From: Joshua Saddler (nightmorph) @ 2011-03-23 9:03 UTC (permalink / raw
To: gentoo-commits
nightmorph 11/03/23 09:03:52
Modified: xorg-config.xml
Log:
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.
Revision Changes Path
1.45 xml/htdocs/doc/en/xorg-config.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?r1=1.44&r2=1.45
Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- xorg-config.xml 2 Mar 2011 08:16:43 -0000 1.44
+++ xorg-config.xml 23 Mar 2011 09:03:51 -0000 1.45
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.44 2011/03/02 08:16:43 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.45 2011/03/23 09:03:51 nightmorph Exp $ -->
<guide>
<title>The X Server Configuration HOWTO</title>
@@ -22,8 +22,8 @@
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
<license/>
-<version>6</version>
-<date>2011-03-02</date>
+<version>7</version>
+<date>2011-03-23</date>
<chapter>
<title>What is the X Window Server?</title>
@@ -148,7 +148,7 @@
<p>
Next, configure your kernel to use the proper KMS driver for your video card.
-Intel, nVidia, and ATI are the most common cards, so follow code listing for
+Intel, nVidia, and AMD/ATI are the most common cards, so follow code listing for
your card below.
</p>
@@ -185,12 +185,12 @@
</pre>
<p>
-For newer ATI cards (<uri link="/doc/en/ati-faq.xml">RadeonHD 2000 and
+For newer AMD/ATI cards (<uri link="/doc/en/ati-faq.xml">RadeonHD 2000 and
up</uri>), you will need to emerge <c>radeon-ucode</c>. Once you have installed
<c>radeon-ucode</c>, configure your kernel as shown:
</p>
-<pre caption="ATI settings">
+<pre caption="AMD/ATI settings">
<comment>(Setup the kernel to use the radeon-ucode firmware)</comment>
Device Drivers --->
Generic Driver Options --->
@@ -252,8 +252,8 @@
</p>
<note>
-You may also try the proprietary drivers from nVidia and ATI, <c>nvidia</c> and
-<c>fglrx</c> respectively. However, setting up the proprietary drivers is
+You may also try the proprietary drivers from nVidia and AMD/ATI, <c>nvidia</c>
+and <c>fglrx</c> respectively. However, setting up the proprietary drivers is
beyond the scope of this guide. Please read the <uri
link="/doc/en/nvidia-guide.xml">Gentoo Linux nVidia Guide</uri> and <uri
link="/doc/en/ati-faq.xml">Gentoo Linux ATI FAQ</uri>. If you don't know which
@@ -288,7 +288,7 @@
INPUT_DEVICES="evdev synaptics"
<comment>(For nVidia cards)</comment>
VIDEO_CARDS="nouveau"
-<comment>(OR, for ATI Radeon cards)</comment>
+<comment>(For AMD/ATI cards)</comment>
VIDEO_CARDS="radeon"
</pre>
@@ -321,6 +321,9 @@
</p>
<pre caption="Installing Xorg">
+<comment>(Make sure udev is in your USE flags)</comment>
+# <i>echo "x11-base/xorg-server udev" >> /etc/portage/package.use</i>
+<comment>(Install Xorg)</comment>
# <i>emerge xorg-server</i>
</pre>
@@ -334,8 +337,7 @@
<p>
When the installation is finished, you will need to re-initialise some
-environment variables before you continue. Just run <c>env-update</c> followed
-by <c>source /etc/profile</c> and you're all set.
+environment variables before you continue:
</p>
<pre caption="Re-initialising the environment variables">
@@ -343,216 +345,57 @@
# <i>source /etc/profile</i>
</pre>
-<p>
-Now it's time to start the Hardware Abstraction Layer (HAL) daemon and set it to
-automatically start each time you boot. This is necessary to get a working X
-environment, otherwise your input devices won't be detected and you'll probably
-just get a blank screen. We'll cover HAL more in the <uri
-link="#using_hal">next section</uri>.
-</p>
-
-<pre caption="Starting HAL">
-# <i>/etc/init.d/hald start</i>
-# <i>rc-update add hald default</i>
-</pre>
-
</body>
</section>
</chapter>
<chapter>
<title>Configuring Xorg</title>
-<section id="using_hal">
-<title>Using HAL</title>
+<section>
<body>
<p>
The X server is designed to work out-of-the-box, with no need to manually edit
-Xorg's configuration files.
-</p>
-
-<p>
-You should first try <uri link="#using_startx">starting X</uri> without creating
-<path>/etc/X11/xorg.conf</path>.
-</p>
-
-<p>
-If Xorg won't start (if there's something wrong with the screen, or with your
-keyboard/mouse), then you can try fixing problems by using the right
-configuration files.
-</p>
-
-<p>
-By default, Xorg uses HAL (Hardware Abstraction Layer) to detect and configure
-devices such as keyboards and mice.
+Xorg's configuration files. It should detect and configure devices such as
+displays, keyboards, and mice.
</p>
<p>
-HAL comes with many premade device rules, also called policies. These policy
-files are available in <path>/usr/share/hal/fdi/policy/</path>. Just find a few
-that suit your needs most closely and copy them to
-<path>/etc/hal/fdi/policy/</path>.
-</p>
-
-<impo>
-Do not edit the files in <path>/usr/share/hal/fdi/</path>! Just copy the ones
-you need, and edit them once they're placed in the proper <path>/etc</path>
-location.
-</impo>
-
-<p>
-For example, to get a basic working keyboard/mouse combination, you could copy
-the following files to <path>/etc/hal/fdi/policy/</path>:
-</p>
-
-<pre caption="Using HAL policy files">
-# <i>cp /usr/share/hal/fdi/policy/10osvendor/10-input-policy.fdi /etc/hal/fdi/policy</i>
-# <i>cp /usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi /etc/hal/fdi/policy</i>
-</pre>
-
-<p>
-There are several other HAL policies in <path>/usr/share/hal/fdi/</path> that
-may interest you, such as laptop configurations, storage device handling, power
-management, and more. Just copy any of the policies to
-<path>/etc/hal/fdi/policy/</path>.
-</p>
-
-<impo>
-Remember, <e>every</e> time you finish making changes to HAL policy files, you
-need to restart the HAL daemon by running <c>/etc/init.d/hald restart</c>.
-</impo>
-
-<p>
-You can edit the policy files in <path>/etc/hal/fdi/policy</path> to your
-liking. You may want to make a few tweaks or to expose additional
-functionality. Let's go through an example of tweaking a HAL policy.
-</p>
-
-<p>
-One very convenient trick is to kill the X server entirely by pressing
-Ctrl-Alt-Backspace. This is useful when your X server is malfunctioning, frozen,
-etc. It's not as extreme as rebooting the whole machine with Ctrl-Alt-Del.
-</p>
-
-<p>
-Recent X server versions disabled this key combination by default. However, you
-can reenable it by copying <path>10-x11-input.fdi</path> to
-<path>/etc/hal/fdi/policy</path> and editing it. You'll need to add just one
-line to the appropriate section, as shown below:
-</p>
-
-<pre caption="Editing 10-x11-input.fdi">
-<comment>(Open the file in your preferred editor)</comment>
-# <i>nano -w /etc/hal/fdi/policy/10-x11-input.fdi</i>
-<comment>(Find the "input.keys" section)</comment>
-<match key="info.capabilities" contains="input.keys">
-<comment>(Add the "terminate" merge string as shown)</comment>
-<match key="info.capabilities" contains="input.keys">
- <merge key="input.x11_driver" type="string">keyboard</merge>
- <i><merge key="input.xkb.options" type="string">terminate:ctrl_alt_bksp</merge></i>
- <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
- string="Linux">
- <merge key="input.x11_driver" type="string">evdev<merge>
- </match>
- </match>
-</pre>
-
-<p>
-Once you're done, run <c>/etc/init.d/hald restart</c> so that HAL picks up your
-changes.
-</p>
-
-<p>
-There, now you have a handy way of killing an unresponsive X server. This is
-useful when programs have frozen your display entirely, or when configuring and
-tweaking your Xorg environment. Be careful when killing your desktop with this
-key combination -- most programs really don't like it when you end them this
-way, and you may lose some (or all) of what you were working on.
-</p>
-
-<p>
-Hopefully just working with the HAL policy files results in a working X desktop.
-If Xorg still won't start, or there's some other problem, then you'll need to
-manually configure <path>xorg.conf</path> as shown in the next section.
+You should first try <uri link="#using_startx">starting X</uri> without editing
+any configuration files. If Xorg won't start, or there's some other problem,
+then you'll need to manually configure Xorg as shown in the next section.
</p>
</body>
</section>
<section>
-<title>The xorg.conf file</title>
+<title>The xorg.conf.d directory</title>
<body>
<note>
-Configuring <path>xorg.conf</path> should be seen as a "last resort" option. It
-really desirable to run without one if possible, and to do all your
-configuration via HAL policy files. If you still can't get a working
-configuration, then read on.
+Configuring files in <path>xorg.conf.d</path> should be seen as a "last resort"
+option. It really desirable to run without any special configuration if
+possible. If you still can't get a working configuration, then read on.
</note>
<p>
-The configuration file of Xorg is called <path>xorg.conf</path> and it resides
-in <path>/etc/X11</path>. Xorg provides an example configuration as
-<path>/etc/X11/xorg.conf.example</path> which you can use to create your own
-configuration. It is heavily commented, but if you are in need of more
-documentation regarding the syntax, don't hesitate to read the man page:
+The configuration files of Xorg are stored in
+<path>/etc/X11/xorg.conf.d/</path>. Each file is given a unique name and ends in
+<path>.conf</path>. If the filenames start with a number, then Xorg will read
+the files in numeric order. <path>10-evdev.conf</path> will be read before
+<path>20-synaptics.conf</path>, and so on. You don't <e>have</e> to give them
+numbers, but it may help you organize them.
</p>
-<pre caption="Reading the xorg.conf man page">
-$ <i>man 5 xorg.conf</i>
-</pre>
-
-</body>
-</section>
-<section>
-<title>Automatic Generation of xorg.conf</title>
-<body>
-
-<p>
-Xorg itself is able to guess most parameters for you. In most cases, you
-will only have to change some lines to get the resolution you want up and
-running. If you are interested in more in-depth tweaking, be sure to check the
-resources at the end of this chapter. But first, let us generate a (hopefully
-working) Xorg configuration file.
-</p>
-
-<pre caption="Generating an xorg.conf file">
-# <i>Xorg -configure</i>
-</pre>
-
-<p>
-Be sure to read the last lines printed on your screen when Xorg has finished
-probing your hardware. If it tells you it failed at some point, you're forced to
-manually write an <path>xorg.conf</path> file. Assuming that it didn't fail, it
-will have told you that it has written <path>/root/xorg.conf.new</path> ready
-for you to test. So let's test. :)
-</p>
-
-<pre caption="Testing the xorg.conf.new file">
-# <i>X -retro -config /root/xorg.conf.new</i>
-</pre>
-
-<p>
-If all goes well, you should see a simple black and white pattern. Verify if
-your mouse works correctly and if the resolution is good. You might not be able
-to deduce the exact resolution, but you should be able to see if it's too low.
-You can exit any time by pressing Ctrl-Alt-Backspace.
-</p>
-
-</body>
-</section>
-<section>
-<title>Copying over xorg.conf</title>
-<body>
-
-<p>
-Let us copy over the <path>xorg.conf.new</path> to
-<path>/etc/X11/xorg.conf</path> now, so we won't have to continuously run
-<c>X -config</c> -- typing just <c>startx</c> is easier. :)
-</p>
-
-<pre caption="Copying over xorg.conf">
-# <i>cp /root/xorg.conf.new /etc/X11/xorg.conf</i>
-</pre>
+<note>
+Xorg provides example configurations in
+<path>/usr/share/doc/xorg-server-${version}/xorg.conf.example.bz2</path>. You
+can use these to create your own configuration files in
+<path>/etc/X11/xorg.conf.d/</path>. The examples are heavily commented, but if
+you are in need of more documentation regarding the syntax, read <c>man
+xorg.conf</c>. Other examples can be found in the <uri
+link="#resources">Resources</uri> chapter at the end of this guide.
+</note>
</body>
</section>
@@ -562,7 +405,7 @@
<p>
Now try <c>startx</c> to start up your X server. <c>startx</c> is a script
-that executes an <e>X session</e>, that is, it starts the X server and some
+that executes an <e>X session</e>; that is, it starts the X server and some
graphical applications on top of it. It decides which applications to run
using the following logic:
</p>
@@ -590,23 +433,17 @@
</pre>
<p>
-You can kill the X session by using the Ctrl-Alt-Backspace key combination. This
-will, however, make X exit disgracefully -- something that you might not always
-want.
-</p>
-
-<p>
If you haven't yet installed a window manager, all you'll see is a black screen.
Since this can also be a sign that something's wrong, you may want to emerge
<c>twm</c> and <c>xterm</c> <e>only to test X</e>.
</p>
<p>
-Once those two programs are installed, run <c>startx</c> again. A few xterm
-windows should appear, making it easier to verify that X is working correctly.
-Once you're satisfied with the results, run <c>emerge --unmerge twm xterm</c> as
-root to get rid of the testing packages. You won't need them once you've setup a
-proper desktop environment.
+Once those two programs are installed, run <c>startx</c> again. A few
+<c>xterm</c> windows should appear, making it easier to verify that X is working
+correctly. Once you're satisfied with the results, run <c>emerge --unmerge twm
+xterm</c> as root to get rid of the testing packages. You won't need them once
+you've setup a proper desktop environment.
</p>
</body>
@@ -621,41 +458,27 @@
<p>
If you feel that the screen resolution is wrong, you will need to check two
-sections in your <path>xorg.conf</path> configuration. First of all, you have
-the <e>Screen</e> section which lists the resolutions, if any that your X server
-will run at. By default, this section might not list any resolutions at all. If
-this is the case, Xorg will estimate the resolutions based on the information in
-the second section, <e>Monitor</e>.
+sections in your <path>xorg.conf.d</path> configuration. First of all, you have
+the <e>Screen</e> section which lists the resolutions that your X server will
+run at. This section might not list any resolutions at all. If this is the case,
+Xorg will estimate the resolutions based on the information in the second
+section, <e>Monitor</e>.
</p>
<p>
-What happens is that Xorg checks the settings of <c>HorizSync</c> and
-<c>VertRefresh</c> in the <e>Monitor</e> section to compute valid resolutions.
-For now, leave these settings as-is. Only when the changes to the <e>Screen</e>
-section (which we will describe in a minute) don't work, then you will need to
-look up the specs for your monitor and fill in the correct values.
-</p>
-
-<warn>
-Do <b>not</b> "just" change the values of these two monitor related variables
-without consulting the technical specifications of your monitor. Setting
-incorrect values lead to out-of-sync errors at best and smoked up screens at
-worst.
-</warn>
-
-<p>
Now let us change the resolution. In the next example from
-<path>/etc/X11/xorg.conf</path> we add the <c>PreferredMode</c> line so that our
-X server starts at 1440x900 by default. Don't mind the given strings -- they are
-examples and will most likely differ from the settings on your system. However,
-the <c>Option</c> in the <c>Device</c> section must match the name of your
+<path>/etc/X11/xorg.conf.d/40-monitor.conf</path> we add the
+<c>PreferredMode</c> line so that our X server starts at 1440x900 by default.
+The <c>Option</c> in the <c>Device</c> section must match the name of your
monitor (<c>DVI-0</c>), which can be obtained by running <c>xrandr</c>. You'll
need to <c>emerge xrandr</c> just long enough to get this information. The
argument after the monitor name (in the <c>Device</c> section) must match the
<c>Identifier</c> in the <c>Monitor</c> section.
</p>
-<pre caption="Changing the Monitor section in /etc/X11/xorg.conf">
+<pre caption="Changing the Monitor section">
+# <i>nano -w /etc/X11/xorg.conf.d/40-monitor.conf</i>
+
Section "Device"
Identifier "RadeonHD 4550"
Option "Monitor-DVI-0" "DVI screen"
@@ -677,24 +500,24 @@
<body>
<p>
-You can configure more than one monitor in <path>/etc/X11/xorg.conf</path>. All
-you have to do is give each monitor an identifer, then list its physical
+You can configure more than one monitor in <path>/etc/X11/xorg.conf.d/</path>.
+All you have to do is give each monitor an identifer, then list its physical
position, such as "RightOf" or "Above" another monitor. The following example
shows how to configure a DVI and a VGA monitor, with the VGA monitor as the
right-hand screen:
</p>
-<pre caption="Configuring multiple monitors in xorg.conf">
+<pre caption="Configuring multiple monitors">
+# <i>nano -w /etc/X11/xorg.conf.d/40-monitor.conf</i>
+
Section "Device"
Identifier "RadeonHD 4550"
Option "Monitor-DVI-0" "DVI screen"
Option "Monitor-VGA-0" "VGA screen"
EndSection
-
Section "Monitor"
Identifier "DVI screen"
EndSection
-
Section "Monitor"
Identifier "VGA screen"
Option "RightOf" "DVI screen"
@@ -708,24 +531,34 @@
<body>
<p>
-To setup X to use an international keyboard, you can copy the content of
-<path>/usr/share/doc/hal-*/*/use-estonian-layout.fdi.bz2</path> to
-<path>/etc/hal/fdi/policy/10-xinput-configuration.fdi</path>:
-</p>
-
-<pre caption="Using an existing config file">
-# <i>bzcat /usr/share/doc/hal-*/*/use-estonian-layout.fdi.bz2 > /etc/hal/fdi/policy/10-xinput-configuration.fdi</i>
+To setup X to use an international keyboard, you just have to create the
+appropriate config file in <path>/etc/X11/xorg.conf.d/</path>. This example
+features a Czech keyboard layout:
+</p>
+
+<pre caption="Using an international keyboard">
+# <i>nano -w /etc/X11/xorg.conf.d/30-keyboard.conf</i>
+
+Section "InputClass"
+ Identifier "keyboard-all"
+ Driver "evdev"
+ Option "XkbLayout" "us,cz"
+ Option "XkbModel" "logitech_g15"
+ Option "XkbRules" "xorg"
+ Option "XkbOptions" "grp:alt_shift_toggle,grp:switch,grp_led:scroll,compose:rwin,terminate:ctrl_alt_bksp"
+ Option "XkbVariant" ",qwerty"
+ MatchIsKeyboard "on"
+EndSection
</pre>
<p>
-Now you can just edit <path>10-xinput-configuration.fdi</path> and change the
-Estonian keyboard layout (<c>ee</c>) to your own, such as Great Britain
-(<b>gb</b>) or Polish (<b>pl</b>).
-</p>
-
-<p>
-When you're finished, run <c>/etc/init.d/hald restart</c> as root to make sure
-that HAL picks up your configuration file changes.
+The "terminate" command (<c>terminate:ctrl_alt_bksp</c>) lets you kill the X
+session by using the Ctrl-Alt-Backspace key combination. This will, however,
+make X exit disgracefully -- something that you might not always want. It can be
+useful when programs have frozen your display entirely, or when you're
+configuring and tweaking your Xorg environment. Be careful when killing your
+desktop with this key combination -- most programs really don't like it when you
+end them this way, and you may lose some (or all) of what you were working on.
</p>
</body>
@@ -737,42 +570,32 @@
<p>
Run <c>startx</c> and be happy about the result. Congratulations, you now
(hopefully) have a working Xorg on your system. The next step is to install a
-useful window manager or desktop environment such as KDE, GNOME, or
-Xfce, but that's not part of this guide.
+useful window manager or desktop environment such as KDE, GNOME, or Xfce, but
+that's not part of this guide. Information on installing these desktop
+environments can be found in our <uri link="/doc/en/?catid=desktop">Gentoo
+Desktop Documentation Resources</uri>.
</p>
</body>
</section>
</chapter>
-<chapter>
+<chapter id="resources">
<title>Resources</title>
<section>
-<title>Creating and Tweaking xorg.conf</title>
+<title>Creating and editing config files</title>
<body>
<p>
First of all, <c>man xorg.conf</c> and <c>man evdev</c> provide quick yet
complete references about the syntax used by these configuration files. Be sure
-to have them open on a terminal near you when you edit your configuration
-files!
-</p>
-
-<p>
-Also, be sure to look at <path>/etc/X11/xorg.conf.example</path>; you may wish
-to copy this and use it as a foundation for writing your own
-<path>xorg.conf</path>.
+to have them open on a terminal when you edit your configuration files!
</p>
<p>
-You may find the X.org <uri link="http://www.x.org/wiki/FAQ">FAQ</uri> provided
-on their website, in addition to their other documentation.
-</p>
-
-<p>
-There are also many online resources on editing <path>xorg.conf</path>. We only
-list few of them here, be sure to <uri link="http://www.google.com">Google</uri>
-for more.
+There are also many online resources on editing config files in
+<path>/etc/X11/</path>. We only list few of them here; be sure to <uri
+link="http://www.google.com">Google</uri> for more.
</p>
</body>
@@ -789,12 +612,17 @@
</p>
<p>
-If you're upgrading to <c>xorg-server</c> 1.8 from an earlier version, then be
+If you're upgrading to <c>xorg-server</c> 1.9 from an earlier version, then be
sure to read the <uri
-link="/proj/en/desktop/x/x11/xorg-server-1.8-upgrade-guide.xml">migration
+link="/proj/en/desktop/x/x11/xorg-server-1.9-upgrade-guide.xml">migration
guide</uri>.
</p>
+<p>
+X.org provides many <uri link="http://www.x.org/wiki/FAQ">FAQs</uri> on their
+website, in addition to their other documentation.
+</p>
+
</body>
</section>
</chapter>
^ permalink raw reply [flat|nested] 24+ messages in thread* [gentoo-commits] gentoo commit in xml/htdocs/doc/en: xorg-config.xml
@ 2011-03-02 8:16 Joshua Saddler (nightmorph)
0 siblings, 0 replies; 24+ messages in thread
From: Joshua Saddler (nightmorph) @ 2011-03-02 8:16 UTC (permalink / raw
To: gentoo-commits
nightmorph 11/03/02 08:16:44
Modified: xorg-config.xml
Log:
additional env-update reminder after editing 90xsession, bug 351370
Revision Changes Path
1.44 xml/htdocs/doc/en/xorg-config.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?r1=1.43&r2=1.44
Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- xorg-config.xml 2 Mar 2011 07:17:38 -0000 1.43
+++ xorg-config.xml 2 Mar 2011 08:16:43 -0000 1.44
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.43 2011/03/02 07:17:38 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.44 2011/03/02 08:16:43 nightmorph Exp $ -->
<guide>
<title>The X Server Configuration HOWTO</title>
@@ -22,8 +22,8 @@
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
<license/>
-<version>5</version>
-<date>2011-03-01</date>
+<version>6</version>
+<date>2011-03-02</date>
<chapter>
<title>What is the X Window Server?</title>
@@ -580,7 +580,8 @@
on the system. For example, as root, run <c>echo XSESSION="Xfce4" >
/etc/env.d/90xsession</c>. This will create the <path>90xsession</path> file
and set the default X session to <uri
- link="/doc/en/xfce-config.xml">Xfce</uri>.
+ link="/doc/en/xfce-config.xml">Xfce</uri>. Remember to run <c>env-update</c>
+ after changing <path>90xsession</path>.
</li>
</ul>
^ permalink raw reply [flat|nested] 24+ messages in thread* [gentoo-commits] gentoo commit in xml/htdocs/doc/en: xorg-config.xml
@ 2011-03-02 7:17 Joshua Saddler (nightmorph)
0 siblings, 0 replies; 24+ messages in thread
From: Joshua Saddler (nightmorph) @ 2011-03-02 7:17 UTC (permalink / raw
To: gentoo-commits
nightmorph 11/03/02 07:17:39
Modified: xorg-config.xml
Log:
add firmware for RadeonHD 5000 and 6000 cards, bug 352030
Revision Changes Path
1.43 xml/htdocs/doc/en/xorg-config.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.43&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.43&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?r1=1.42&r2=1.43
Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- xorg-config.xml 25 Oct 2010 07:38:17 -0000 1.42
+++ xorg-config.xml 2 Mar 2011 07:17:38 -0000 1.43
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.42 2010/10/25 07:38:17 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.43 2011/03/02 07:17:38 nightmorph Exp $ -->
<guide>
<title>The X Server Configuration HOWTO</title>
@@ -22,8 +22,8 @@
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
<license/>
-<version>4</version>
-<date>2010-10-25</date>
+<version>5</version>
+<date>2011-03-01</date>
<chapter>
<title>What is the X Window Server?</title>
@@ -203,6 +203,14 @@
radeon/JUNIPER_me.bin radeon/JUNIPER_pfp.bin radeon/JUNIPER_rlc.bin
radeon/REDWOOD_me.bin radeon/REDWOOD_pfp.bin
radeon/REDWOOD_rlc.bin) External firmware blobs
+ <comment># Radeon HD 6200/6300 aka. Ontario/Zacate:</comment>
+ (radeon/PALM_me.bin radeon/PALM_pfp.bin radeon/SUMO_rlc.bin) External
+ firmware blobs
+ <comment># Radeon HD 6400-6900 aka. Northern Islands:</comment>
+ (radeon/BARTS_mc.bin radeon/BARTS_me.bin radeon/BARTS_pfp.bin
+ radeon/BTC_rlc.bin radeon/CAICOS_mc.bin radeon/CAICOS_me.bin
+ radeon/CAICOS_pfp.bin radeon/TURKS_mc.bin radeon/TURKS_me.bin
+ radeon/TURKS_pfp.bin) External firmware blobs
(/lib/firmware/) Firmware blobs root directory
<comment>(Enable Radeon KMS support)</comment>
^ permalink raw reply [flat|nested] 24+ messages in thread* [gentoo-commits] gentoo commit in xml/htdocs/doc/en: xorg-config.xml
@ 2010-10-12 23:13 Joshua Saddler (nightmorph)
0 siblings, 0 replies; 24+ messages in thread
From: Joshua Saddler (nightmorph) @ 2010-10-12 23:13 UTC (permalink / raw
To: gentoo-commits
nightmorph 10/10/12 23:13:18
Modified: xorg-config.xml
Log:
Add multiple monitor info, bug 328001
Revision Changes Path
1.41 xml/htdocs/doc/en/xorg-config.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.41&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.41&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?r1=1.40&r2=1.41
Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- xorg-config.xml 29 Aug 2010 03:39:55 -0000 1.40
+++ xorg-config.xml 12 Oct 2010 23:13:18 -0000 1.41
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.40 2010/08/29 03:39:55 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.41 2010/10/12 23:13:18 nightmorph Exp $ -->
<guide>
<title>The X Server Configuration HOWTO</title>
@@ -22,8 +22,8 @@
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
<license/>
-<version>2</version>
-<date>2010-08-28</date>
+<version>3</version>
+<date>2010-10-12</date>
<chapter>
<title>What is the X Window Server?</title>
@@ -664,6 +664,37 @@
</body>
</section>
<section>
+<title>Multiple monitors</title>
+<body>
+
+<p>
+You can configure more than one monitor in <path>/etc/X11/xorg.conf</path>. All
+you have to do is give each monitor an identifer, then list its physical
+position, such as "RightOf" or "Above" another monitor. The following example
+shows how to configure a DVI and a VGA monitor, with the VGA monitor as the
+right-hand screen:
+</p>
+
+<pre caption="Configuring multiple monitors in xorg.conf">
+Section "Device"
+ Identifier "RadeonHD 4550"
+ Option "Monitor-DVI-0" "DVI screen"
+ Option "Monitor-VGA-0" "VGA screen"
+EndSection
+
+Section "Monitor"
+ Identifier "DVI screen"
+EndSection
+
+Section "Monitor"
+ Identifier "VGA screen"
+ Option "RightOf" "DVI screen"
+EndSection
+</pre>
+
+</body>
+</section>
+<section>
<title>Configuring your keyboard</title>
<body>
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo commit in xml/htdocs/doc/en: xorg-config.xml
@ 2010-08-29 3:39 Joshua Saddler (nightmorph)
0 siblings, 0 replies; 24+ messages in thread
From: Joshua Saddler (nightmorph) @ 2010-08-29 3:39 UTC (permalink / raw
To: gentoo-commits
nightmorph 10/08/29 03:39:55
Modified: xorg-config.xml
Log:
rewrite X guide for KMS, open-source drivers, and whatnot. inspired by bug 328001.
Revision Changes Path
1.40 xml/htdocs/doc/en/xorg-config.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.40&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.40&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?r1=1.39&r2=1.40
Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- xorg-config.xml 23 May 2010 21:31:50 -0000 1.39
+++ xorg-config.xml 29 Aug 2010 03:39:55 -0000 1.40
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.39 2010/05/23 21:31:50 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.40 2010/08/29 03:39:55 nightmorph Exp $ -->
<guide>
<title>The X Server Configuration HOWTO</title>
@@ -22,8 +22,8 @@
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
<license/>
-<version>1.29</version>
-<date>2010-05-23</date>
+<version>2</version>
+<date>2010-08-28</date>
<chapter>
<title>What is the X Window Server?</title>
@@ -34,8 +34,8 @@
<p>
The average user may be frightened at the thought of having to type in commands.
Why wouldn't he be able to point and click his way through the freedom provided
-by Gentoo (and Linux in general)? Well, *big smile*, of course you are able to
-do this. :-) Linux offers a wide variety of flashy user interfaces and
+by Gentoo (and Linux in general)? Well, of course you are able to
+do this! Linux offers a wide variety of flashy user interfaces and
environments which you can install on top of your existing installation.
</p>
@@ -88,15 +88,26 @@
<chapter>
<title>Installing Xorg</title>
<section>
-<title>Kernel configuration</title>
+<body>
+
+<p>
+Before you can install Xorg, you need to prepare your system for it. First,
+we'll set up the kernel to support input devices and video cards. Then we'll
+prepare <path>/etc/make.conf</path> so that the right drivers and Xorg packages
+are built and installed.
+</p>
+
+</body>
+</section>
+<section>
+<title>Input driver support</title>
<body>
<p>
By default, Xorg uses <c>evdev</c>, a generic input driver. You'll need to
activate support for <c>evdev</c> by making a change to your kernel
-configuration. (Read the
-<uri link="/doc/en/kernel-config.xml">Kernel Configuration Guide</uri> if you
-don't know how to setup your kernel.)
+configuration. Read the <uri link="/doc/en/kernel-config.xml">Kernel
+Configuration Guide</uri> if you don't know how to setup your kernel.
</p>
<pre caption="Enabling evdev in the kernel">
@@ -108,29 +119,149 @@
</body>
</section>
<section>
+<title>Kernel modesetting</title>
+<body>
+
+<p>
+Modern open-source video drivers rely on kernel modesetting (KMS). KMS provides
+an improved graphical boot with less flickering, faster user switching, a
+built-in framebuffer console, seamless switching from the console to Xorg, and
+other features. KMS conflicts with legacy framebuffer drivers, which must remain
+<b>disabled</b> in your kernel configuration.
+</p>
+
+<p>
+First, prepare your kernel for KMS. You need to do this step regardless of which
+Xorg video driver you're using.
+</p>
+
+<pre caption="Configuring framebuffers">
+Device Drivers --->
+ Graphics support --->
+ Support for frame buffer devices --->
+ <comment>(Disable all drivers, including VGA, Intel, nVidia, and ATI)</comment>
+
+ <comment>(Further down, enable basic console support. KMS uses this.)</comment>
+ Console display driver support --->
+ <*> Framebuffer Console Support
+</pre>
+
+<p>
+Next, configure your kernel to use the proper KMS driver for your video card.
+Intel, nVidia, and ATI are the most common cards, so follow code listing for
+your card below.
+</p>
+
+<p>
+For Intel cards:
+</p>
+
+<pre caption="Intel settings">
+Device Drivers --->
+ Graphics support --->
+ /dev/agpgart (AGP Support) --->
+ <*> Intel 440LX/BX/GX, I8xx and E7x05 chipset support
+ Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) --->
+ <*> Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)
+ i915 driver
+ [*] Enable modesetting on intel by default
+</pre>
+
+<p>
+For nVidia cards:
+</p>
+
+<pre caption="nVidia settings">
+<comment>(Enable DRM)</comment>
+Device Drivers --->
+ Graphics support --->
+ <*> Direct Rendering Manager --->
+
+<comment>(Nouveau is currently in the Staging drivers section)</comment>
+Device Drivers --->
+ Staging drivers --->
+ [ ] Exclude Staging drivers from being built
+ <*> Nouveau (nVidia) cards
+</pre>
+
+<p>
+For newer ATI cards (<uri link="/doc/en/ati-faq.xml">RadeonHD 2000 and
+up</uri>), you will need to emerge <c>radeon-ucode</c>. Once you have installed
+<c>radeon-ucode</c>, configure your kernel as shown:
+</p>
+
+<pre caption="ATI settings">
+<comment>(Setup the kernel to use the radeon-ucode firmware)</comment>
+Device Drivers --->
+ Generic Driver Options --->
+ [*] Include in-kernel firmware blobs in kernel binary
+ <comment># RadeonHD 2000, 3000, and 4000 series cards:</comment>
+ (radeon/R600_rlc.bin radeon/R700_rlc.bin) External firmware blobs
+ <comment># RadeonHD 5000, a.k.a Evergreen, and newer cards:</comment>
+ (radeon/CEDAR_me.bin radeon/CEDAR_pfp.bin radeon/CEDAR_rlc.bin
+ radeon/CYPRESS_me.bin radeon/CYPRESS_pfp.bin radeon/CYPRESS_rlc.bin
+ radeon/JUNIPER_me.bin radeon/JUNIPER_pfp.bin radeon/JUNIPER_rlc.bin
+ radeon/REDWOOD_me.bin radeon/REDWOOD_pfp.bin
+ radeon/REDWOOD_rlc.bin) External firmware blobs
+ (/lib/firmware/) Firmware blobs root directory
+
+<comment>(Enable Radeon KMS support)</comment>
+Device Drivers --->
+ Graphics support --->
+ <*> Direct Rendering Manager --->
+ <*> ATI Radeon
+ [*] Enable modesetting on radeon by default
+</pre>
+
+<note>
+Old Radeon cards (X1900 series and older) don't need the <c>radeon-ucode</c>
+package or any firmware configuration. Just enable the Direct Rendering Manager
+and ATI Radeon modesetting.
+</note>
+
+<p>
+Now that you're done setting up KMS, continue with preparing
+<path>/etc/make.conf</path> in the next section.
+</p>
+
+</body>
+</section>
+<section>
<title>make.conf configuration</title>
<body>
<p>
-Before you install Xorg, you have to configure two important variables in the
-<path>/etc/make.conf</path> file.
+Now that your kernel is prepared, you have to configure two important variables
+in the <path>/etc/make.conf</path> file before you can install Xorg.
</p>
<p>
The first variable is <c>VIDEO_CARDS</c>. This is used to set the video drivers
-that you intend to use and is usually based on the kind and brand of card you
-have. The most common settings are <c>nvidia</c> for Nvidia cards or
-<c>fglrx</c> for ATI Radeon cards. Those are the proprietary drivers from Nvidia
-and ATI respectively. If you would like to use the open source nVidia driver,
-use <c>nv</c> rather than <c>nvidia</c> in the variable, but bear in mind that
-using this driver means no 3D acceleration at all. The free <c>radeon</c> and
-<c>radeonhd</c> drivers are available for ATI cards, and are more or less the
-equal of the proprietary <c>fglrx</c> driver. The <c>intel</c> driver may be
-used for desktops or laptops with common Intel integrated graphics chipsets.
-<c>VIDEO_CARDS</c> may contain more than one driver, in this case list of them
-should be separated with spaces.
+that you intend to use and is usually based on the kind of video card you have.
+The most common settings are <c>nouveau</c> for nVidia cards or <c>radeon</c>
+for ATI cards. Both have actively developed, well-supported open-source
+drivers.
</p>
+<note>
+You may also try the proprietary drivers from nVidia and ATI, <c>nvidia</c> and
+<c>fglrx</c> respectively. However, setting up the proprietary drivers is
+beyond the scope of this guide. Please read the <uri
+link="/doc/en/nvidia-guide.xml">Gentoo Linux nVidia Guide</uri> and <uri
+link="/doc/en/ati-faq.xml">Gentoo Linux ATI FAQ</uri>. If you don't know which
+drivers you should choose, refer to these guides for more information.
+</note>
+
+<p>
+The <c>intel</c> driver may be used for desktops or laptops with common Intel
+integrated graphics chipsets.
+</p>
+
+<note>
+<c>VIDEO_CARDS</c> may contain more than one driver, each separated with a
+space.
+</note>
+
<p>
The second variable is <c>INPUT_DEVICES</c> and is used to determine which
drivers are to be built for input devices. In most cases setting it to
@@ -147,43 +278,34 @@
<pre caption="Sample make.conf entries">
<comment>(For mouse, keyboard, and Synaptics touchpad support)</comment>
INPUT_DEVICES="evdev synaptics"
-<comment>(For Nvidia cards)</comment>
-VIDEO_CARDS="nvidia"
+<comment>(For nVidia cards)</comment>
+VIDEO_CARDS="nouveau"
<comment>(OR, for ATI Radeon cards)</comment>
VIDEO_CARDS="radeon"
</pre>
-<note>
-More instructions on how to configure nVidia and ATI cards can be found in the
-<uri link="/doc/en/nvidia-guide.xml">Gentoo Linux nVidia Guide</uri> and in the
-<uri link="/doc/en/ati-faq.xml">Gentoo Linux ATI FAQ</uri>. If you don't know
-which drivers you should choose, refer to these guides for more information.
-</note>
-
<p>
If the suggested settings don't work for you, you should run <c>emerge -pv
-xorg-server</c>, check all the options available and choose those which apply to
+xorg-drivers</c>, check all the options available and choose those which apply to
your system. This example is for a system with a keyboard, mouse, Synaptics
touchpad, and a Radeon video card.
</p>
<pre caption="Displaying all the driver options available">
-# <i>emerge -pv xorg-server</i>
+# <i>emerge -pv xorg-drivers</i>
These are the packages that would be merged, in order:
Calculating dependencies... done!
-[ebuild R ] x11-base/xorg-server-1.6.3.901-r2 USE="hal nptl xorg -debug
--dmx -ipv6 -kdrive -minimal -sdl -tslib" 0 kB
-[ebuild R ] x11-base/xorg-drivers-1.6 INPUT_DEVICES="evdev synaptics
--acecad -aiptek -citron -elographics -fpit -hyperpen -joystick -keyboard -mouse
--mutouch -penmount -tslib -virtualbox -vmmouse -void -wacom"
+[ebuild R ] x11-base/xorg-drivers-1.8 INPUT_DEVICES="evdev synaptics
+-acecad -aiptek -elographics% -fpit% -joystick -keyboard -mouse -penmount -tslib
+-virtualbox -vmmouse -void -wacom"
VIDEO_CARDS="radeon -apm -ark -ast -chips -cirrus -dummy -epson -fbdev -fglrx
-(-geode) -glint -i128 (-i740) (-impact) (-imstt) -intel -mach64 -mga -neomagic
-(-newport) -nv -nvidia -r128 -radeonhd -rendition -s3 -s3virge -savage
+(-geode) -glint -i128 (-i740) (-impact) -intel -mach64 -mga -neomagic (-newport)
+-nouveau -nv -nvidia -r128 -radeonhd -rendition -s3 -s3virge -savage
-siliconmotion -sis -sisusb (-sunbw2) (-suncg14) (-suncg3) (-suncg6) (-sunffb)
-(-sunleo) (-suntcx) -tdfx -tga -trident -tseng -v4l (-vermilion) -vesa -via
--virtualbox -vmware (-voodoo) (-xgi)" 0 kB
+(-sunleo) (-suntcx) -tdfx -tga -trident -tseng -v4l -vesa -via -virtualbox
+-vmware (-voodoo) (-xgi)" 0 kB
</pre>
<p>
@@ -237,8 +359,8 @@
<body>
<p>
-Recent X server versions are designed to work out-of-the-box, with no need to
-manually edit Xorg's configuration files.
+The X server is designed to work out-of-the-box, with no need to manually edit
+Xorg's configuration files.
</p>
<p>
@@ -432,7 +554,7 @@
<p>
Now try <c>startx</c> to start up your X server. <c>startx</c> is a script
-that executes an <e>X session</e>, that is, it starts the X servers and some
+that executes an <e>X session</e>, that is, it starts the X server and some
graphical applications on top of it. It decides which applications to run
using the following logic:
</p>
@@ -446,10 +568,11 @@
Otherwise, it will read the value of the XSESSION variable and will execute
one of the sessions available in <path>/etc/X11/Sessions/</path>
accordingly. You can set the value of XSESSION in
- <path>/etc/env.d/90xsession</path> to make it a default for all the users on
- the system. For example, as root, run <c>echo XSESSION="Xfce4" >
+ <path>/etc/env.d/90xsession</path> to make it a default for all the users
+ on the system. For example, as root, run <c>echo XSESSION="Xfce4" >
/etc/env.d/90xsession</c>. This will create the <path>90xsession</path> file
- and set the default X session to Xfce4.
+ and set the default X session to <uri
+ link="/doc/en/xfce-config.xml">Xfce</uri>.
</li>
</ul>
@@ -458,7 +581,7 @@
</pre>
<p>
-You can kill the X session by using the Ctrl-Alt-Backspace combination. This
+You can kill the X session by using the Ctrl-Alt-Backspace key combination. This
will, however, make X exit disgracefully -- something that you might not always
want.
</p>
@@ -512,24 +635,25 @@
</warn>
<p>
-Now let us change the resolutions. In the next example from
-<path>/etc/X11/xorg.conf</path> we add the <c>Modes</c> lines and the
-<c>DefaultDepth</c> so that our X server starts with 24 bits at 1440x900 by
-default. Don't mind the given strings -- they are examples and will most likely
-differ from the settings on your system.
-</p>
-
-<pre caption="Changing the Screen section in /etc/X11/xorg.conf">
-Section "Screen"
- Identifier "Default Screen"
- Device "RadeonHD 4550"
- Monitor "Generic Monitor"
- <i>DefaultDepth 24</i>
- <comment># Skipping some text to improve readability</comment>
- SubSection "Display"
- Depth 24
- <i>Modes "1440x900"</i>
- EndSubSection
+Now let us change the resolution. In the next example from
+<path>/etc/X11/xorg.conf</path> we add the <c>PreferredMode</c> line so that our
+X server starts at 1440x900 by default. Don't mind the given strings -- they are
+examples and will most likely differ from the settings on your system. However,
+the <c>Option</c> in the <c>Device</c> section must match the name of your
+monitor (<c>DVI-0</c>), which can be obtained by running <c>xrandr</c>. You'll
+need to <c>emerge xrandr</c> just long enough to get this information. The
+argument after the monitor name (in the <c>Device</c> section) must match the
+<c>Identifier</c> in the <c>Monitor</c> section.
+</p>
+
+<pre caption="Changing the Monitor section in /etc/X11/xorg.conf">
+Section "Device"
+ Identifier "RadeonHD 4550"
+ Option "Monitor-DVI-0" "DVI screen"
+EndSection
+Section "Monitor"
+ Identifier "DVI screen"
+ Option "PreferredMode" "1440x900"
EndSection
</pre>
@@ -573,8 +697,8 @@
<p>
Run <c>startx</c> and be happy about the result. Congratulations, you now
(hopefully) have a working Xorg on your system. The next step is to install a
-useful window manager (or even a desktop environment) such as KDE or GNOME, but
-that's not part of this guide.
+useful window manager or desktop environment such as KDE, GNOME, or
+Xfce, but that's not part of this guide.
</p>
</body>
@@ -625,9 +749,9 @@
</p>
<p>
-If you're upgrading to xorg-server-1.6 from an earlier version, then be sure to
-read the <uri
-link="/proj/en/desktop/x/x11/xorg-server-1.6-upgrade-guide.xml">migration
+If you're upgrading to <c>xorg-server</c> 1.8 from an earlier version, then be
+sure to read the <uri
+link="/proj/en/desktop/x/x11/xorg-server-1.8-upgrade-guide.xml">migration
guide</uri>.
</p>
^ permalink raw reply [flat|nested] 24+ messages in thread* [gentoo-commits] gentoo commit in xml/htdocs/doc/en: xorg-config.xml
@ 2010-05-23 21:31 Joshua Saddler (nightmorph)
0 siblings, 0 replies; 24+ messages in thread
From: Joshua Saddler (nightmorph) @ 2010-05-23 21:31 UTC (permalink / raw
To: gentoo-commits
nightmorph 10/05/23 21:31:50
Modified: xorg-config.xml
Log:
fix commandline order, bug 321223
Revision Changes Path
1.39 xml/htdocs/doc/en/xorg-config.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.39&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.39&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?r1=1.38&r2=1.39
Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- xorg-config.xml 23 May 2010 21:29:35 -0000 1.38
+++ xorg-config.xml 23 May 2010 21:31:50 -0000 1.39
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.38 2010/05/23 21:29:35 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.39 2010/05/23 21:31:50 nightmorph Exp $ -->
<guide>
<title>The X Server Configuration HOWTO</title>
@@ -22,7 +22,7 @@
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
<license/>
-<version>1.28</version>
+<version>1.29</version>
<date>2010-05-23</date>
<chapter>
@@ -398,7 +398,7 @@
</p>
<pre caption="Testing the xorg.conf.new file">
-# <i>X -config -retro /root/xorg.conf.new</i>
+# <i>X -retro -config /root/xorg.conf.new</i>
</pre>
<p>
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo commit in xml/htdocs/doc/en: xorg-config.xml
@ 2010-05-23 21:29 Joshua Saddler (nightmorph)
0 siblings, 0 replies; 24+ messages in thread
From: Joshua Saddler (nightmorph) @ 2010-05-23 21:29 UTC (permalink / raw
To: gentoo-commits
nightmorph 10/05/23 21:29:35
Modified: xorg-config.xml
Log:
Fix estonian layout bzcat command, bug 321093
Revision Changes Path
1.38 xml/htdocs/doc/en/xorg-config.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.38&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.38&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xorg-config.xml?r1=1.37&r2=1.38
Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- xorg-config.xml 16 Mar 2010 20:07:43 -0000 1.37
+++ xorg-config.xml 23 May 2010 21:29:35 -0000 1.38
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.37 2010/03/16 20:07:43 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.38 2010/05/23 21:29:35 nightmorph Exp $ -->
<guide>
<title>The X Server Configuration HOWTO</title>
@@ -22,8 +22,8 @@
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
<license/>
-<version>1.27</version>
-<date>2010-03-16</date>
+<version>1.28</version>
+<date>2010-05-23</date>
<chapter>
<title>What is the X Window Server?</title>
@@ -550,7 +550,7 @@
</p>
<pre caption="Using an existing config file">
-# <i>bzcat /usr/share/doc/hal-*/*/use-estonian-layout.fdi > /etc/hal/fdi/policy/10-xinput-configuration.fdi</i>
+# <i>bzcat /usr/share/doc/hal-*/*/use-estonian-layout.fdi.bz2 > /etc/hal/fdi/policy/10-xinput-configuration.fdi</i>
</pre>
<p>
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo commit in xml/htdocs/doc/en: xorg-config.xml
@ 2010-03-16 20:07 Joshua Saddler (nightmorph)
0 siblings, 0 replies; 24+ messages in thread
From: Joshua Saddler (nightmorph) @ 2010-03-16 20:07 UTC (permalink / raw
To: gentoo-commits
nightmorph 10/03/16 20:07:44
Modified: xorg-config.xml
Log:
added the -retro option per bug 267769. also added a bit on installing twm and xterm only for testing purposes, since otherwise startx will just display a black screen. having a few open xterm windows makes it easier to verify that X is setup correctly.
Revision Changes Path
1.37 xml/htdocs/doc/en/xorg-config.xml
file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?r1=1.36&r2=1.37
Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- xorg-config.xml 2 Jan 2010 03:02:40 -0000 1.36
+++ xorg-config.xml 16 Mar 2010 20:07:43 -0000 1.37
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.36 2010/01/02 03:02:40 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.37 2010/03/16 20:07:43 nightmorph Exp $ -->
<guide>
<title>The X Server Configuration HOWTO</title>
@@ -22,8 +22,8 @@
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
<license/>
-<version>1.26</version>
-<date>2010-01-01</date>
+<version>1.27</version>
+<date>2010-03-16</date>
<chapter>
<title>What is the X Window Server?</title>
@@ -398,7 +398,7 @@
</p>
<pre caption="Testing the xorg.conf.new file">
-# <i>X -config /root/xorg.conf.new</i>
+# <i>X -config -retro /root/xorg.conf.new</i>
</pre>
<p>
@@ -454,12 +454,27 @@
</ul>
<pre caption="Starting X">
-# <i>startx</i>
+$ <i>startx</i>
</pre>
<p>
-You can kill the X session using the Ctrl-Alt-Backspace combination. This will
-however make X exit disgracefully -- something that you might not always want.
+You can kill the X session by using the Ctrl-Alt-Backspace combination. This
+will, however, make X exit disgracefully -- something that you might not always
+want.
+</p>
+
+<p>
+If you haven't yet installed a window manager, all you'll see is a black screen.
+Since this can also be a sign that something's wrong, you may want to emerge
+<c>twm</c> and <c>xterm</c> <e>only to test X</e>.
+</p>
+
+<p>
+Once those two programs are installed, run <c>startx</c> again. A few xterm
+windows should appear, making it easier to verify that X is working correctly.
+Once you're satisfied with the results, run <c>emerge --unmerge twm xterm</c> as
+root to get rid of the testing packages. You won't need them once you've setup a
+proper desktop environment.
</p>
</body>
@@ -519,7 +534,7 @@
</pre>
<p>
-Run X (<c>startx</c>) to discover it uses the resolution you want. :)
+Run X (<c>startx</c>) to discover it uses the resolution you want.
</p>
</body>
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo commit in xml/htdocs/doc/en: xorg-config.xml
@ 2010-01-02 3:02 Joshua Saddler (nightmorph)
0 siblings, 0 replies; 24+ messages in thread
From: Joshua Saddler (nightmorph) @ 2010-01-02 3:02 UTC (permalink / raw
To: gentoo-commits
nightmorph 10/01/02 03:02:41
Modified: xorg-config.xml
Log:
Latest stable xinit (1.2 and up) no longer install TWM, xterm, or xclock, so don't mention assume they're present
Revision Changes Path
1.36 xml/htdocs/doc/en/xorg-config.xml
file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?r1=1.35&r2=1.36
Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- xorg-config.xml 31 Dec 2009 01:37:01 -0000 1.35
+++ xorg-config.xml 2 Jan 2010 03:02:40 -0000 1.36
@@ -1,12 +1,12 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.35 2009/12/31 01:37:01 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.36 2010/01/02 03:02:40 nightmorph Exp $ -->
<guide>
<title>The X Server Configuration HOWTO</title>
<author title="Author">
- <mail link="swift@gentoo.org">Sven Vermeulen</mail>
+ <mail link="swift"/>
</author>
<author title="Author">
<mail link="nightmorph"/>
@@ -22,8 +22,8 @@
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
<license/>
-<version>1.25</version>
-<date>2009-12-30</date>
+<version>1.26</version>
+<date>2010-01-01</date>
<chapter>
<title>What is the X Window Server?</title>
@@ -451,10 +451,6 @@
/etc/env.d/90xsession</c>. This will create the <path>90xsession</path> file
and set the default X session to Xfce4.
</li>
- <li>
- If all of the above fail, it will fall back to a simple window manager,
- usually <c>twm</c>.
- </li>
</ul>
<pre caption="Starting X">
^ permalink raw reply [flat|nested] 24+ messages in thread* [gentoo-commits] gentoo commit in xml/htdocs/doc/en: xorg-config.xml
@ 2009-12-31 1:37 Joshua Saddler (nightmorph)
0 siblings, 0 replies; 24+ messages in thread
From: Joshua Saddler (nightmorph) @ 2009-12-31 1:37 UTC (permalink / raw
To: gentoo-commits
nightmorph 09/12/31 01:37:02
Modified: xorg-config.xml
Log:
Add information about (re)starting hald, per an email from Janne Mäntylä
Revision Changes Path
1.35 xml/htdocs/doc/en/xorg-config.xml
file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?r1=1.34&r2=1.35
Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- xorg-config.xml 17 Dec 2009 04:41:24 -0000 1.34
+++ xorg-config.xml 31 Dec 2009 01:37:01 -0000 1.35
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.34 2009/12/17 04:41:24 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.35 2009/12/31 01:37:01 nightmorph Exp $ -->
<guide>
<title>The X Server Configuration HOWTO</title>
@@ -22,8 +22,8 @@
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
<license/>
-<version>1.24</version>
-<date>2009-12-16</date>
+<version>1.25</version>
+<date>2009-12-30</date>
<chapter>
<title>What is the X Window Server?</title>
@@ -213,19 +213,32 @@
# <i>source /etc/profile</i>
</pre>
+<p>
+Now it's time to start the Hardware Abstraction Layer (HAL) daemon and set it to
+automatically start each time you boot. This is necessary to get a working X
+environment, otherwise your input devices won't be detected and you'll probably
+just get a blank screen. We'll cover HAL more in the <uri
+link="#using_hal">next section</uri>.
+</p>
+
+<pre caption="Starting HAL">
+# <i>/etc/init.d/hald start</i>
+# <i>rc-update add hald default</i>
+</pre>
+
</body>
</section>
</chapter>
<chapter>
<title>Configuring Xorg</title>
-<section>
+<section id="using_hal">
<title>Using HAL</title>
<body>
<p>
Recent X server versions are designed to work out-of-the-box, with no need to
-manually configure Xorg's configuration files.
+manually edit Xorg's configuration files.
</p>
<p>
@@ -274,6 +287,11 @@
<path>/etc/hal/fdi/policy/</path>.
</p>
+<impo>
+Remember, <e>every</e> time you finish making changes to HAL policy files, you
+need to restart the HAL daemon by running <c>/etc/init.d/hald restart</c>.
+</impo>
+
<p>
You can edit the policy files in <path>/etc/hal/fdi/policy</path> to your
liking. You may want to make a few tweaks or to expose additional
@@ -310,6 +328,11 @@
</pre>
<p>
+Once you're done, run <c>/etc/init.d/hald restart</c> so that HAL picks up your
+changes.
+</p>
+
+<p>
There, now you have a handy way of killing an unresponsive X server. This is
useful when programs have frozen your display entirely, or when configuring and
tweaking your Xorg environment. Be careful when killing your desktop with this
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo commit in xml/htdocs/doc/en: xorg-config.xml
@ 2009-12-17 4:41 Joshua Saddler (nightmorph)
0 siblings, 0 replies; 24+ messages in thread
From: Joshua Saddler (nightmorph) @ 2009-12-17 4:41 UTC (permalink / raw
To: gentoo-commits
nightmorph 09/12/17 04:41:24
Modified: xorg-config.xml
Log:
more fixes from bug 297245
Revision Changes Path
1.34 xml/htdocs/doc/en/xorg-config.xml
file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.34&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.34&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?r1=1.33&r2=1.34
Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xorg-config.xml 17 Dec 2009 04:37:10 -0000 1.33
+++ xorg-config.xml 17 Dec 2009 04:41:24 -0000 1.34
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.33 2009/12/17 04:37:10 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.34 2009/12/17 04:41:24 nightmorph Exp $ -->
<guide>
<title>The X Server Configuration HOWTO</title>
@@ -22,8 +22,8 @@
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
<license/>
-<version>1.23</version>
-<date>2009-12-08</date>
+<version>1.24</version>
+<date>2009-12-16</date>
<chapter>
<title>What is the X Window Server?</title>
@@ -439,11 +439,8 @@
</pre>
<p>
-If you see an ugly, loathsome, repulsive, deformed window manager, that's
-<c>twm</c>. To finish the twm session, type in <c>exit</c> or Ctrl-D in the
-upcoming xterms. You can also kill the X session using the Ctrl-Alt-Backspace
-combination. This will however make X exit disgracefully -- something that you
-might not always want.
+You can kill the X session using the Ctrl-Alt-Backspace combination. This will
+however make X exit disgracefully -- something that you might not always want.
</p>
</body>
@@ -541,9 +538,9 @@
<p>
Run <c>startx</c> and be happy about the result. Congratulations, you now
-(hopefully) have a working Xorg on your system. The next step is to remove this
-ugly lightweight window manager (twm) and use a high-feature one (or even a
-desktop environment) such as KDE or GNOME, but that's not part of this guide.
+(hopefully) have a working Xorg on your system. The next step is to install a
+useful window manager (or even a desktop environment) such as KDE or GNOME, but
+that's not part of this guide.
</p>
</body>
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo commit in xml/htdocs/doc/en: xorg-config.xml
@ 2009-12-17 4:37 Joshua Saddler (nightmorph)
0 siblings, 0 replies; 24+ messages in thread
From: Joshua Saddler (nightmorph) @ 2009-12-17 4:37 UTC (permalink / raw
To: gentoo-commits
nightmorph 09/12/17 04:37:10
Modified: xorg-config.xml
Log:
typo fix, bug 297245
Revision Changes Path
1.33 xml/htdocs/doc/en/xorg-config.xml
file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?r1=1.32&r2=1.33
Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xorg-config.xml 9 Dec 2009 01:35:03 -0000 1.32
+++ xorg-config.xml 17 Dec 2009 04:37:10 -0000 1.33
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.32 2009/12/09 01:35:03 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.33 2009/12/17 04:37:10 nightmorph Exp $ -->
<guide>
<title>The X Server Configuration HOWTO</title>
@@ -301,7 +301,7 @@
<comment>(Add the "terminate" merge string as shown)</comment>
<match key="info.capabilities" contains="input.keys">
<merge key="input.x11_driver" type="string">keyboard</merge>
- <i><merge key="input.xkb.options" type="string">terminate:ctrl_alt_bksp</merge>></i>
+ <i><merge key="input.xkb.options" type="string">terminate:ctrl_alt_bksp</merge></i>
<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
string="Linux">
<merge key="input.x11_driver" type="string">evdev<merge>
^ permalink raw reply [flat|nested] 24+ messages in thread* [gentoo-commits] gentoo commit in xml/htdocs/doc/en: xorg-config.xml
@ 2009-12-09 1:35 Joshua Saddler (nightmorph)
0 siblings, 0 replies; 24+ messages in thread
From: Joshua Saddler (nightmorph) @ 2009-12-09 1:35 UTC (permalink / raw
To: gentoo-commits
nightmorph 09/12/09 01:35:03
Modified: xorg-config.xml
Log:
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.
Revision Changes Path
1.32 xml/htdocs/doc/en/xorg-config.xml
file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?r1=1.31&r2=1.32
Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- xorg-config.xml 2 Oct 2009 07:37:57 -0000 1.31
+++ xorg-config.xml 9 Dec 2009 01:35:03 -0000 1.32
@@ -1,8 +1,8 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.31 2009/10/02 07:37:57 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.32 2009/12/09 01:35:03 nightmorph Exp $ -->
-<guide link="/doc/en/xorg-config.xml">
+<guide>
<title>The X Server Configuration HOWTO</title>
<author title="Author">
@@ -22,8 +22,8 @@
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
<license/>
-<version>1.22</version>
-<date>2009-10-02</date>
+<version>1.23</version>
+<date>2009-12-08</date>
<chapter>
<title>What is the X Window Server?</title>
@@ -88,31 +88,53 @@
<chapter>
<title>Installing Xorg</title>
<section>
+<title>Kernel configuration</title>
<body>
<p>
-Before installing Xorg you have to configure two important variables in the
+By default, Xorg uses <c>evdev</c>, a generic input driver. You'll need to
+activate support for <c>evdev</c> by making a change to your kernel
+configuration. (Read the
+<uri link="/doc/en/kernel-config.xml">Kernel Configuration Guide</uri> if you
+don't know how to setup your kernel.)
+</p>
+
+<pre caption="Enabling evdev in the kernel">
+Device Drivers --->
+ Input device support --->
+ <*> Event interface
+</pre>
+
+</body>
+</section>
+<section>
+<title>make.conf configuration</title>
+<body>
+
+<p>
+Before you install Xorg, you have to configure two important variables in the
<path>/etc/make.conf</path> file.
</p>
<p>
-The first one is <c>VIDEO_CARDS</c>. This is used to set the video drivers that
-you intend to use and is usually based on the kind and brand of card you have.
-The most common settings are <c>nvidia</c> for Nvidia cards or <c>fglrx</c> for
-ATI Radeon cards. Those are the proprietary drivers from Nvidia and ATI
-respectively. If you would like to use the open source versions, use <c>nv</c>
-rather than <c>nvidia</c> in the variable, but bear in mind that using this
-driver means no 3D acceleration at all. The free <c>radeon</c> and
-<c>radeonhd</c> drivers for ATI cards support 3D acceleration on older Radeons
-but don't yet support all the features of the newer ones. <c>VIDEO_CARDS</c> may
-contain more than one driver, in this case list of them should be separated with
-spaces.
+The first variable is <c>VIDEO_CARDS</c>. This is used to set the video drivers
+that you intend to use and is usually based on the kind and brand of card you
+have. The most common settings are <c>nvidia</c> for Nvidia cards or
+<c>fglrx</c> for ATI Radeon cards. Those are the proprietary drivers from Nvidia
+and ATI respectively. If you would like to use the open source nVidia driver,
+use <c>nv</c> rather than <c>nvidia</c> in the variable, but bear in mind that
+using this driver means no 3D acceleration at all. The free <c>radeon</c> and
+<c>radeonhd</c> drivers are available for ATI cards, and are more or less the
+equal of the proprietary <c>fglrx</c> driver. The <c>intel</c> driver may be
+used for desktops or laptops with common Intel integrated graphics chipsets.
+<c>VIDEO_CARDS</c> may contain more than one driver, in this case list of them
+should be separated with spaces.
</p>
<p>
The second variable is <c>INPUT_DEVICES</c> and is used to determine which
drivers are to be built for input devices. In most cases setting it to
-<c>keyboard mouse</c> should work just fine. If you use alternative input
+<c>evdev</c> should work just fine. If you use alternative input
devices, such as a Synaptics touchpad for a laptop, be sure to add it to
<c>INPUT_DEVICES</c>.
</p>
@@ -123,27 +145,27 @@
</p>
<pre caption="Sample make.conf entries">
-<comment>(For mouse and keyboard support)</comment>
-INPUT_DEVICES="keyboard mouse"
+<comment>(For mouse, keyboard, and Synaptics touchpad support)</comment>
+INPUT_DEVICES="evdev synaptics"
<comment>(For Nvidia cards)</comment>
VIDEO_CARDS="nvidia"
<comment>(OR, for ATI Radeon cards)</comment>
-VIDEO_CARDS="fglrx"
+VIDEO_CARDS="radeon"
</pre>
-<p>
-More instructions on how to configure nVidia and ATI cards can be found in
-<uri link="/doc/en/nvidia-guide.xml">Gentoo Linux nVidia Guide</uri> and in
+<note>
+More instructions on how to configure nVidia and ATI cards can be found in the
+<uri link="/doc/en/nvidia-guide.xml">Gentoo Linux nVidia Guide</uri> and in the
<uri link="/doc/en/ati-faq.xml">Gentoo Linux ATI FAQ</uri>. If you don't know
which drivers you should choose, refer to these guides for more information.
-</p>
+</note>
-<note>
+<p>
If the suggested settings don't work for you, you should run <c>emerge -pv
xorg-server</c>, check all the options available and choose those which apply to
-your system. The example is for the amd64 architecture and
-<c>xorg-server-1.2</c>.
-</note>
+your system. This example is for a system with a keyboard, mouse, Synaptics
+touchpad, and a Radeon video card.
+</p>
<pre caption="Displaying all the driver options available">
# <i>emerge -pv xorg-server</i>
@@ -151,16 +173,17 @@
These are the packages that would be merged, in order:
Calculating dependencies... done!
-[ebuild R ] x11-base/xorg-server-1.2.0-r3 USE="dri nptl xorg (-3dfx) -debug
--dmx -ipv6 -kdrive -minimal -sdl -xprint" INPUT_DEVICES="keyboard mouse -acecad
--aiptek -calcomp -citron -digitaledge -dmc -dynapro -elo2300 -elographics -evdev
--fpit -hyperpen -jamstudio -joystick -magellan -microtouch -mutouch -palmax
--penmount -spaceorb -summa -synaptics -tek4957 -ur98 -vmmouse -void -wacom"
-VIDEO_CARDS="nvidia -apm -ark -chips -cirrus -cyrix -dummy -epson -fbdev -fglrx
--glint -i128 (-i740) -i810 (-impact) (-imstt) -mach64 -mga -neomagic (-newport)
-(-nsc) -nv -r128 -radeon -rendition -s3 -s3virge -savage -siliconmotion -sis
--sisusb (-sunbw2) (-suncg14) (-suncg3) (-suncg6) (-sunffb) (-sunleo) (-suntcx)
--tdfx -tga -trident -tseng -v4l -vesa -vga -via -vmware -voodoo" 0 kB
+[ebuild R ] x11-base/xorg-server-1.6.3.901-r2 USE="hal nptl xorg -debug
+-dmx -ipv6 -kdrive -minimal -sdl -tslib" 0 kB
+[ebuild R ] x11-base/xorg-drivers-1.6 INPUT_DEVICES="evdev synaptics
+-acecad -aiptek -citron -elographics -fpit -hyperpen -joystick -keyboard -mouse
+-mutouch -penmount -tslib -virtualbox -vmmouse -void -wacom"
+VIDEO_CARDS="radeon -apm -ark -ast -chips -cirrus -dummy -epson -fbdev -fglrx
+(-geode) -glint -i128 (-i740) (-impact) (-imstt) -intel -mach64 -mga -neomagic
+(-newport) -nv -nvidia -r128 -radeonhd -rendition -s3 -s3virge -savage
+-siliconmotion -sis -sisusb (-sunbw2) (-suncg14) (-suncg3) (-suncg6) (-sunffb)
+(-sunleo) (-suntcx) -tdfx -tga -trident -tseng -v4l (-vermilion) -vesa -via
+-virtualbox -vmware (-voodoo) (-xgi)" 0 kB
</pre>
<p>
@@ -173,14 +196,14 @@
<note>
You could install the <c>xorg-x11</c> metapackage instead of the more
-lightweight xorg-server. Functionally, <c>xorg-x11</c> and <c>xorg-server</c>
-are the same. However, <c>xorg-x11</c> brings in many more packages that
-you probably don't need, such as a huge assortment of fonts in many different
-languages. They're not necessary for a working desktop.
+lightweight <c>xorg-server</c>. Functionally, <c>xorg-x11</c> and
+<c>xorg-server</c> are the same. However, <c>xorg-x11</c> brings in many more
+packages that you probably don't need, such as a huge assortment of fonts in
+many different languages. They're not necessary for a working desktop.
</note>
<p>
-When the installation is finished, you might need to re-initialise some
+When the installation is finished, you will need to re-initialise some
environment variables before you continue. Just run <c>env-update</c> followed
by <c>source /etc/profile</c> and you're all set.
</p>
@@ -193,12 +216,126 @@
</body>
</section>
</chapter>
+
<chapter>
<title>Configuring Xorg</title>
<section>
-<title>The xorg.conf File</title>
+<title>Using HAL</title>
+<body>
+
+<p>
+Recent X server versions are designed to work out-of-the-box, with no need to
+manually configure Xorg's configuration files.
+</p>
+
+<p>
+You should first try <uri link="#using_startx">starting X</uri> without creating
+<path>/etc/X11/xorg.conf</path>.
+</p>
+
+<p>
+If Xorg won't start (if there's something wrong with the screen, or with your
+keyboard/mouse), then you can try fixing problems by using the right
+configuration files.
+</p>
+
+<p>
+By default, Xorg uses HAL (Hardware Abstraction Layer) to detect and configure
+devices such as keyboards and mice.
+</p>
+
+<p>
+HAL comes with many premade device rules, also called policies. These policy
+files are available in <path>/usr/share/hal/fdi/policy/</path>. Just find a few
+that suit your needs most closely and copy them to
+<path>/etc/hal/fdi/policy/</path>.
+</p>
+
+<impo>
+Do not edit the files in <path>/usr/share/hal/fdi/</path>! Just copy the ones
+you need, and edit them once they're placed in the proper <path>/etc</path>
+location.
+</impo>
+
+<p>
+For example, to get a basic working keyboard/mouse combination, you could copy
+the following files to <path>/etc/hal/fdi/policy/</path>:
+</p>
+
+<pre caption="Using HAL policy files">
+# <i>cp /usr/share/hal/fdi/policy/10osvendor/10-input-policy.fdi /etc/hal/fdi/policy</i>
+# <i>cp /usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi /etc/hal/fdi/policy</i>
+</pre>
+
+<p>
+There are several other HAL policies in <path>/usr/share/hal/fdi/</path> that
+may interest you, such as laptop configurations, storage device handling, power
+management, and more. Just copy any of the policies to
+<path>/etc/hal/fdi/policy/</path>.
+</p>
+
+<p>
+You can edit the policy files in <path>/etc/hal/fdi/policy</path> to your
+liking. You may want to make a few tweaks or to expose additional
+functionality. Let's go through an example of tweaking a HAL policy.
+</p>
+
+<p>
+One very convenient trick is to kill the X server entirely by pressing
+Ctrl-Alt-Backspace. This is useful when your X server is malfunctioning, frozen,
+etc. It's not as extreme as rebooting the whole machine with Ctrl-Alt-Del.
+</p>
+
+<p>
+Recent X server versions disabled this key combination by default. However, you
+can reenable it by copying <path>10-x11-input.fdi</path> to
+<path>/etc/hal/fdi/policy</path> and editing it. You'll need to add just one
+line to the appropriate section, as shown below:
+</p>
+
+<pre caption="Editing 10-x11-input.fdi">
+<comment>(Open the file in your preferred editor)</comment>
+# <i>nano -w /etc/hal/fdi/policy/10-x11-input.fdi</i>
+<comment>(Find the "input.keys" section)</comment>
+<match key="info.capabilities" contains="input.keys">
+<comment>(Add the "terminate" merge string as shown)</comment>
+<match key="info.capabilities" contains="input.keys">
+ <merge key="input.x11_driver" type="string">keyboard</merge>
+ <i><merge key="input.xkb.options" type="string">terminate:ctrl_alt_bksp</merge>></i>
+ <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
+ string="Linux">
+ <merge key="input.x11_driver" type="string">evdev<merge>
+ </match>
+ </match>
+</pre>
+
+<p>
+There, now you have a handy way of killing an unresponsive X server. This is
+useful when programs have frozen your display entirely, or when configuring and
+tweaking your Xorg environment. Be careful when killing your desktop with this
+key combination -- most programs really don't like it when you end them this
+way, and you may lose some (or all) of what you were working on.
+</p>
+
+<p>
+Hopefully just working with the HAL policy files results in a working X desktop.
+If Xorg still won't start, or there's some other problem, then you'll need to
+manually configure <path>xorg.conf</path> as shown in the next section.
+</p>
+
+</body>
+</section>
+<section>
+<title>The xorg.conf file</title>
<body>
+<note>
+Configuring <path>xorg.conf</path> should be seen as a "last resort" option. It
+really desirable to run without one if possible, and to do all your
+configuration via HAL policy files. If you still can't get a working
+configuration, then read on.
+</note>
+
<p>
The configuration file of Xorg is called <path>xorg.conf</path> and it resides
in <path>/etc/X11</path>. Xorg provides an example configuration as
@@ -208,18 +345,13 @@
</p>
<pre caption="Reading the xorg.conf man page">
-# <i>man 5 xorg.conf</i>
+$ <i>man 5 xorg.conf</i>
</pre>
-<p>
-Happy reading for those of you willing to. We surely don't so we'll continue
-with checking out how we can create the file automatically.
-</p>
-
</body>
</section>
<section>
-<title>Default: Automatic Generation of xorg.conf</title>
+<title>Automatic Generation of xorg.conf</title>
<body>
<p>
@@ -248,41 +380,11 @@
<p>
If all goes well, you should see a simple black and white pattern. Verify if
-your mouse works correctly and if the resolution is good. If you received errors
-about "/dev/mouse", try changing your mouse device to <c>/dev/input/mice</c> in
-the "InputDevice" section of <path>xorg.conf</path>. You might not be able to
-deduce the exact resolution, but you should be able to see if it's too low. You
-can exit any time by pressing Ctrl-Alt-Backspace.
-</p>
-
-</body>
-</section>
-<section>
-<title>Alternative: Semi-Automatic Generation of xorg.conf</title>
-<body>
-
-<p>
-Xorg provides a tool called <c>xorgconfig</c> which will ask you for various
-information regarding your system (graphical adapter, keyboard, ...). Based on
-your input it will create a <path>xorg.conf</path> file.
-</p>
-
-<pre caption="Semi-Automatic Generation of xorg.conf">
-# <i>xorgconfig</i>
-</pre>
-
-<p>
-Another tool, also provided by Xorg, is <c>xorgcfg</c>, which will first
-attempt to run <c>Xorg -configure</c> and then start the X server for more
-final tweaking.
+your mouse works correctly and if the resolution is good. You might not be able
+to deduce the exact resolution, but you should be able to see if it's too low.
+You can exit any time by pressing Ctrl-Alt-Backspace.
</p>
-<pre caption="Using xorgcfg">
-# <i>xorgcfg</i>
-<comment>(In case X crashes or the configuration fails, try:)</comment>
-# <i>xorgcfg -textmode</i>
-</pre>
-
</body>
</section>
<section>
@@ -292,7 +394,7 @@
<p>
Let us copy over the <path>xorg.conf.new</path> to
<path>/etc/X11/xorg.conf</path> now, so we won't have to continuously run
-<c>X -config</c> -- typing just <c>X</c> or <c>startx</c> is easier. :)
+<c>X -config</c> -- typing just <c>startx</c> is easier. :)
</p>
<pre caption="Copying over xorg.conf">
@@ -306,9 +408,9 @@
<body>
<p>
-Now try <c>startx</c> to start up your X server. <c>startx</c> is a script
+Now try <c>startx</c> to start up your X server. <c>startx</c> is a script
that executes an <e>X session</e>, that is, it starts the X servers and some
-graphical applications on top of it. It decides which applications to run
+graphical applications on top of it. It decides which applications to run
using the following logic:
</p>
@@ -341,25 +443,26 @@
<c>twm</c>. To finish the twm session, type in <c>exit</c> or Ctrl-D in the
upcoming xterms. You can also kill the X session using the Ctrl-Alt-Backspace
combination. This will however make X exit disgracefully -- something that you
-might not always want. It doesn't hurt though. :)
+might not always want.
</p>
</body>
</section>
</chapter>
+
<chapter>
-<title>Tweaking xorg.conf</title>
+<title>Tweaking X settings</title>
<section>
<title>Setting your Resolution</title>
<body>
<p>
If you feel that the screen resolution is wrong, you will need to check two
-sections in your configuration. First of all, you have the <e>Screen</e> section
-which lists the resolutions, if any that your X server will run at. By
-default, this section might not list any resolutions at all. If this is the
-case, Xorg will estimate the resolutions based on the information in the
-second section, <e>Monitor</e>.
+sections in your <path>xorg.conf</path> configuration. First of all, you have
+the <e>Screen</e> section which lists the resolutions, if any that your X server
+will run at. By default, this section might not list any resolutions at all. If
+this is the case, Xorg will estimate the resolutions based on the information in
+the second section, <e>Monitor</e>.
</p>
<p>
@@ -367,9 +470,7 @@
<c>VertRefresh</c> in the <e>Monitor</e> section to compute valid resolutions.
For now, leave these settings as-is. Only when the changes to the <e>Screen</e>
section (which we will describe in a minute) don't work, then you will need to
-look up the specs for your monitor and fill in the correct values. You can also
-use a tool that searches for your monitor's specs, such as
-<c>sys-apps/ddcxinfo-knoppix</c>.
+look up the specs for your monitor and fill in the correct values.
</p>
<warn>
@@ -382,7 +483,7 @@
<p>
Now let us change the resolutions. In the next example from
<path>/etc/X11/xorg.conf</path> we add the <c>Modes</c> lines and the
-<c>DefaultDepth</c> so that our X server starts with 24 bits at 1024x768 by
+<c>DefaultDepth</c> so that our X server starts with 24 bits at 1440x900 by
default. Don't mind the given strings -- they are examples and will most likely
differ from the settings on your system.
</p>
@@ -390,13 +491,13 @@
<pre caption="Changing the Screen section in /etc/X11/xorg.conf">
Section "Screen"
Identifier "Default Screen"
- Device "S3 Inc. ProSavage KN133 [Twister K]"
+ Device "RadeonHD 4550"
Monitor "Generic Monitor"
<i>DefaultDepth 24</i>
<comment># Skipping some text to improve readability</comment>
SubSection "Display"
Depth 24
- <i>Modes "1024x768"</i>
+ <i>Modes "1440x900"</i>
EndSubSection
EndSection
</pre>
@@ -408,82 +509,47 @@
</body>
</section>
<section>
-<title>Configuring your Keyboard</title>
-<body>
-
-<p>
-To setup X to use an international keyboard, search for the <e>InputDevice</e>
-section that configures the keyboard and add the <c>XkbLayout</c> option to
-point to the keyboard layout you want. As an example, we show you how to apply
-for the Belgian layout. Just substitute the country-keycode with yours:
-</p>
-
-<pre caption="Changing the keyboard layout">
-Section "InputDevice"
- Identifier "Generic Keyboard"
- Driver "keyboard"
- Option "CoreKeyboard"
- Option "XkbRules" "xorg"
- Option "XkbModel" "pc105"
- <i>Option "XkbLayout" "be"</i>
-EndSection
-</pre>
-
-</body>
-</section>
-<section>
-<title>Configuring your Mouse</title>
+<title>Configuring your keyboard</title>
<body>
<p>
-If your mouse isn't working, you will first need to find out if it is detected
-by the kernel at all. Mice are (device-wise) seen as
-<path>/dev/input/mouse0</path> (or <path>/dev/input/mice</path> if you want to
-use several mice). In some cases <path>/dev/psaux</path> is used. In either
-case you can check if the devices do represent
-your mouse by checking the output of those files when you move your mouse. You
-will usually see some junk on your screen. To end the session press
-<c>Ctrl-C</c>.
+To setup X to use an international keyboard, you can copy the content of
+<path>/usr/share/doc/hal-*/*/use-estonian-layout.fdi.bz2</path> to
+<path>/etc/hal/fdi/policy/10-xinput-configuration.fdi</path>:
</p>
-<pre caption="Checking the device files">
-# <i>cat /dev/input/mouse0</i>
-<comment>(Don't forget to press Ctrl-C to end this)</comment>
+<pre caption="Using an existing config file">
+# <i>bzcat /usr/share/doc/hal-*/*/use-estonian-layout.fdi > /etc/hal/fdi/policy/10-xinput-configuration.fdi</i>
</pre>
<p>
-If your mouse isn't detected, verify if all the necessary modules are loaded.
+Now you can just edit <path>10-xinput-configuration.fdi</path> and change the
+Estonian keyboard layout (<c>ee</c>) to your own, such as Great Britain
+(<b>gb</b>) or Polish (<b>pl</b>).
</p>
<p>
-If your mouse is detected, fill in the device in the appropriate
-<e>InputDevice</e> section. In the next example you'll see we also set two other
-options: <c>Protocol</c> (which lists the mouse protocol to be used -- most
-users will use PS/2 or IMPS/2) and <c>ZAxisMapping</c> (which allows for the
-mousewheel (if applicable) to be used).
+When you're finished, run <c>/etc/init.d/hald restart</c> as root to make sure
+that HAL picks up your configuration file changes.
</p>
-<pre caption="Changing the mouse settings in Xorg">
-Section "InputDevice"
- Identifier "TouchPad Mouse"
- Driver "mouse"
- Option "CorePointer"
- <i>Option "Device" "/dev/input/mouse0"</i>
- <i>Option "Protocol" "IMPS/2"</i>
- <i>Option "ZAxisMapping" "4 5"</i>
-EndSection
-</pre>
+</body>
+</section>
+<section>
+<title>Finishing up</title>
+<body>
<p>
-Run <c>startx</c> and be happy about the result. :) Congratulations, you now
+Run <c>startx</c> and be happy about the result. Congratulations, you now
(hopefully) have a working Xorg on your system. The next step is to remove this
-ugly lightweight window manager and use a high-feature one (or even a desktop
-environment) such as KDE or GNOME, but that's not part of this guide. :)
+ugly lightweight window manager (twm) and use a high-feature one (or even a
+desktop environment) such as KDE or GNOME, but that's not part of this guide.
</p>
</body>
</section>
</chapter>
+
<chapter>
<title>Resources</title>
<section>
@@ -491,9 +557,10 @@
<body>
<p>
-First of all, <c>man xorg.conf</c> provides a quick yet complete reference
-about the syntax used by the configuration file. Be sure to have it open on a
-terminal near you when you edit your configuration file!
+First of all, <c>man xorg.conf</c> and <c>man evdev</c> provide quick yet
+complete references about the syntax used by these configuration files. Be sure
+to have them open on a terminal near you when you edit your configuration
+files!
</p>
<p>
@@ -510,24 +577,9 @@
<p>
There are also many online resources on editing <path>xorg.conf</path>. We only
list few of them here, be sure to <uri link="http://www.google.com">Google</uri>
-for more. :) As <path>xorg.conf</path> and <path>XF86Config</path> (the
-configuration file for the XFree86 project) use the
-same syntax for most configuration options and more information about
-<path>XF86Config</path> is available, we'll list those resources as well.
+for more.
</p>
-<ul>
- <li>
- <uri link="http://tldp.org/HOWTO/XFree-Local-multi-user-HOWTO/">The XFree
- Local Multi-User HOWTO</uri>
- </li>
- <li>
- <uri
- link="http://www-106.ibm.com/developerworks/edu/os-dw-linuxxwin-i.html">An
- Introduction to XFree 4.x</uri> by Chris Houser
- </li>
-</ul>
-
</body>
</section>
<section>
@@ -542,9 +594,9 @@
</p>
<p>
-If you're upgrading to xorg-server-1.5 from an earlier version, then be sure to
+If you're upgrading to xorg-server-1.6 from an earlier version, then be sure to
read the <uri
-link="/proj/en/desktop/x/x11/xorg-server-1.5-upgrade-guide.xml">migration
+link="/proj/en/desktop/x/x11/xorg-server-1.6-upgrade-guide.xml">migration
guide</uri>.
</p>
^ permalink raw reply [flat|nested] 24+ messages in thread* [gentoo-commits] gentoo commit in xml/htdocs/doc/en: xorg-config.xml
@ 2009-10-02 7:37 Joshua Saddler (nightmorph)
0 siblings, 0 replies; 24+ messages in thread
From: Joshua Saddler (nightmorph) @ 2009-10-02 7:37 UTC (permalink / raw
To: gentoo-commits
nightmorph 09/10/02 07:37:58
Modified: xorg-config.xml
Log:
The first of many rewrites I'll be making to the guide to bring it up to stable xserver 1.6 standards. bug 229769
Revision Changes Path
1.31 xml/htdocs/doc/en/xorg-config.xml
file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?r1=1.30&r2=1.31
Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- xorg-config.xml 10 Jun 2009 18:28:53 -0000 1.30
+++ xorg-config.xml 2 Oct 2009 07:37:57 -0000 1.31
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.30 2009/06/10 18:28:53 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.31 2009/10/02 07:37:57 nightmorph Exp $ -->
<guide link="/doc/en/xorg-config.xml">
<title>The X Server Configuration HOWTO</title>
@@ -8,7 +8,7 @@
<author title="Author">
<mail link="swift@gentoo.org">Sven Vermeulen</mail>
</author>
-<author title="Editor">
+<author title="Author">
<mail link="nightmorph"/>
</author>
@@ -22,8 +22,8 @@
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
<license/>
-<version>1.21</version>
-<date>2009-06-10</date>
+<version>1.22</version>
+<date>2009-10-02</date>
<chapter>
<title>What is the X Window Server?</title>
@@ -320,8 +320,11 @@
<li>
Otherwise, it will read the value of the XSESSION variable and will execute
one of the sessions available in <path>/etc/X11/Sessions/</path>
- accordingly (you can set the value of XSESSION in <path>/etc/rc.conf</path>
- to make it a default for all the users on the system).
+ accordingly. You can set the value of XSESSION in
+ <path>/etc/env.d/90xsession</path> to make it a default for all the users on
+ the system. For example, as root, run <c>echo XSESSION="Xfce4" >
+ /etc/env.d/90xsession</c>. This will create the <path>90xsession</path> file
+ and set the default X session to Xfce4.
</li>
<li>
If all of the above fail, it will fall back to a simple window manager,
^ permalink raw reply [flat|nested] 24+ messages in thread* [gentoo-commits] gentoo commit in xml/htdocs/doc/en: xorg-config.xml
@ 2009-06-10 18:28 Joshua Saddler (nightmorph)
0 siblings, 0 replies; 24+ messages in thread
From: Joshua Saddler (nightmorph) @ 2009-06-10 18:28 UTC (permalink / raw
To: gentoo-commits
nightmorph 09/06/10 18:28:54
Modified: xorg-config.xml
Log:
recommend xorg-server, not xorg-x11, as the more recent versions that will be stabilized bring in a spamload of international alphabets and fonts. totally useless for a working desktop.
Revision Changes Path
1.30 xml/htdocs/doc/en/xorg-config.xml
file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?r1=1.29&r2=1.30
Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xorg-config.xml 15 Apr 2009 06:48:50 -0000 1.29
+++ xorg-config.xml 10 Jun 2009 18:28:53 -0000 1.30
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.29 2009/04/15 06:48:50 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.30 2009/06/10 18:28:53 nightmorph Exp $ -->
<guide link="/doc/en/xorg-config.xml">
<title>The X Server Configuration HOWTO</title>
@@ -22,8 +22,8 @@
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
<license/>
-<version>1.20</version>
-<date>2009-04-14</date>
+<version>1.21</version>
+<date>2009-06-10</date>
<chapter>
<title>What is the X Window Server?</title>
@@ -168,9 +168,17 @@
</p>
<pre caption="Installing Xorg">
-# <i>emerge xorg-x11</i>
+# <i>emerge xorg-server</i>
</pre>
+<note>
+You could install the <c>xorg-x11</c> metapackage instead of the more
+lightweight xorg-server. Functionally, <c>xorg-x11</c> and <c>xorg-server</c>
+are the same. However, <c>xorg-x11</c> brings in many more packages that
+you probably don't need, such as a huge assortment of fonts in many different
+languages. They're not necessary for a working desktop.
+</note>
+
<p>
When the installation is finished, you might need to re-initialise some
environment variables before you continue. Just run <c>env-update</c> followed
@@ -192,11 +200,11 @@
<body>
<p>
-The configuration file of Xorg is called <path>xorg.conf</path> and it
-resides in <path>/etc/X11</path>. The Xorg-X11 package provides an example
-configuration as <path>/etc/X11/xorg.conf.example</path> which you can use to
-create your own configuration. It is heavily commented, but if you are in need
-of more documentation regarding the syntax, don't hesitate to read the man page:
+The configuration file of Xorg is called <path>xorg.conf</path> and it resides
+in <path>/etc/X11</path>. Xorg provides an example configuration as
+<path>/etc/X11/xorg.conf.example</path> which you can use to create your own
+configuration. It is heavily commented, but if you are in need of more
+documentation regarding the syntax, don't hesitate to read the man page:
</p>
<pre caption="Reading the xorg.conf man page">
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo commit in xml/htdocs/doc/en: xorg-config.xml
@ 2009-01-26 8:08 Joshua Saddler (nightmorph)
0 siblings, 0 replies; 24+ messages in thread
From: Joshua Saddler (nightmorph) @ 2009-01-26 8:08 UTC (permalink / raw
To: gentoo-commits
nightmorph 09/01/26 08:08:31
Modified: xorg-config.xml
Log:
A little handholding for pebkac users; removed a paragraph just to be sure. bug 254186
Revision Changes Path
1.28 xml/htdocs/doc/en/xorg-config.xml
file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?r1=1.27&r2=1.28
Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xorg-config.xml 10 Nov 2008 07:01:00 -0000 1.27
+++ xorg-config.xml 26 Jan 2009 08:08:22 -0000 1.28
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.27 2008/11/10 07:01:00 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.28 2009/01/26 08:08:22 nightmorph Exp $ -->
<guide link="/doc/en/xorg-config.xml">
<title>The X Server Configuration HOWTO</title>
@@ -22,8 +22,8 @@
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
<license/>
-<version>1.18</version>
-<date>2008-11-09</date>
+<version>1.19</version>
+<date>2009-01-26</date>
<chapter>
<title>What is the X Window Server?</title>
@@ -88,16 +88,9 @@
<chapter>
<title>Installing Xorg</title>
<section>
-<title>Using emerge</title>
<body>
<p>
-Enough chitchat, let's get to business shall we? To install Xorg, you just
-need to run <c>emerge xorg-x11</c>. Installing Xorg does take a while
-though, so you might want to grab a snack while you are waiting.
-</p>
-
-<p>
Before installing Xorg you have to configure two important variables in the
<path>/etc/make.conf</path> file.
</p>
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo commit in xml/htdocs/doc/en: xorg-config.xml
@ 2008-11-10 7:01 Joshua Saddler (nightmorph)
0 siblings, 0 replies; 24+ messages in thread
From: Joshua Saddler (nightmorph) @ 2008-11-10 7:01 UTC (permalink / raw
To: gentoo-commits
nightmorph 08/11/10 07:01:00
Log:
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo commit in xml/htdocs/doc/en: xorg-config.xml
@ 2008-05-23 19:40 Sven Vermeulen (swift)
0 siblings, 0 replies; 24+ messages in thread
From: Sven Vermeulen (swift) @ 2008-05-23 19:40 UTC (permalink / raw
To: gentoo-commits
swift 08/05/23 19:40:35
Log:
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 24+ messages in thread
end of thread, other threads:[~2013-08-01 18:24 UTC | newest]
Thread overview: 24+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-25 7:38 [gentoo-commits] gentoo commit in xml/htdocs/doc/en: xorg-config.xml Joshua Saddler (nightmorph)
-- strict thread matches above, loose matches on Subject: below --
2013-08-01 18:24 Sven Vermeulen (swift)
2012-06-14 6:48 Joshua Saddler (nightmorph)
2011-09-02 19:07 Sven Vermeulen (swift)
2011-08-23 15:04 Sven Vermeulen (swift)
2011-08-23 14:43 Sven Vermeulen (swift)
2011-03-23 9:03 Joshua Saddler (nightmorph)
2011-03-02 8:16 Joshua Saddler (nightmorph)
2011-03-02 7:17 Joshua Saddler (nightmorph)
2010-10-12 23:13 Joshua Saddler (nightmorph)
2010-08-29 3:39 Joshua Saddler (nightmorph)
2010-05-23 21:31 Joshua Saddler (nightmorph)
2010-05-23 21:29 Joshua Saddler (nightmorph)
2010-03-16 20:07 Joshua Saddler (nightmorph)
2010-01-02 3:02 Joshua Saddler (nightmorph)
2009-12-31 1:37 Joshua Saddler (nightmorph)
2009-12-17 4:41 Joshua Saddler (nightmorph)
2009-12-17 4:37 Joshua Saddler (nightmorph)
2009-12-09 1:35 Joshua Saddler (nightmorph)
2009-10-02 7:37 Joshua Saddler (nightmorph)
2009-06-10 18:28 Joshua Saddler (nightmorph)
2009-01-26 8:08 Joshua Saddler (nightmorph)
2008-11-10 7:01 Joshua Saddler (nightmorph)
2008-05-23 19:40 Sven Vermeulen (swift)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox