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, 100 insertions, 100 deletions

diff --git a/libX11/man/xkb/XkbSetAutoResetControls.man b/libX11/man/xkb/XkbSetAutoResetControls.man
index a3956f60f..ecaf891f8 100644
--- a/libX11/man/xkb/XkbSetAutoResetControls.man
+++ b/libX11/man/xkb/XkbSetAutoResetControls.man
@@ -1,100 +1,100 @@
-.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved.

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining a

-.\" copy of this software and associated documentation files (the "Software"),

-.\" to deal in the Software without restriction, including without limitation

-.\" the rights to use, copy, modify, merge, publish, distribute, sublicense,

-.\" and/or sell copies of the Software, and to permit persons to whom the

-.\" Software is furnished to do so, subject to the following conditions:

-.\"

-.\" The above copyright notice and this permission notice (including the next

-.\" paragraph) shall be included in all copies or substantial portions of the

-.\" Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

-.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

-.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

-.\" DEALINGS IN THE SOFTWARE.

-.\"

-.TH XkbSetAutoResetControls __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"

-.SH NAME

-XkbSetAutoResetControls \- Changes the current values of the AutoReset control 

-attributes

-.SH SYNOPSIS

-.HP

-.B Bool XkbSetAutoResetControls

-.BI "(\^Display *" "dpy" "\^,"

-.BI "unsigned int " "changes" "\^,"

-.BI "unsigned int *" "auto_ctrls" "\^,"

-.BI "unsigned int *" "auto_values" "\^);"

-.if n .ti +5n

-.if t .ti +.5i

-.SH ARGUMENTS

-.TP

-.I \- dpy

-connection to X server

-.TP

-.I \- changes

-controls for which to change auto-reset values

-.TP

-.I \- auto_ctrls

-controls from changes that should auto reset 

-.TP

-.I \- auto_values

-1 bit => auto-reset on

-.SH DESCRIPTION

-.LP

-.I XkbSetAutoResetControls 

-changes the auto-reset status and associated auto-reset values for the controls 

-selected by 

-.I changes. 

-For any control selected by 

-.I changes, 

-if the corresponding bit is set in 

-.I auto_ctrls, 

-the control is configured to auto-reset when the client exits. If the 

-corresponding bit in 

-.I auto_values 

-is on, the control is turned on when the client exits; if zero, the control is 

-turned off when the client exits. For any control selected by 

-.I changes, 

-if the corresponding bit is not set in 

-.I auto_ctrls, 

-the control is configured to not reset when the client exits. 

-

-For example:

-

-.nf

-To leave the auto-reset controls for StickyKeys the way they are:

-

-	ok = XkbSetAutoResetControls(dpy, 0, 0, 0);

-	

-To change the auto-reset controls so that StickyKeys are unaffected when the 

-client exits:

-

-	ok = XkbSetAutoResetControls(dpy, XkbStickyKeysMask, 0, 0);

-	

-To change the auto-reset controls so that StickyKeys are turned off when the 

-client exits:

-

-	ok = XkbSetAutoResetControls(dpy, XkbStickyKeysMask, XkbStickyKeysMask, 0);

-	

-To change the auto-reset controls so that StickyKeys are turned on when the 

-client exits:

-

-	ok = XkbSetAutoResetControls(dpy, XkbStickyKeysMask, XkbStickyKeysMask, 

-XkbStickyKeysMask);

-

-.fi

-.I XkbSetAutoResetControls 

-backfills 

-.I auto_ctrls 

-and 

-.I auto_values 

-with the auto-reset controls for this particular client. Note that all of the 

-bits are valid in the returned values, not just the ones selected in the 

-.I changes 

-mask.

+.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved.
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining a
+.\" copy of this software and associated documentation files (the "Software"),
+.\" to deal in the Software without restriction, including without limitation
+.\" the rights to use, copy, modify, merge, publish, distribute, sublicense,
+.\" and/or sell copies of the Software, and to permit persons to whom the
+.\" Software is furnished to do so, subject to the following conditions:
+.\"
+.\" The above copyright notice and this permission notice (including the next
+.\" paragraph) shall be included in all copies or substantial portions of the
+.\" Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+.\" DEALINGS IN THE SOFTWARE.
+.\"
+.TH XkbSetAutoResetControls __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
+.SH NAME
+XkbSetAutoResetControls \- Changes the current values of the AutoReset control 
+attributes
+.SH SYNOPSIS
+.HP
+.B Bool XkbSetAutoResetControls
+.BI "(\^Display *" "dpy" "\^,"
+.BI "unsigned int " "changes" "\^,"
+.BI "unsigned int *" "auto_ctrls" "\^,"
+.BI "unsigned int *" "auto_values" "\^);"
+.if n .ti +5n
+.if t .ti +.5i
+.SH ARGUMENTS
+.TP
+.I \- dpy
+connection to X server
+.TP
+.I \- changes
+controls for which to change auto-reset values
+.TP
+.I \- auto_ctrls
+controls from changes that should auto reset 
+.TP
+.I \- auto_values
+1 bit => auto-reset on
+.SH DESCRIPTION
+.LP
+.I XkbSetAutoResetControls 
+changes the auto-reset status and associated auto-reset values for the controls 
+selected by 
+.I changes. 
+For any control selected by 
+.I changes, 
+if the corresponding bit is set in 
+.I auto_ctrls, 
+the control is configured to auto-reset when the client exits. If the 
+corresponding bit in 
+.I auto_values 
+is on, the control is turned on when the client exits; if zero, the control is 
+turned off when the client exits. For any control selected by 
+.I changes, 
+if the corresponding bit is not set in 
+.I auto_ctrls, 
+the control is configured to not reset when the client exits. 
+
+For example:
+
+.nf
+To leave the auto-reset controls for StickyKeys the way they are:
+
+	ok = XkbSetAutoResetControls(dpy, 0, 0, 0);
+	
+To change the auto-reset controls so that StickyKeys are unaffected when the 
+client exits:
+
+	ok = XkbSetAutoResetControls(dpy, XkbStickyKeysMask, 0, 0);
+	
+To change the auto-reset controls so that StickyKeys are turned off when the 
+client exits:
+
+	ok = XkbSetAutoResetControls(dpy, XkbStickyKeysMask, XkbStickyKeysMask, 0);
+	
+To change the auto-reset controls so that StickyKeys are turned on when the 
+client exits:
+
+	ok = XkbSetAutoResetControls(dpy, XkbStickyKeysMask, XkbStickyKeysMask, 
+XkbStickyKeysMask);
+
+.fi
+.I XkbSetAutoResetControls 
+backfills 
+.I auto_ctrls 
+and 
+.I auto_values 
+with the auto-reset controls for this particular client. Note that all of the 
+bits are valid in the returned values, not just the ones selected in the 
+.I changes 
+mask.