[gentoo-doc-cvs] cvs commit: xorg-config.xml

[gentoo-doc-cvs] cvs commit: xorg-config.xml

[Jose Luis Rivero]

yoswink     05/07/13 21:21:05

  Modified:    xml/htdocs/doc/en xorg-config.xml
  Log:
  Changed link attribute to make it point to absolute path. Thanks to rane on #gentoo-doc.

Revision  Changes    Path
1.15      +2 -2      xml/htdocs/doc/en/xorg-config.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/xorg-config.xml?rev=1.15&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/xorg-config.xml?rev=1.15&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/xorg-config.xml.diff?r1=1.14&r2=1.15&cvsroot=gentoo

Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-config.xml	23 May 2005 15:58:45 -0000	1.14
+++ xorg-config.xml	13 Jul 2005 21:21:05 -0000	1.15
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.14 2005/05/23 15:58:45 swift Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.15 2005/07/13 21:21:05 yoswink Exp $ -->
 
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
 
-<guide link="xorg-config.xml">
+<guide link="/doc/en/xorg-config.xml">
 
 <title>The X Server Configuration HOWTO</title>
 



-- 
gentoo-doc-cvs@gentoo.org mailing list

[gentoo-doc-cvs] cvs commit: xorg-config.xml

[Shyam Mani]

fox2mike    05/09/09 05:57:43

  Modified:    xml/htdocs/doc/en xorg-config.xml
  Log:
  #101912 - Minor grammatical fixes, thanks to Erik Musick for reporting.

Revision  Changes    Path
1.16      +13 -12    xml/htdocs/doc/en/xorg-config.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/xorg-config.xml?rev=1.16&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/xorg-config.xml?rev=1.16&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/xorg-config.xml.diff?r1=1.15&r2=1.16&cvsroot=gentoo

Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-config.xml	13 Jul 2005 21:21:05 -0000	1.15
+++ xorg-config.xml	9 Sep 2005 05:57:43 -0000	1.16
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.15 2005/07/13 21:21:05 yoswink Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.16 2005/09/09 05:57:43 fox2mike Exp $ -->
 
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
 
@@ -23,7 +23,7 @@
 <license/>
 
 <version>1.12</version>
-<date>2005-05-23</date>
+<date>2005-09-09</date>
 
 <chapter>
 <title>What is the X Window Server?</title>
@@ -48,7 +48,7 @@
 
 <p>
 As standards are important, a standard for drawing and moving windows on a
-screen, interacting with the user through mouse and keyboard and other basic yet
+screen, interacting with the user through mouse, keyboard and other basic, yet
 important aspects has been created and named the <e>X Window System</e>,
 commonly abbreviated as <e>X11</e> or just <e>X</e>. It is used on Unix, Linux
 and Unix-like operating systems throughout the world.
@@ -70,8 +70,8 @@
 
 <p>
 The <uri link="http://www.x.org">X.org</uri> project created and
-maintains a freely redistributable open-source implementation of the X11 system.
-It is an open source X11-based desktop infrastructure. 
+maintains a freely redistributable, open-source implementation of the X11
+system. It is an open source X11-based desktop infrastructure. 
 </p>
 
 <p>
@@ -84,6 +84,7 @@
 </body>
 </section>
 </chapter>
+
 <chapter>
 <title>Installing Xorg</title>
 <section>
@@ -193,7 +194,7 @@
 
 <p>
 Another tool, also provided by Xorg, is <c>xorgcfg</c>, which will first
-attempts to run <c>Xorg -configure</c> and then start the X server for more
+attempt to run <c>Xorg -configure</c> and then start the X server for more
 final tweaking.
 </p>
 
@@ -257,7 +258,7 @@
 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
+combination. This will however make X exit disgracefully -- something that you
 might not always want. It doesn't hurt though :)
 </p>
 
@@ -273,7 +274,7 @@
 <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
+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>.
@@ -290,7 +291,7 @@
 </p>
 
 <warn>
-Do <b>not</b> "just" change the values of these two monitor-related variables
+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.
@@ -300,7 +301,7 @@
 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
-default. Don't mind the given strings - they are examples and will most likely
+default. Don't mind the given strings -- they are examples and will most likely
 differ from the settings on your system.
 </p>
 
