| 1 |
fox2mike 05/09/09 05:57:43 |
| 2 |
|
| 3 |
Modified: xml/htdocs/doc/en xorg-config.xml |
| 4 |
Log: |
| 5 |
#101912 - Minor grammatical fixes, thanks to Erik Musick for reporting. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.16 +13 -12 xml/htdocs/doc/en/xorg-config.xml |
| 9 |
|
| 10 |
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 |
| 11 |
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 |
| 12 |
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 |
| 13 |
|
| 14 |
Index: xorg-config.xml |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v |
| 17 |
retrieving revision 1.15 |
| 18 |
retrieving revision 1.16 |
| 19 |
diff -u -r1.15 -r1.16 |
| 20 |
--- xorg-config.xml 13 Jul 2005 21:21:05 -0000 1.15 |
| 21 |
+++ xorg-config.xml 9 Sep 2005 05:57:43 -0000 1.16 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
<?xml version='1.0' encoding='UTF-8'?> |
| 24 |
|
| 25 |
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.15 2005/07/13 21:21:05 yoswink Exp $ --> |
| 26 |
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xorg-config.xml,v 1.16 2005/09/09 05:57:43 fox2mike Exp $ --> |
| 27 |
|
| 28 |
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd"> |
| 29 |
|
| 30 |
@@ -23,7 +23,7 @@ |
| 31 |
<license/> |
| 32 |
|
| 33 |
<version>1.12</version> |
| 34 |
-<date>2005-05-23</date> |
| 35 |
+<date>2005-09-09</date> |
| 36 |
|
| 37 |
<chapter> |
| 38 |
<title>What is the X Window Server?</title> |
| 39 |
@@ -48,7 +48,7 @@ |
| 40 |
|
| 41 |
<p> |
| 42 |
As standards are important, a standard for drawing and moving windows on a |
| 43 |
-screen, interacting with the user through mouse and keyboard and other basic yet |
| 44 |
+screen, interacting with the user through mouse, keyboard and other basic, yet |
| 45 |
important aspects has been created and named the <e>X Window System</e>, |
| 46 |
commonly abbreviated as <e>X11</e> or just <e>X</e>. It is used on Unix, Linux |
| 47 |
and Unix-like operating systems throughout the world. |
| 48 |
@@ -70,8 +70,8 @@ |
| 49 |
|
| 50 |
<p> |
| 51 |
The <uri link="http://www.x.org">X.org</uri> project created and |
| 52 |
-maintains a freely redistributable open-source implementation of the X11 system. |
| 53 |
-It is an open source X11-based desktop infrastructure. |
| 54 |
+maintains a freely redistributable, open-source implementation of the X11 |
| 55 |
+system. It is an open source X11-based desktop infrastructure. |
| 56 |
</p> |
| 57 |
|
| 58 |
<p> |
| 59 |
@@ -84,6 +84,7 @@ |
| 60 |
</body> |
| 61 |
</section> |
| 62 |
</chapter> |
| 63 |
+ |
| 64 |
<chapter> |
| 65 |
<title>Installing Xorg</title> |
| 66 |
<section> |
| 67 |
@@ -193,7 +194,7 @@ |
| 68 |
|
| 69 |
<p> |
| 70 |
Another tool, also provided by Xorg, is <c>xorgcfg</c>, which will first |
| 71 |
-attempts to run <c>Xorg -configure</c> and then start the X server for more |
| 72 |
+attempt to run <c>Xorg -configure</c> and then start the X server for more |
| 73 |
final tweaking. |
| 74 |
</p> |
| 75 |
|
| 76 |
@@ -257,7 +258,7 @@ |
| 77 |
If you see an ugly, loathsome, repulsive, deformed window manager, that's |
| 78 |
<c>twm</c>. To finish the twm session, type in <c>exit</c> or Ctrl-D in the |
| 79 |
upcoming xterms. You can also kill the X session using the Ctrl-Alt-Backspace |
| 80 |
-combination. This will however make X exit disgracefully - something that you |
| 81 |
+combination. This will however make X exit disgracefully -- something that you |
| 82 |
might not always want. It doesn't hurt though :) |
| 83 |
</p> |
| 84 |
|
| 85 |
@@ -273,7 +274,7 @@ |
| 86 |
<p> |
| 87 |
If you feel that the screen resolution is wrong, you will need to check two |
| 88 |
sections in your configuration. First of all, you have the <e>Screen</e> section |
| 89 |
-which lists the resolutions - if any - that your X server will run at. By |
| 90 |
+which lists the resolutions, if any that your X server will run at. By |
| 91 |
default, this section might not list any resolutions at all. If this is the |
| 92 |
case, Xorg will estimate the resolutions based on the information in the |
| 93 |
second section, <e>Monitor</e>. |
| 94 |
@@ -290,7 +291,7 @@ |
| 95 |
</p> |
| 96 |
|
| 97 |
<warn> |
| 98 |
-Do <b>not</b> "just" change the values of these two monitor-related variables |
| 99 |
+Do <b>not</b> "just" change the values of these two monitor related variables |
| 100 |
without consulting the technical specifications of your monitor. Setting |
| 101 |
incorrect values lead to out-of-sync errors at best and smoked up screens at |
| 102 |
worst. |
| 103 |
@@ -300,7 +301,7 @@ |
| 104 |
Now let us change the resolutions. In the next example from |
| 105 |
<path>/etc/X11/xorg.conf</path> we add the <c>Modes</c> lines and the |
| 106 |
<c>DefaultDepth</c> so that our X server starts with 24 bits at 1024x768 by |
| 107 |
-default. Don't mind the given strings - they are examples and will most likely |
| 108 |
+default. Don't mind the given strings -- they are examples and will most likely |
| 109 |
differ from the settings on your system. |
| 110 |
</p> |
| 111 |
|
| 112 |
@@ -374,8 +375,8 @@ |
| 113 |
<p> |
| 114 |
If your mouse is detected, fill in the device in the appropriate |
| 115 |
<e>InputDevice</e> section. In the next example you'll see we also set two other |
| 116 |
-options: <c>Protocol</c> (which lists the mouse protocol to be used - most users |
| 117 |
-will use PS/2 or IMPS/2) and <c>ZAxisMapping</c> (which allows for the |
| 118 |
+options: <c>Protocol</c> (which lists the mouse protocol to be used -- most |
| 119 |
+users will use PS/2 or IMPS/2) and <c>ZAxisMapping</c> (which allows for the |
| 120 |
mousewheel (if applicable) to be used). |
| 121 |
</p> |
| 122 |
|
| 123 |
|
| 124 |
|
| 125 |
|
| 126 |
-- |
| 127 |
gentoo-doc-cvs@g.o mailing list |
Archives