Merge remote-tracking branch 'origin/released'

Conflicts:
	libfontenc/src/fontenc.c

1 files changed, 86 insertions, 86 deletions

diff --git a/libXext/man/DPMSInfo.man b/libXext/man/DPMSInfo.man
index b1272eaca..31ab29cfb 100644
--- a/libXext/man/DPMSInfo.man
+++ b/libXext/man/DPMSInfo.man
@@ -1,86 +1,86 @@
-.\" Copyright \(co Digital Equipment Corporation, 1996

-.\" 

-.\" Permission to use, copy, modify, distribute, and sell this

-.\" documentation for any purpose is hereby granted without fee,

-.\" provided that the above copyright notice and this permission

-.\" notice appear in all copies.  Digital Equipment Corporation

-.\" makes no representations about the suitability for any purpose

-.\" of the information in this document.  This documentation is

-.\" provided ``as is'' without express or implied warranty.

-.\"

-.\" Copyright (c) 1999, 2005, 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.

-.\"

-.\" X Window System is a trademark of The Open Group.

-.\" 

-.TH DPMSInfo __libmansuffix__ __xorgversion__ "X FUNCTIONS"

-.SH NAME

-DPMSInfo \- returns information about the current DPMS state

-.SH SYNOPSIS

-.PP

-.nf

-\fBcc\fR [ \fIflag\fR \&.\&.\&. ] \fIfile\fR \&.\&.\&. -\fBlXext\fR [ \fIlibrary\fR \&.\&.\&. ]

-\&#include <X11/extensions/dpms.h>

-.HP

-.B Status DPMSInfo

-(

-.br

-      Display \fI*display\fP\^,

-.br

-      CARD16 \fI*power_level\fP\^,

-.br

-      BOOL \fI*state\fP\^ 

-);

-.if n .ti +5n

-.if t .ti +.5i

-.SH ARGUMENTS

-.TP

-.I display

-Specifies the connection to the X server

-.TP

-.I power_level

-Specifies the current power level

-.TP

-.I state

-Specifies the current DPMS state

-.SH DESCRIPTION

-.LP

-The 

-.I DPMSInfo 

-function returns information about the current Display Power Management 

-Signaling (DPMS) state. The \fIstate\fP 

-return parameter indicates whether or not DPMS is enabled \^(TRUE\^) or

-disabled \^(FALSE\^). The \fIpower_level\fP return parameter indicates the 

-current power level \^(one of DPMSModeOn, DPMSModeStandby, DPMSModeSuspend, or

-DPMSModeOff.\^)

-.SH "RETURN VALUES"

-.TP 15

-TRUE

-The 

-.I DPMSInfo 

-function returns TRUE, if values are returned.

-.TP 15

-FALSE

-The 

-.I DPMSInfo 

-function returns FALSE, if no values are returned.

-.SH "SEE ALSO"

-.BR DPMSEnable (__libmansuffix__)

+.\" Copyright \(co Digital Equipment Corporation, 1996
+.\"
+.\" Permission to use, copy, modify, distribute, and sell this
+.\" documentation for any purpose is hereby granted without fee,
+.\" provided that the above copyright notice and this permission
+.\" notice appear in all copies.  Digital Equipment Corporation
+.\" makes no representations about the suitability for any purpose
+.\" of the information in this document.  This documentation is
+.\" provided ``as is'' without express or implied warranty.
+.\"
+.\" Copyright (c) 1999, 2005, 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.
+.\"
+.\" X Window System is a trademark of The Open Group.
+.\"
+.TH DPMSInfo __libmansuffix__ __xorgversion__ "X FUNCTIONS"
+.SH NAME
+DPMSInfo \- returns information about the current DPMS state
+.SH SYNOPSIS
+.PP
+.nf
+\fBcc\fR [ \fIflag\fR \&.\&.\&. ] \fIfile\fR \&.\&.\&. -\fBlXext\fR [ \fIlibrary\fR \&.\&.\&. ]
+\&#include <X11/extensions/dpms.h>
+.HP
+.B Status DPMSInfo
+(
+.br
+      Display \fI*display\fP\^,
+.br
+      CARD16 \fI*power_level\fP\^,
+.br
+      BOOL \fI*state\fP\^
+);
+.if n .ti +5n
+.if t .ti +.5i
+.SH ARGUMENTS
+.TP
+.I display
+Specifies the connection to the X server
+.TP
+.I power_level
+Specifies the current power level
+.TP
+.I state
+Specifies the current DPMS state
+.SH DESCRIPTION
+.LP
+The
+.I DPMSInfo
+function returns information about the current Display Power Management
+Signaling (DPMS) state. The \fIstate\fP
+return parameter indicates whether or not DPMS is enabled \^(TRUE\^) or
+disabled \^(FALSE\^). The \fIpower_level\fP return parameter indicates the
+current power level \^(one of DPMSModeOn, DPMSModeStandby, DPMSModeSuspend, or
+DPMSModeOff.\^)
+.SH "RETURN VALUES"
+.TP 15
+TRUE
+The
+.I DPMSInfo
+function returns TRUE, if values are returned.
+.TP 15
+FALSE
+The
+.I DPMSInfo
+function returns FALSE, if no values are returned.
+.SH "SEE ALSO"
+.BR DPMSEnable (__libmansuffix__)