@@ -374,8 +375,8 @@
 <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 
+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).
 </p>
 



-- 
gentoo-doc-cvs@gentoo.org mailing list

[gentoo-doc-cvs] cvs commit: xorg-config.xml

[Shyam Mani]

fox2mike    05/09/09 06:01:15

  Modified:    xml/htdocs/doc/en xorg-config.xml
  Log:
  #101912 - Minor content change, make clear that the mouse output isn't meaningful. Fixed license to 2.5 as well.

Revision  Changes    Path
1.17      +6 -5      xml/htdocs/doc/en/xorg-config.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/xorg-config.xml?rev=1.17&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/xorg-config.xml?rev=1.17&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/xorg-config.xml.diff?r1=1.16&r2=1.17&cvsroot=gentoo

Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-config.xml	9 Sep 2005 05:57:43 -0000	1.16
+++ xorg-config.xml	9 Sep 2005 06:01:15 -0000	1.17
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.16 2005/09/09 05:57:43 fox2mike Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.17 2005/09/09 06:01:15 fox2mike Exp $ -->
 
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
 
@@ -19,10 +19,10 @@
 </abstract>
 
 <!-- The content of this document is licensed under the CC-BY-SA license -->
-<!-- See http://creativecommons.org/licenses/by-sa/2.0 -->
+<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
 
-<version>1.12</version>
+<version>1.13</version>
 <date>2005-09-09</date>
 
 <chapter>
@@ -359,8 +359,9 @@
 <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. To
-end the session press <c>Ctrl-C</c>.
+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>.
 </p>
 
 <pre caption="Checking the device files">



-- 
gentoo-doc-cvs@gentoo.org mailing list

[gentoo-doc-cvs] cvs commit: xorg-config.xml

[Lukasz Damentko]

rane        06/07/13 04:29:16

  Modified:             xorg-config.xml
  Log:
  #139583, update for modular xorg (VIDEO_CARDS, INPUT_DEVICES)

Revision  Changes    Path
1.18                 xml/htdocs/doc/en/xorg-config.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/xorg-config.xml?rev=1.18&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/xorg-config.xml?rev=1.18&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/xorg-config.xml.diff?r1=1.17&r2=1.18&cvsroot=gentoo

Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xorg-config.xml	9 Sep 2005 06:01:15 -0000	1.17
+++ xorg-config.xml	13 Jul 2006 04:29:16 -0000	1.18
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.17 2005/09/09 06:01:15 fox2mike Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.18 2006/07/13 04:29:16 rane Exp $ -->
 
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
 
@@ -22,8 +22,8 @@
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
 
-<version>1.13</version>
-<date>2005-09-09</date>
+<version>1.14</version>
+<date>2006-07-13</date>
 
 <chapter>
 <title>What is the X Window Server?</title>
@@ -97,18 +97,91 @@
 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>
+
+<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. Use <c>radeon</c> in case you have an
+ATI card for the same. <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.
+</p>
+
+<p>
+Now you should decide which drivers you will use and add necessary settings to
+the <path>/etc/make.conf</path> file:
+</p>
+
+<pre caption="Sample make.conf entries">
+<comment>(For mouse and keyboard support)</comment>
+INPUT_DEVICES="keyboard mouse"
+<comment>(For Nvidia cards)</comment>
+VIDEO_CARDS="nvidia"
+<comment>(OR, for ATI Radeon cards)</comment>
+VIDEO_CARDS="fglrx"
+</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
+<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>
+If the suggested settings don't work for you, you should run <c>emerge -pv
+xorg-x11</c>, check all the options available and choose those which
+apply to your system. In different versions of Xorg and on different
+architectures displaying these variables can be done with <c>emerge -pv
+xorg-server</c> command rather than the one above. The example is for x86
+architecture and xorg-x11-7.0.
+</note>
+
+<pre caption="Displaying all the driver options available">
+# <i>emerge -pv xorg-x11</i>
+
+These are the packages that would be merged, in order:
+
+Calculating dependencies... done!
+[ebuild   R   ] x11-base/xorg-x11-7.0-r1  USE="-3dfx" INPUT_DEVICES="keyboard
+mouse -acecad -aiptek -calcomp -citron -digitaledge -dmc -dynapro -elo2300
+-elographics -evdev -fpit -hyperpen -jamstudio -joystick -magellan -magictouch
+-microtouch -mutouch -palmax -penmount -spaceorb -summa -synaptics -tek4957
+-ur98 -vmmouse -void -wacom" VIDEO_CARDS="nvidia -apm -ark -chips -cirrus
+-cyrix -dummy -fbdev -fglrx -glint -i128 -i740 -i810 -imstt -mach64 -mga
+-neomagic -nsc -nv -r128 -radeon -rendition -s3 -s3virge -savage -siliconmotion
+-sis -sisusb -tdfx -tga -trident -tseng -v4l -vesa -vga -via -vmware -voodoo" 0
+kB
+</pre>
+
+<p>
+After setting all the necessary variables you can install the Xorg package.
+</p>
+
 <pre caption="Installing Xorg">
 # <i>emerge xorg-x11</i>
 </pre>
 
 <p>
