X Strike Force X.Org X11 SVN commit: r509 - in trunk/debian: . patches/general
Author: ender
Date: 2005-08-08 11:19:12 -0500 (Mon, 08 Aug 2005)
New Revision: 509
Modified:
trunk/debian/changelog
trunk/debian/patches/general/025b_xkb_README_typos.diff
Log:
- Corrected more typos in xkb's README.config. Thanks, Adrian von Bidder (closes: #321946).
- Fixed bad reference to patch number for above fix in changelog.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-08-08 14:49:04 UTC (rev 508)
+++ trunk/debian/changelog 2005-08-08 16:19:12 UTC (rev 509)
@@ -48,7 +48,7 @@
Closes: #318629
* Re-enable building HTML docs
- Remove patch general/057_X11.tmpl_warning_fix.diff to allow this
- * Introduce replace_conffile_with_symlink_{prepare,commit,rollback}
+ * Introduce replace_conffile_with_symlink_{prepare,commit,rollback}
functions to debian/shell-lib.sh. Switch handling of symlinks to
them.
* Add link from /etc/X11/xkb/rules/xorg.lst to
@@ -57,7 +57,7 @@
* Add /etc/X11/xkb/rules/xfree86.xml symlink to symlink handling.
* Check old version of package in postrm in case of abort-install or
abort-upgrade so we do not remove new config in the case of failed
- install/upgrade from not so old version.
+ install/upgrade from not so old version.
[ Julien Cristau ]
* Clean up FAQ to refer to X.Org instead of XFree86. Closes: #319407
@@ -81,8 +81,9 @@
- Fixed typo in bitmap manpage (closes: #306706).
- Fixed typo in xedit manpage (closes: #306707).
- Fixed typo in xvinfo manpage (closes: #306709).
- * Added patches/general/026_xc_programs_manpage_overhaul.diff: Fixed
- typos in XKB's README.config. Thanks, Daniel Hulme (closes: #315555).
+ * Added patches/general/general/025b_xkb_README_typos.diff: Fixed
+ typos in XKB's README.config. Thanks, Daniel Hulme and Adrian von Bidder
+ (closes: #315555, #321946).
* Updated Spanish translation.
* Updated French translation. Thanks, Christian Perrier (closes:
#319448).
@@ -129,7 +130,7 @@
only two levels, so people prefer to have a 2nd Alt key rather
than a useless AltGr. Thanks Adam C Powell IV. Closes: #258399
- -- Branden Robinson <branden@debian.org> Fri, 5 Aug 2005 17:20:49 -0500
+ -- David Martínez Moreno <ender@debian.org> Mon, 8 Aug 2005 17:56:55 +0200
xorg-x11 (6.8.2.dfsg.1-4) unstable; urgency=low
Modified: trunk/debian/patches/general/025b_xkb_README_typos.diff
===================================================================
--- trunk/debian/patches/general/025b_xkb_README_typos.diff 2005-08-08 14:49:04 UTC (rev 508)
+++ trunk/debian/patches/general/025b_xkb_README_typos.diff 2005-08-08 16:19:12 UTC (rev 509)
@@ -2,19 +2,25 @@
Index: xc/programs/xkbcomp/README.config
===================================================================
---- xc/programs/xkbcomp/README.config.orig 2005-08-01 03:46:18.000000000 +0200
-+++ xc/programs/xkbcomp/README.config 2005-08-01 04:32:51.000000000 +0200
-@@ -7,7 +7,7 @@
+--- xc/programs/xkbcomp/README.config.orig 2005-08-04 17:11:47.354312798 +0200
++++ xc/programs/xkbcomp/README.config 2005-08-08 17:56:17.708251673 +0200
+@@ -7,19 +7,19 @@
Abstract
This document describes how to configure X11R6.8.2 XKB from a
- user's point a few. It converts basic configuration syntax and
-+ user's point of view. It converts basic configuration syntax and
- gives also a few examples.
+- gives also a few examples.
++ user's point of view. It covers basic configuration syntax and
++ also gives a few examples.
1. Overview
-@@ -19,7 +19,7 @@
+ The XKB configuration is decomposed into a number of components. Selecting
+ proper parts and combining them back you can achieve most of configurations
+ you might need. Unless you have a completely atypical keyboard you really
+-don't need to touch any of xkb configuration files.
++don't need to touch any of xkb's configuration files.
+
2. Selecting XKB Configuration
-The easiest and the most natural way how to specify a keyboard mapping is to
@@ -22,12 +28,98 @@
use rules component. As its name suggests it describes a number of general
rules how to combine all bits and pieces into a valid and useful keyboard
mapping. All you need to do is to select a suitable rules file and then to
-@@ -45,7 +45,7 @@
+@@ -30,24 +30,24 @@
+ o XkbRules - files of rules to be used for keyboard mapping composition
+
+- o XkbModel - name of model of your keyboard type
++ o XkbModel - name of the model of your keyboard
+
+ o XkbLayout - layout(s) you intend to use
+
+- o XkbVariant - variant(s) of layout you intend to use
++ o XkbVariant - variant(s) of the layout you intend to use
+
+ o XkbOptions - extra xkb configuration options
+
+ The proper rules file depends on your vendor. In reality, the commonest file
+ of rules is xorg. For each rules file there is a description file named <ven-
+-dor-rules>.lst, for instance xorg.lst which is located in xkb configuration
++dor-rules>.lst, for instance xorg.lst which is located in the xkb configuration
+ subdirectory rules (for example /etc/X11/xkb/rules).
+
2.1 Basic Configuration
-Let's say you want to configure a PC style America keyboard with 104 keys as
+-described in xorg.lst. It can be done by simply writing several lines from
+-below to you xorg.conf configuration file (previously known as
+Let's say you want to configure a PC-style American keyboard with 104 keys as
- described in xorg.lst. It can be done by simply writing several lines from
- below to you xorg.conf configuration file (previously known as
++described in xorg.lst. This can be done by simply writing several lines from
++below to your /etc/X11/xorg.conf configuration file (previously known as
/etc/X11/XF86Config-4 or /etc/X11/XF86Config):
+
+ Section "InputDevice"
+@@ -59,17 +59,16 @@
+ Option "XKbOptions" ""
+ EndSection
+
+-The values of parameters XkbModel and XkbLayout are really not surprising.
+-The parameters XkbOptions has been explicitly set to empty set of parameters.
+-The parameter XkbVariant has been left out. That means the default variant
+-named basic is loaded.
++The values of XkbModel and XkbLayout are really not surprising. XkbOptions
++has been explicitly set to the empty value. The parameter XkbVariant has
++been left out. That means the default variant named basic is loaded.
+
+-Of course, this can be also done at runtime using utility setxkbmap. Shell
+-command loading the same keyboard mapping would look like:
++Of course, this can also be done at runtime using utility setxkbmap. The
++shell command loading the same keyboard mapping would look like:
+
+ setxkbmap -rules xorg -model pc104 -layout us -option ""
+
+-The configuration and the shell command would be very analogical for most
++The configuration and the shell command would be very analogous for most
+ other layouts (internationalized mappings).
+
+ 2.2 Advanced Configuration
+@@ -81,8 +80,8 @@
+ keys.
+
+ Let's say you want to configure your new Logitech cordless desktop keyboard,
+-you intend to use three different layouts at the same time - us, czech and
+-german (in this order), and that you are used to Alt-Shift combination for
++you intend to use three different layouts at the same time - US, Czech and
++German (in this order), and that you are used to the Alt-Shift combination for
+ switching among them.
+
+ Then the configuration snippet could look like this:
+@@ -96,8 +95,8 @@
+ Option "XKbOptions" "grp:alt_shift_toggle"
+ EndSection
+
+-Of course, this can be also done at runtime using utility setxkbmap. Shell
+-command loading the same keyboard mapping would look like:
++Of course, this can also be done at runtime using utility setxkbmap. The
++shell command loading the same keyboard mapping would look like:
+
+ setxkbmap -rules xorg -model logicordless -layout "us,cz,de" \
+ -option "grp:alt_shift_toggle"
+@@ -123,7 +122,7 @@
+ left out (set to basic), the second is set to bksl (a special variant with an
+ enhanced definition of the backslash key).
+
+-Analogically, the loading runtime will change to:
++Analogous, the loading runtime will change to:
+
+ setxkmap -rules xorg -model logicordless -layout "us,cz,de" \
+ -variant ",bksl," -option "grp:alt_shift_toggle"
+@@ -190,7 +189,7 @@
+ keymap file which specified the direct xkb configuration. This method has
+ been obsoleted by previously described rules files which are far more flexi-
+ ble and allow simpler and more intuitive syntax. It is preserved merely for
+-compatibility reasons. Avoid using it if it is possible.
++compatibility reasons. Avoid using it if possible.
+
+
+ $XdotOrg: xc/programs/xkbcomp/README.config,v 1.3.2.2 2005/02/08 00:44:27 kem Exp $
Reply to: