Merge remote-tracking branch 'origin/released'

Conflicts:
	libfontenc/src/fontenc.c

1 files changed, 53 insertions, 53 deletions

diff --git a/libXext/man/XdbeDeallocateBackBufferName.man b/libXext/man/XdbeDeallocateBackBufferName.man
index 0cd2b0291..a1286494d 100644
--- a/libXext/man/XdbeDeallocateBackBufferName.man
+++ b/libXext/man/XdbeDeallocateBackBufferName.man
@@ -1,53 +1,53 @@
-.\" Copyright (c) 1995  Hewlett-Packard Company

-.\" 

-.\" 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 furnished to do so, subject to the following conditions:

-.\" 

-.\" The above copyright notice and this permission notice 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 

-.\" HEWLETT-PACKARD COMPANY 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.

-.\" 

-.\" Except as contained in this notice, the name of the Hewlett-Packard Company shall not 

-.\" be used in advertising or otherwise to promote the sale, use or other 

-.\" dealing in this Software without prior written authorization from the 

-.\" Hewlett-Packard Company.

-.\"

-.TH XdbeDeallocateBackBufferName __libmansuffix__ __xorgversion__ "X FUNCTIONS"

-.SH NAME

-XdbeDeallocateBackBufferName - frees a DBE buffer.

-.SH SYNOPSIS

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

-

-Status XdbeDeallocateBackBufferName(

-    Display        *dpy,

-    XdbeBackBuffer buffer)

-.SH DESCRIPTION

-This function frees a drawable ID, buffer, that was obtained via

-.B XdbeAllocateBackBufferName().

-The buffer must be a valid name for the back

-buffer of a window, or a protocol error results.

-.SH ERRORS

-.IP BadBuffer

-The specified buffer is not associated with a window.

-.SH SEE ALSO

-DBE,

-.I XdbeAllocateBackBufferName(),

-.I XdbeBeginIdiom(),

-.I XdbeEndIdiom(),

-.I XdbeFreeVisualInfo(),

-.I XdbeGetBackBufferAttributes(),

-.I XdbeGetVisualInfo(),

-.I XdbeQueryExtension(),

-.I XdbeSwapBuffers().

-

+.\" Copyright (c) 1995  Hewlett-Packard Company
+.\"
+.\" 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 furnished to do so, subject to the following conditions:
+.\"
+.\" The above copyright notice and this permission notice 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
+.\" HEWLETT-PACKARD COMPANY 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.
+.\"
+.\" Except as contained in this notice, the name of the Hewlett-Packard Company shall not
+.\" be used in advertising or otherwise to promote the sale, use or other
+.\" dealing in this Software without prior written authorization from the
+.\" Hewlett-Packard Company.
+.\"
+.TH XdbeDeallocateBackBufferName __libmansuffix__ __xorgversion__ "X FUNCTIONS"
+.SH NAME
+XdbeDeallocateBackBufferName - frees a DBE buffer.
+.SH SYNOPSIS
+\&#include <X11/extensions/Xdbe.h>
+
+Status XdbeDeallocateBackBufferName(
+    Display        *dpy,
+    XdbeBackBuffer buffer)
+.SH DESCRIPTION
+This function frees a drawable ID, buffer, that was obtained via
+.B XdbeAllocateBackBufferName().
+The buffer must be a valid name for the back
+buffer of a window, or a protocol error results.
+.SH ERRORS
+.IP BadBuffer
+The specified buffer is not associated with a window.
+.SH SEE ALSO
+DBE,
+.I XdbeAllocateBackBufferName(),
+.I XdbeBeginIdiom(),
+.I XdbeEndIdiom(),
+.I XdbeFreeVisualInfo(),
+.I XdbeGetBackBufferAttributes(),
+.I XdbeGetVisualInfo(),
+.I XdbeQueryExtension(),
+.I XdbeSwapBuffers().
+