-When the installation is finished, you might need to reinitialise some
+When the installation is finished, you might 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. This doesn't harm your system
-in any way.
+by <c>source /etc/profile</c> and you're all set.
 </p>
 
-<pre caption="Reinitialising the environment variables">
+<pre caption="Re-initialising the environment variables">
 # <i>env-update</i>
 # <i>source /etc/profile</i>
 </pre>
@@ -443,5 +516,24 @@
 
 </body>
 </section>
+<section>
+<title>Other resources</title>
+<body>
+
+<p>
+If you want to update your system from the old monolithic Xorg to the newer,
+modular Xorg 7, you should refer to the <uri
+link="/proj/en/desktop/x/x11/modular-x-howto.xml">Migrating to Modular X
+HOWTO</uri>.
+</p>
+
+<p>
+More information about configuring different packages to work in X environment
+can be found in the <uri link="/doc/en/?catid=desktop">Gentoo Desktop
+Documentation Resources</uri> section of our documentation.
+</p>
+
+</body>
+</section>
 </chapter>
 </guide>



-- 
gentoo-doc-cvs@gentoo.org mailing list

[gentoo-doc-cvs] cvs commit: xorg-config.xml

[Josh Saddler]

nightmorph    07/02/17 19:12:14

  Modified:             xorg-config.xml
  Log:
  added bit about /dev/input/mice to the xorg guide, bug 167337

Revision  Changes    Path
1.21                 xml/htdocs/doc/en/xorg-config.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?r1=1.20&r2=1.21

Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xorg-config.xml	29 Nov 2006 15:48:57 -0000	1.20
+++ xorg-config.xml	17 Feb 2007 19:12:14 -0000	1.21
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.20 2006/11/29 15:48:57 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.21 2007/02/17 19:12:14 nightmorph Exp $ -->
 
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
 
@@ -22,8 +22,8 @@
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
 
-<version>1.14</version>
-<date>2006-07-13</date>
+<version>1.15</version>
+<date>2007-02-17</date>
 
 <chapter>
 <title>What is the X Window Server?</title>
@@ -243,10 +243,12 @@
 </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.
+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>



-- 
gentoo-doc-cvs@gentoo.org mailing list

[gentoo-doc-cvs] cvs commit: xorg-config.xml

[Jan Kundrat]

jkt         07/06/09 12:40:12

  Modified:             xorg-config.xml
  Log:
  clarify status of the radeon driver

Revision  Changes    Path
1.22                 xml/htdocs/doc/en/xorg-config.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?r1=1.21&r2=1.22

Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xorg-config.xml	17 Feb 2007 19:12:14 -0000	1.21
+++ xorg-config.xml	9 Jun 2007 12:40:12 -0000	1.22
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.21 2007/02/17 19:12:14 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.22 2007/06/09 12:40:12 jkt Exp $ -->
 
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
 
@@ -22,8 +22,8 @@
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
 
-<version>1.15</version>
-<date>2007-02-17</date>
+<version>1.16</version>
+<date>2007-06-09</date>
 
 <chapter>
 <title>What is the X Window Server?</title>
@@ -109,8 +109,9 @@
 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. Use <c>radeon</c> in case you have an
-ATI card for the same. <c>VIDEO_CARDS</c> may contain more than one driver, in
+driver means no 3d acceleration at all. The free <c>radeon</c> driver for ATI
+cards supports full 3D acceleration on older Radeons but doesn't work at all
+with the newer ones. <c>VIDEO_CARDS</c> may contain more than one driver, in
 this case list of them should be separated with spaces.
 </p>
 



-- 
gentoo-doc-cvs@gentoo.org mailing list

[gentoo-doc-cvs] cvs commit: xorg-config.xml

[Josh Saddler]

nightmorph    07/06/21 02:37:46

  Modified:             xorg-config.xml
  Log:
  updated xorg guide for bug 182752

Revision  Changes    Path
1.23                 xml/htdocs/doc/en/xorg-config.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?r1=1.22&r2=1.23

Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xorg-config.xml	9 Jun 2007 12:40:12 -0000	1.22
+++ xorg-config.xml	21 Jun 2007 02:37:46 -0000	1.23
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.22 2007/06/09 12:40:12 jkt Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.23 2007/06/21 02:37:46 nightmorph Exp $ -->
 
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
 
@@ -22,8 +22,8 @@
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
 
-<version>1.16</version>
-<date>2007-06-09</date>
+<version>1.17</version>
+<date>2007-06-20</date>
 
 <chapter>
 <title>What is the X Window Server?</title>
@@ -144,28 +144,27 @@
 
 <note>
 If the suggested settings don't work for you, you should run <c>emerge -pv
-xorg-x11</c>, check all the options available and choose those which
-apply to your system. In different versions of Xorg and on different
-architectures displaying these variables can be done with <c>emerge -pv
-xorg-server</c> command rather than the one above. The example is for x86
-architecture and xorg-x11-7.0.
+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>
 
 <pre caption="Displaying all the driver options available">
-# <i>emerge -pv xorg-x11</i>
+# <i>emerge -pv xorg-server</i>
 
 These are the packages that would be merged, in order:
 
 Calculating dependencies... done!
-[ebuild   R   ] x11-base/xorg-x11-7.0-r1  USE="-3dfx" INPUT_DEVICES="keyboard
-mouse -acecad -aiptek -calcomp -citron -digitaledge -dmc -dynapro -elo2300
--elographics -evdev -fpit -hyperpen -jamstudio -joystick -magellan -magictouch
--microtouch -mutouch -palmax -penmount -spaceorb -summa -synaptics -tek4957
--ur98 -vmmouse -void -wacom" VIDEO_CARDS="nvidia -apm -ark -chips -cirrus
--cyrix -dummy -fbdev -fglrx -glint -i128 -i740 -i810 -imstt -mach64 -mga
--neomagic -nsc -nv -r128 -radeon -rendition -s3 -s3virge -savage -siliconmotion
--sis -sisusb -tdfx -tga -trident -tseng -v4l -vesa -vga -via -vmware -voodoo" 0
-kB
+[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
 </pre>
 
 <p>



-- 
gentoo-doc-cvs@gentoo.org mailing list

[gentoo-doc-cvs] cvs commit: xorg-config.xml

[Josh Saddler]

nightmorph    07/10/18 18:16:02

  Modified:             xorg-config.xml
  Log:
  buncha small coding style fixes and punctuation, spelling, and grammar fixes. no content change.

Revision  Changes    Path
1.24                 xml/htdocs/doc/en/xorg-config.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?r1=1.23&r2=1.24

Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xorg-config.xml	21 Jun 2007 02:37:46 -0000	1.23
+++ xorg-config.xml	18 Oct 2007 18:16:02 -0000	1.24
@@ -1,11 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
-
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.23 2007/06/21 02:37:46 nightmorph Exp $ -->
-
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.24 2007/10/18 18:16:02 nightmorph Exp $ -->
 
 <guide link="/doc/en/xorg-config.xml">
-
 <title>The X Server Configuration HOWTO</title>
 
 <author title="Author">
@@ -235,7 +232,7 @@
 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 :)
+for you to test. So let's test. :)
 </p>
 
 <pre caption="Testing the xorg.conf.new file">
