svn merge ^/branches/released .

1 files changed, 60 insertions, 60 deletions

diff --git a/libX11/man/xkb/XkbSAGroup.man b/libX11/man/xkb/XkbSAGroup.man
index 0fefe7c27..2c80bfe30 100644
--- a/libX11/man/xkb/XkbSAGroup.man
+++ b/libX11/man/xkb/XkbSAGroup.man
@@ -1,60 +1,60 @@
-'\" t
-.\" 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 XkbSAGroup __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
-.SH NAME
-XkbSAGroup \- Returns the group_XXX field of act converted to a signed int
-.SH SYNOPSIS
-.HP
-.B int XkbSAGroup
-.BI "(\^XkbAction " "act" "\^);"
-.if n .ti +5n
-.if t .ti +.5i
-.SH ARGUMENTS
-.TP
-.I \- act
-action from which to extract group
-.SH DESCRIPTION
-.LP
-.I XkbSAGroup 
-returns the 
-.I group_XXX 
-field of 
-.I act 
-converted to a signed int. 
-.SH STRUCTURE
-.LP
-Actions associated with the XkbGroupAction structure change the current group 
-state when keys are 
-pressed and released:
-.nf
-
-    typedef struct _XkbGroupAction {
-        unsigned char    type;       /\(** XkbSA_{Set|Latch|Lock}Group */
-        unsigned char    flags;      /\(** with type, controls the effect on groups 
-*/
-        char             group_XXX;  /\(** represents a group index or delta */
-    } XkbGroupAction;
-   
-.SH WARNING
-.LP
-This manpage seems to be incomplete
+'\" t

+.\" 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 XkbSAGroup __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"

+.SH NAME

+XkbSAGroup \- Returns the group_XXX field of act converted to a signed int

+.SH SYNOPSIS

+.HP

+.B int XkbSAGroup

+.BI "(\^XkbAction " "act" "\^);"

+.if n .ti +5n

+.if t .ti +.5i

+.SH ARGUMENTS

+.TP

+.I \- act

+action from which to extract group

+.SH DESCRIPTION

+.LP

+.I XkbSAGroup 

+returns the 

+.I group_XXX 

+field of 

+.I act 

+converted to a signed int. 

+.SH STRUCTURE

+.LP

+Actions associated with the XkbGroupAction structure change the current group 

+state when keys are 

+pressed and released:

+.nf

+

+    typedef struct _XkbGroupAction {

+        unsigned char    type;       /\(** XkbSA_{Set|Latch|Lock}Group */

+        unsigned char    flags;      /\(** with type, controls the effect on groups 

+*/

+        char             group_XXX;  /\(** represents a group index or delta */

+    } XkbGroupAction;

+   

+.SH WARNING

+.LP

+This manpage seems to be incomplete