Merge remote-tracking branch 'origin/released'

* origin/released:
  Changed file permissions
  dos -> unix

Conflicts:
	libX11/include/X11/Xregion.h
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/StrKeysym.c
	libX11/src/Window.c
	libX11/src/xkb/XKBBind.c
	libX11/src/xkb/XKBGetMap.c
	libX11/src/xkb/XKBSetGeom.c
	libX11/src/xkb/XKBUse.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libXdmcp/Key.c
	libXdmcp/Write.c
	libxcb/src/xcb_windefs.h
	xkbcomp/keycodes.c
	xkbcomp/xkbpath.c
	xorg-server/hw/xwin/glx/winpriv.h
	xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml_s.sh
	xorg-server/xkeyboard-config/rules/bin/mln_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

1 files changed, 22 insertions, 22 deletions

diff --git a/xorg-server/xkeyboard-config/docs/HOWTO.testing b/xorg-server/xkeyboard-config/docs/HOWTO.testing
index 5ab9dd477..01aa0500c 100644
--- a/xorg-server/xkeyboard-config/docs/HOWTO.testing
+++ b/xorg-server/xkeyboard-config/docs/HOWTO.testing
@@ -1,22 +1,22 @@
-A mini-HOWTO test the XKB config without modifying the system configuration.

-(Only tested with XFree86 4.3+.) 

-

-First see what your configuration is. Note the model and layout.

-   $ setxkbmap -print

-

-Then unpack the sources locally ...

-   $ gzip -dc xkeyboard-config*.tar.gz | tar -tf -

-... and change to the delivered directory

-   $ cd xkeyboard-config-<version>

-

-Then try to load the current keyboard using the local rules

-   $ setxkbmap -v 10 -I$PWD -rules base

-

-Now try to set different keyboards using the -model and -layout.

-   $ setxkbmap -v 10 -I$PWD -rules base -model pc102 -layout intl

-Look in the file rules/base for other example models and layouts

-

-If there was a problem, you can reset the keyboard like so:

-   $ setxkbmap -rules xfree86 -model <noted model> -layout <noted layout>

-

-If that doesn't work, you may have to log out and log back in.

+A mini-HOWTO test the XKB config without modifying the system configuration.
+(Only tested with XFree86 4.3+.) 
+
+First see what your configuration is. Note the model and layout.
+   $ setxkbmap -print
+
+Then unpack the sources locally ...
+   $ gzip -dc xkeyboard-config*.tar.gz | tar -tf -
+... and change to the delivered directory
+   $ cd xkeyboard-config-<version>
+
+Then try to load the current keyboard using the local rules
+   $ setxkbmap -v 10 -I$PWD -rules base
+
+Now try to set different keyboards using the -model and -layout.
+   $ setxkbmap -v 10 -I$PWD -rules base -model pc102 -layout intl
+Look in the file rules/base for other example models and layouts
+
+If there was a problem, you can reset the keyboard like so:
+   $ setxkbmap -rules xfree86 -model <noted model> -layout <noted layout>
+
+If that doesn't work, you may have to log out and log back in.