@@ -288,7 +285,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 far more easy :)
+<c>X -config</c> -- typing just <c>X</c> or <c>startx</c> is easier. :)
 </p>
 
 <pre caption="Copying over xorg.conf">
@@ -319,7 +316,7 @@
     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).
   </li>
-<li>
+  <li>
     If all of the above fail, it will fall back to a simple window manager,
     usually <c>twm</c>.
   </li>
@@ -334,7 +331,7 @@
 <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. It doesn't hurt though. :)
 </p>
 
 </body>
@@ -395,7 +392,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>
@@ -471,7 +468,7 @@
 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 :)
+environment) such as KDE or GNOME, but that's not part of this guide. :)
 </p>
 
 </body>
@@ -500,7 +497,7 @@
 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 syntaxis for most configuration options and more information about
+same syntax for most configuration options and more information about
 <path>XF86Config</path> is available, we'll list those resources as well.
 </p>
 



-- 
gentoo-doc-cvs@gentoo.org mailing list

[gentoo-doc-cvs] cvs commit: xorg-config.xml

[Josh Saddler]

nightmorph    07/10/18 18:20:10

  Modified:             xorg-config.xml
  Log:
  a few more non-content changes i missed. there are FAR  too many smileys in this doc. i blame swift\!

Revision  Changes    Path
1.25                 xml/htdocs/doc/en/xorg-config.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?r1=1.24&r2=1.25

Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xorg-config.xml	18 Oct 2007 18:16:02 -0000	1.24
+++ xorg-config.xml	18 Oct 2007 18:20:10 -0000	1.25
@@ -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.24 2007/10/18 18:16:02 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.25 2007/10/18 18:20:10 nightmorph Exp $ -->
 
 <guide link="/doc/en/xorg-config.xml">
 <title>The X Server Configuration HOWTO</title>
@@ -32,7 +32,7 @@
 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 
+do this. :-) Linux offers a wide variety of flashy user interfaces and 
 environments which you can install on top of your existing installation.
 </p>
 
@@ -465,7 +465,7 @@
 </pre>
 
 <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. :)
@@ -488,14 +488,14 @@
 
 <p>
 A second point of resources on your system is the
-<path>/usr/X11R6/lib/X11/doc</path> directory with various <path>README</path>'s
+<path>/usr/X11R6/lib/X11/doc</path> directory with various <path>README</path>s
 for individual graphical chipsets.
 </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 :) As <path>xorg.conf</path> and <path>XF86Config</path> (the
+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.



-- 
gentoo-doc-cvs@gentoo.org mailing list

[gentoo-doc-cvs] cvs commit: xorg-config.xml

[Sven Vermeulen]

swift       08/05/23 19:40:35

  Modified:             xorg-config.xml
  Log:
  Coding style

Revision  Changes    Path
1.26                 xml/htdocs/doc/en/xorg-config.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?r1=1.25&r2=1.26

Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xorg-config.xml	18 Oct 2007 18:20:10 -0000	1.25
+++ xorg-config.xml	23 May 2008 19:40:35 -0000	1.26
@@ -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.25 2007/10/18 18:20:10 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.26 2008/05/23 19:40:35 swift Exp $ -->
 
 <guide link="/doc/en/xorg-config.xml">
 <title>The X Server Configuration HOWTO</title>
@@ -11,7 +11,7 @@
 
 <abstract>
 Xorg is the X Window server which allows users to have a graphical
-environment at their fingertips. This HOWTO explains what Xorg is, how to 
+environment at their fingertips. This HOWTO explains what Xorg is, how to
 install it and what the various configuration options are.
 </abstract>
 
@@ -32,7 +32,7 @@
 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 
+do this. :-) Linux offers a wide variety of flashy user interfaces and
 environments which you can install on top of your existing installation.
 </p>
 
@@ -52,10 +52,10 @@
 </p>
 
 <p>
-The application that provides Linux users with the ability to run graphical 
+The application that provides Linux users with the ability to run graphical
 user interfaces and that uses the X11 standard is Xorg-X11, a fork of
 the XFree86 project. XFree86 has decided to use a license that might not be
-compatible with the GPL license; the use of Xorg is therefore recommended. 
+compatible with the GPL license; the use of Xorg is therefore recommended.
 The official Portage tree does not provide an XFree86 package anymore.
 </p>
 
