svn merge ^/branches/released .

1 files changed, 46 insertions, 50 deletions

diff --git a/libXext/man/XdbeBeginIdiom.man b/libXext/man/XdbeBeginIdiom.man
index 0f1aebfe2..c58e7666c 100644
--- a/libXext/man/XdbeBeginIdiom.man
+++ b/libXext/man/XdbeBeginIdiom.man
@@ -1,50 +1,46 @@
-.\" $Xorg: XdbeBegi.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $
-.\"
-.\" 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.
-.\"
-.\" $XFree86: xc/doc/man/Xext/dbe/XdbeBegi.man,v 3.4 2001/01/27 18:20:20 dawes Exp $
-.\"
-.TH DBE __libmansuffix__ __xorgversion__ "X FUNCTIONS"
-.SH NAME
-XdbeBeginIdiom - marks the beginning of a DBE idiom sequence.
-.SH SYNOPSIS
-\&#include <X11/extensions/Xdbe.h>
-
-Status XdbeBeginIdiom(
-    Display *dpy)
-.SH DESCRIPTION
-This function marks the beginning of an idiom sequence.
-.SH SEE ALSO
-DBE,
-.I XdbeAllocateBackBufferName(),
-.I XdbeDeallocateBackBufferName(),
-.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 DBE __libmansuffix__ __xorgversion__ "X FUNCTIONS"

+.SH NAME

+XdbeBeginIdiom - marks the beginning of a DBE idiom sequence.

+.SH SYNOPSIS

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

+

+Status XdbeBeginIdiom(

+    Display *dpy)

+.SH DESCRIPTION

+This function marks the beginning of an idiom sequence.

+.SH SEE ALSO

+DBE,

+.I XdbeAllocateBackBufferName(),

+.I XdbeDeallocateBackBufferName(),

+.I XdbeEndIdiom(),

+.I XdbeFreeVisualInfo(),

+.I XdbeGetBackBufferAttributes(),

+.I XdbeGetVisualInfo(),

+.I XdbeQueryExtension(),

+.I XdbeSwapBuffers().

+