[xserver-commit] cygwin-x-doc/faq config.xml,1.5,1.6 cygwin-xfree-faq.xml,1.13,1.14 i18n.xml,1.1,1.2

[Alexander Gottwald]

Committed by: ago

Update of /cvs/xserver/cygwin-x-doc/faq
In directory pdx:/tmp/cvs-serv7193

Modified Files:
	config.xml cygwin-xfree-faq.xml i18n.xml 
Log Message:
Replaced XF86Config with the new commandline options.


Index: config.xml
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/faq/config.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/config.xml	4 Jan 2004 15:31:43 -0000	1.5
+++ b/config.xml	29 Feb 2004 14:20:53 -0000	1.6
@@ -7,9 +7,10 @@
 </question>
 
 <answer>
-<para>There is limited support for configuration via XF86Config. This
-includes the path settings for FontPath and RgbPath and the
-configuration of on U.S. keyboard layouts. For more information see
+<para>The configfile support was only limited. Because of this and extra
+dependencies it was removed again. But most of the options which were 
+configurable in the configfile are now available as commandline options.
+For more information on configuring other keyboard layout see
 <xref linkend="q-non-U.S.-keyboard-layout"></xref></para>
 </answer>
 </qandaentry>

Index: cygwin-xfree-faq.xml
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/faq/cygwin-xfree-faq.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- a/cygwin-xfree-faq.xml	28 Feb 2004 03:45:23 -0000	1.13
+++ b/cygwin-xfree-faq.xml	29 Feb 2004 14:20:53 -0000	1.14
@@ -63,9 +63,6 @@
 <!ENTITY atw-home "http://www.answersthatwork.com/">
 <!ENTITY atw-url-tasklist-a "http://www.answersthatwork.com/Tasklist_pages/tasklist_a.htm">
 <!ENTITY atw-title-tasklist-a "Task List Programs - A">
-
-<!-- Configfiles -->
-<!ENTITY sample-xf86config "http://www.tu-chemnitz.de/~goal/xfree/XF86Config.bz2">
 ]>
 
 <article class="faq" id="cygwin-xfree-faq">
@@ -96,6 +93,13 @@
 <revhistory id="revision-history">
 
 <revision>
+<revnumber>1.0.13</revnumber>
+<date>2004-02-29</date>
+<authorinitials>alexander.gottwald@s1999.tu-chemnitz.de</authorinitials>
+<revremark>Replaced XF86Config with the new commandline options.</revremark>
+</revision>
+
+<revision>
 <revnumber>1.0.12</revnumber>
 <date>2004-02-28</date>
 <authorinitials>alexander.gottwald@s1999.tu-chemnitz.de</authorinitials>

Index: i18n.xml
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/faq/i18n.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/i18n.xml	4 Jan 2004 15:31:43 -0000	1.1
+++ b/i18n.xml	29 Feb 2004 14:20:53 -0000	1.2
@@ -13,28 +13,22 @@
 Some keyboard layouts are configured according to the Windows keyboard settings.
 For these layouts no special change is needed.
 
-For all other layouts there is the possibility to configure the layout via a
-configfile. A sample file can be obtained from <ulink 
-url="&sample-xf86config;">here</ulink>. Unpack the file and copy it to 
-<filename>/etc/X11/XF86Config</filename>.
-<screen>
-$ cd /tmp
-$ wget &sample-xf86config;
-$ bzip2 -d XF86Config.bz2
-$ cp XF86Config /etc/X11/XF86Config
-</screen>
+For all other layouts there is the possibility to configure the layout via 
+commandline options.
 </para>
 <para>
-The sample configures a german layout. To configure it for your layout, change
-these lines from the <quote>InputDevice</quote> section.
-<screen>
-    Option "XkbRules"   "xfree86"
-    Option "XkbModel"   "pc105"
-    Option "XkbLayout"  "<replaceable>de</replaceable>"
-</screen>
-Instead of <quote>de</quote> set <quote>XkbLayout</quote> to the code which
-represents your keyboard layout (e.g. Australia = au, Deutschland = de,
-France = fr, Japan = jp, United Kingdom = uk).
+The mainoption for changing the layout is 
+<parameter>-xkblayout <replaceable>countrycode</replaceable></parameter> 
+where <replaceable>countrycode</replaceable> is in most cases the 2 character
+code which also represents the country in internet adresses (e.g. 
+Australia = au, Deutschland = de, France = fr, Japan = jp, United Kingdom = uk).
+</para>
+<para>
+Other options for tweaking the XKB layout are
+<parameter>-xkbmodel</parameter>,<parameter>-xkbvariant</parameter>,
+<parameter>-xkboptions</parameter> and <parameter>-xkbrules</parameter>. 
+These are the counterparts for the similar named options known from the 
+XF86Config file.
 </para>
 <para>If the loading fails, check <xref linkend="q-xkb-not-working"></xref>
 </para>