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

diff --git a/libX11/man/xkb/XkbAllocGeomShapes.man b/libX11/man/xkb/XkbAllocGeomShapes.man
index 54a24dce5..2b7d50f3d 100644
--- a/libX11/man/xkb/XkbAllocGeomShapes.man
+++ b/libX11/man/xkb/XkbAllocGeomShapes.man
@@ -1,74 +1,74 @@
-.\" 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 XkbAllocGeomShapes __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"

-.SH NAME

-XkbAllocGeomShapes \- Allocate space for an arbitrary number of geometry shapes

-.SH SYNOPSIS

-.HP

-.B Status XkbAllocGeomShapes

-.BI "(\^XkbGeometryPtr " "geom" "\^,"

-.BI "int " "num_needed" "\^);"

-.if n .ti +5n

-.if t .ti +.5i

-.SH ARGUMENTS

-.TP

-.I \- geom

-geometry for which shapes should be allocated

-.TP

-.I \- num_needed

-number of new shapes required

-.SH DESCRIPTION

-.LP

-Xkb provides a number of functions to allocate and free subcomponents of a 

-keyboard geometry. Use these functions to create or modify keyboard geometries. 

-Note that these functions merely allocate space for the new element(s), and it 

-is up to you to fill in the values explicitly in your code. These allocation 

-functions increase 

-.I sz_* 

-but never touch 

-.I num_* 

-(unless there is an allocation failure, in which case they reset both 

-.I sz_* 

-and 

-.I num_* 

-to zero). These functions return Success if they succeed, BadAlloc if they are 

-not able to allocate space, or BadValue if a parameter is not as expected.

-

-.I XkbAllocGeomShapes 

-allocates space for 

-.I num_needed 

-shapes in the specified geometry 

-.I geom. 

-The shapes are not initialized.

-

-To free geometry shapes, use 

-.I XkbFreeGeomShapes.

-.SH DIAGNOSTICS

-.TP 15

-.B BadAlloc

-Unable to allocate storage

-.TP 15

-.B BadValue

-An argument is out of range

-.SH "SEE ALSO"

-.BR XkbFreeGeomShapes (__libmansuffix__)

-

+.\" 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 XkbAllocGeomShapes __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
+.SH NAME
+XkbAllocGeomShapes \- Allocate space for an arbitrary number of geometry shapes
+.SH SYNOPSIS
+.HP
+.B Status XkbAllocGeomShapes
+.BI "(\^XkbGeometryPtr " "geom" "\^,"
+.BI "int " "num_needed" "\^);"
+.if n .ti +5n
+.if t .ti +.5i
+.SH ARGUMENTS
+.TP
+.I \- geom
+geometry for which shapes should be allocated
+.TP
+.I \- num_needed
+number of new shapes required
+.SH DESCRIPTION
+.LP
+Xkb provides a number of functions to allocate and free subcomponents of a 
+keyboard geometry. Use these functions to create or modify keyboard geometries. 
+Note that these functions merely allocate space for the new element(s), and it 
+is up to you to fill in the values explicitly in your code. These allocation 
+functions increase 
+.I sz_* 
+but never touch 
+.I num_* 
+(unless there is an allocation failure, in which case they reset both 
+.I sz_* 
+and 
+.I num_* 
+to zero). These functions return Success if they succeed, BadAlloc if they are 
+not able to allocate space, or BadValue if a parameter is not as expected.
+
+.I XkbAllocGeomShapes 
+allocates space for 
+.I num_needed 
+shapes in the specified geometry 
+.I geom. 
+The shapes are not initialized.
+
+To free geometry shapes, use 
+.I XkbFreeGeomShapes.
+.SH DIAGNOSTICS
+.TP 15
+.B BadAlloc
+Unable to allocate storage
+.TP 15
+.B BadValue
+An argument is out of range
+.SH "SEE ALSO"
+.BR XkbFreeGeomShapes (__libmansuffix__)
+