@@ -68,14 +68,14 @@
 <p>
 The <uri link="http://www.x.org">X.org</uri> project created and
 maintains a freely redistributable, open-source implementation of the X11
-system. It is an open source X11-based desktop infrastructure. 
+system. It is an open source X11-based desktop infrastructure.
 </p>
 
 <p>
 Xorg provides an interface between your hardware and the graphical software
 you want to run. Besides that, Xorg is also fully network-aware, meaning you
 are able to run an application on one system while viewing it on a different
-one. 
+one.
 </p>
 
 </body>
@@ -89,8 +89,8 @@
 <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 
+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>
 
@@ -216,11 +216,11 @@
 <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. 
+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">
@@ -429,7 +429,7 @@
 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 
+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
@@ -446,7 +446,7 @@
 </p>
 
 <p>
-If your mouse is detected, fill in the device in the appropriate 
+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



-- 
gentoo-doc-cvs@lists.gentoo.org mailing list

[gentoo-doc-cvs] cvs commit: xorg-config.xml

[Joshua Saddler]

nightmorph    08/11/10 07:01:00

  Modified:             xorg-config.xml
  Log:
  Update the xorg guide. clean up video_cards and input_devices information at the beginning. remove references to X11R6. add online help links. some general cleanup toward the end of the doc.

Revision  Changes    Path
1.27                 xml/htdocs/doc/en/xorg-config.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/xorg-config.xml?r1=1.26&r2=1.27

Index: xorg-config.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xorg-config.xml	23 May 2008 19:40:35 -0000	1.26
+++ xorg-config.xml	10 Nov 2008 07:01:00 -0000	1.27
@@ -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.26 2008/05/23 19:40:35 swift Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.27 2008/11/10 07:01:00 nightmorph Exp $ -->
 
 <guide link="/doc/en/xorg-config.xml">
 <title>The X Server Configuration HOWTO</title>
@@ -8,6 +8,9 @@
 <author title="Author">
   <mail link="swift@gentoo.org">Sven Vermeulen</mail>
 </author>
+<author title="Editor">
+  <mail link="nightmorph"/>
+</author>
 
 <abstract>
 Xorg is the X Window server which allows users to have a graphical
@@ -19,8 +22,8 @@
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
 
-<version>1.17</version>
-<date>2007-06-20</date>
+<version>1.18</version>
+<date>2008-11-09</date>
 
 <chapter>
 <title>What is the X Window Server?</title>
@@ -106,16 +109,19 @@
 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> driver for ATI
-cards supports full 3D acceleration on older Radeons but doesn't work at all
-with the newer ones. <c>VIDEO_CARDS</c> may contain more than one driver, in
-this case list of them should be separated with spaces.
+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.
 </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.
+<c>keyboard mouse</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>
 
 <p>
@@ -133,7 +139,7 @@
 </pre>
 
 <p>
-More instructions on how to configure Nvidia and ATI cards can be found in
+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
 <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.
@@ -481,15 +487,20 @@
 <body>
 
 <p>
-First of all, <c>man 5 xorg.conf</c> provides a quick yet complete reference
-about the syntaxis used by the configuration file. Be sure to have it open on a
+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!
 </p>
 
 <p>
-A second point of resources on your system is the
-<path>/usr/X11R6/lib/X11/doc</path> directory with various <path>README</path>s
-for individual graphical chipsets.
+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>.
+</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>
@@ -520,16 +531,10 @@
 <body>
 
 <p>
-If you want to update your system from the old monolithic Xorg to the newer,
-modular Xorg 7, you should refer to the <uri
-link="/proj/en/desktop/x/x11/modular-x-howto.xml">Migrating to Modular X
-HOWTO</uri>.
-</p>
-
-<p>
-More information about configuring different packages to work in X environment
-can be found in the <uri link="/doc/en/?catid=desktop">Gentoo Desktop
-Documentation Resources</uri> section of our documentation.
+More information about installing and configuring various graphical desktop
+environments and applications can be found in the <uri
+link="/doc/en/?catid=desktop">Gentoo Desktop Documentation Resources</uri>
+section of our documentation.
 </p>
 
 </body>