svn merge ^/branches/released .

1 files changed, 58 insertions, 58 deletions

diff --git a/libX11/man/xkb/XkbFreeGeomKeys.man b/libX11/man/xkb/XkbFreeGeomKeys.man
index 3c2f768e1..6cca62fc6 100644
--- a/libX11/man/xkb/XkbFreeGeomKeys.man
+++ b/libX11/man/xkb/XkbFreeGeomKeys.man
@@ -1,58 +1,58 @@
-.\" Copyright 1999 Sun Microsystems, Inc.  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 XkbFreeGeomKeys __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
-.SH NAME
-XkbFreeGeomKeys \-  Free geometry keys
-.SH SYNOPSIS
-.HP
-.B void XkbFreeGeomKeys
-.BI "(\^XkbRowPtr " "row" "\^,"
-.BI "int " "first" "\^,"
-.BI "int " "count" "\^,"
-.BI "Bool " "free_all" "\^);"
-.if n .ti +5n
-.if t .ti +.5i
-.SH ARGUMENTS
-.TP
-.I \- row
-row in which keys should be freed 
-.TP
-.I \- first
-first key to be freed
-.TP
-.I \- count
-number of keys to be freed
-.TP
-.I \- free_all
-True => all keys are freed
-.SH DESCRIPTION
-.LP
-If 
-.I free_all 
-is True, all keys are freed regardless of the value of 
-.I first 
-or 
-.I count. 
-Otherwise, 
-.I count 
-keys are freed beginning with the one specified by 
-.I first.
+.\" 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 XkbFreeGeomKeys __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"

+.SH NAME

+XkbFreeGeomKeys \-  Free geometry keys

+.SH SYNOPSIS

+.HP

+.B void XkbFreeGeomKeys

+.BI "(\^XkbRowPtr " "row" "\^,"

+.BI "int " "first" "\^,"

+.BI "int " "count" "\^,"

+.BI "Bool " "free_all" "\^);"

+.if n .ti +5n

+.if t .ti +.5i

+.SH ARGUMENTS

+.TP

+.I \- row

+row in which keys should be freed 

+.TP

+.I \- first

+first key to be freed

+.TP

+.I \- count

+number of keys to be freed

+.TP

+.I \- free_all

+True => all keys are freed

+.SH DESCRIPTION

+.LP

+If 

+.I free_all 

+is True, all keys are freed regardless of the value of 

+.I first 

+or 

+.I count. 

+Otherwise, 

+.I count 

+keys are freed beginning with the one specified by 

+.I first.