Merge remote-tracking branch 'origin/released'

Conflicts:
	libfontenc/src/fontenc.c

1 files changed, 65 insertions, 65 deletions

diff --git a/libXext/man/DPMSDisable.man b/libXext/man/DPMSDisable.man
index eeca6cbd2..efc1405f2 100644
--- a/libXext/man/DPMSDisable.man
+++ b/libXext/man/DPMSDisable.man
@@ -1,65 +1,65 @@
-.\" 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.

-.\"

-.TH DPMSDisable __libmansuffix__ __xorgversion__ "X FUNCTIONS"

-.SH NAME

-DPMSDisable \- disables DPMS on the specified display

-.SH SYNOPSIS

-.PP

-.nf

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

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

-.HP

-.BR "Status DPMSDisable" " ( Display \fI*display\fP\^ );"

-.if n .ti +5n

-.if t .ti +.5i

-.SH ARGUMENTS

-.TP

-.I display

-Specifies the connection to the X server

-.SH DESCRIPTION

-.LP

-The 

-.I DPMSDisable 

-function disables Display Power Management Signaling (DPMS) on the specified

-display.  When disabled, DPMS sets the display to DPMSModeOn.  If 

-.I DPMSDisable 

-is invoked on a display with DPMS already disabled or on a display which does 

-not support DPMS, no change is made and no error is returned.

-.SH "RETURN VALUES"

-.TP 15

-TRUE

-The 

-.I DPMSDisable 

-function always returns TRUE.

-.SH "SEE ALSO"

-.BR DPMSCapable (__libmansuffix__),

-.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.
+.\"
+.TH DPMSDisable __libmansuffix__ __xorgversion__ "X FUNCTIONS"
+.SH NAME
+DPMSDisable \- disables DPMS on the specified display
+.SH SYNOPSIS
+.PP
+.nf
+\fBcc\fR [ \fIflag\fR \&.\&.\&. ] \fIfile\fR \&.\&.\&. -\fBlXext\fR [ \fIlibrary\fR \&.\&.\&. ]
+\&#include <X11/extensions/dpms.h>
+.HP
+.BR "Status DPMSDisable" " ( Display \fI*display\fP\^ );"
+.if n .ti +5n
+.if t .ti +.5i
+.SH ARGUMENTS
+.TP
+.I display
+Specifies the connection to the X server
+.SH DESCRIPTION
+.LP
+The
+.I DPMSDisable
+function disables Display Power Management Signaling (DPMS) on the specified
+display.  When disabled, DPMS sets the display to DPMSModeOn.  If
+.I DPMSDisable
+is invoked on a display with DPMS already disabled or on a display which does
+not support DPMS, no change is made and no error is returned.
+.SH "RETURN VALUES"
+.TP 15
+TRUE
+The
+.I DPMSDisable
+function always returns TRUE.
+.SH "SEE ALSO"
+.BR DPMSCapable (__libmansuffix__),
+.BR DPMSEnable (__libmansuffix__)