svn merge ^/branches/released .

14 files changed, 14 insertions, 14 deletions

diff --git a/libXext/COPYING b/libXext/COPYING
index 315b93317..e8ba287bb 100644
--- a/libXext/COPYING
+++ b/libXext/COPYING
@@ -160,7 +160,7 @@ 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 1999, 2005, 2006 Sun Microsystems, Inc.  All rights reserved.

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

diff --git a/libXext/man/DPMSCapable.man b/libXext/man/DPMSCapable.man
index b2563b9b0..62861a6fd 100644
--- a/libXext/man/DPMSCapable.man
+++ b/libXext/man/DPMSCapable.man
@@ -8,7 +8,7 @@
 .\" of the information in this document.  This documentation is

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

 .\"

-.\" Copyright 1999, 2005 Sun Microsystems, Inc.  All rights reserved.

+.\" 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"),

diff --git a/libXext/man/DPMSDisable.man b/libXext/man/DPMSDisable.man
index be0a7ed81..eeca6cbd2 100644
--- a/libXext/man/DPMSDisable.man
+++ b/libXext/man/DPMSDisable.man
@@ -8,7 +8,7 @@
 .\" of the information in this document.  This documentation is

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

 .\"

-.\" Copyright 1999, 2005 Sun Microsystems, Inc.  All rights reserved.

+.\" 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"),

diff --git a/libXext/man/DPMSEnable.man b/libXext/man/DPMSEnable.man
index ec4d9edf2..14f5f35af 100644
--- a/libXext/man/DPMSEnable.man
+++ b/libXext/man/DPMSEnable.man
@@ -8,7 +8,7 @@
 .\" of the information in this document.  This documentation is

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

 .\"

-.\" Copyright 1999, 2005 Sun Microsystems, Inc.  All rights reserved.

+.\" 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"),

diff --git a/libXext/man/DPMSForceLevel.man b/libXext/man/DPMSForceLevel.man
index 293218857..62610be98 100644
--- a/libXext/man/DPMSForceLevel.man
+++ b/libXext/man/DPMSForceLevel.man
@@ -8,7 +8,7 @@
 .\" of the information in this document.  This documentation is

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

 .\"

-.\" Copyright 1999, 2005 Sun Microsystems, Inc.  All rights reserved.

+.\" 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"),

diff --git a/libXext/man/DPMSGetTimeouts.man b/libXext/man/DPMSGetTimeouts.man
index 7f225238f..3f64eccb4 100644
--- a/libXext/man/DPMSGetTimeouts.man
+++ b/libXext/man/DPMSGetTimeouts.man
@@ -8,7 +8,7 @@
 .\" of the information in this document.  This documentation is

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

 .\"

-.\" Copyright 1999, 2005 Sun Microsystems, Inc.  All rights reserved.

+.\" 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"),

diff --git a/libXext/man/DPMSGetVersion.man b/libXext/man/DPMSGetVersion.man
index ef4a9b05c..c9db0e079 100644
--- a/libXext/man/DPMSGetVersion.man
+++ b/libXext/man/DPMSGetVersion.man
@@ -8,7 +8,7 @@
 .\" of the information in this document.  This documentation is

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

 .\"

-.\" Copyright 1999, 2005 Sun Microsystems, Inc.  All rights reserved.

+.\" 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"),

diff --git a/libXext/man/DPMSInfo.man b/libXext/man/DPMSInfo.man
index c0d780559..b1272eaca 100644
--- a/libXext/man/DPMSInfo.man
+++ b/libXext/man/DPMSInfo.man
@@ -8,7 +8,7 @@
 .\" of the information in this document.  This documentation is

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

 .\"

-.\" Copyright 1999, 2005 Sun Microsystems, Inc.  All rights reserved.

+.\" 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"),

diff --git a/libXext/man/DPMSQueryExtension.man b/libXext/man/DPMSQueryExtension.man
index 815f18a3e..ca8457757 100644
--- a/libXext/man/DPMSQueryExtension.man
+++ b/libXext/man/DPMSQueryExtension.man
@@ -8,7 +8,7 @@
 .\" of the information in this document.  This documentation is

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

 .\"

-.\" Copyright 1999, 2005 Sun Microsystems, Inc.  All rights reserved.

+.\" 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"),

diff --git a/libXext/man/DPMSSetTimeouts.man b/libXext/man/DPMSSetTimeouts.man
index 53606cfec..740b24761 100644
--- a/libXext/man/DPMSSetTimeouts.man
+++ b/libXext/man/DPMSSetTimeouts.man
@@ -8,7 +8,7 @@
 .\" of the information in this document.  This documentation is

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

 .\"

-.\" Copyright 1999, 2005 Sun Microsystems, Inc.  All rights reserved.

+.\" 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"),

diff --git a/libXext/man/XShm.man b/libXext/man/XShm.man
index da5150701..793680090 100644
--- a/libXext/man/XShm.man
+++ b/libXext/man/XShm.man
@@ -23,7 +23,7 @@
 .\" dealing in this Software without prior written authorization from the 

 .\" X Consortium.

 .\"

-.\" Copyright 2006 Sun Microsystems, Inc.  All rights reserved.

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

diff --git a/libXext/man/XcupGetReservedColormapEntries.man b/libXext/man/XcupGetReservedColormapEntries.man
index acd834a4b..7ba10d23c 100644
--- a/libXext/man/XcupGetReservedColormapEntries.man
+++ b/libXext/man/XcupGetReservedColormapEntries.man
@@ -1,5 +1,5 @@
 .\" Copyright \(co 1986-1997   The Open Group    All Rights Reserved

-.\" Copyright 1999, 2005 Sun Microsystems, Inc.  All rights reserved.

+.\" 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"),

diff --git a/libXext/man/XcupQueryVersion.man b/libXext/man/XcupQueryVersion.man
index 43141fc56..bbbbc945c 100644
--- a/libXext/man/XcupQueryVersion.man
+++ b/libXext/man/XcupQueryVersion.man
@@ -1,5 +1,5 @@
 .\" Copyright \(co 1986-1997   The Open Group    All Rights Reserved

-.\" Copyright 1999, 2005 Sun Microsystems, Inc.  All rights reserved.

+.\" 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"),

diff --git a/libXext/man/XcupStoreColors.man b/libXext/man/XcupStoreColors.man
index e08b4be67..335afb858 100644
--- a/libXext/man/XcupStoreColors.man
+++ b/libXext/man/XcupStoreColors.man
@@ -1,5 +1,5 @@
 .\" Copyright \(co 1986-1997   The Open Group    All Rights Reserved

-.\" Copyright 1999, 2005 Sun Microsystems, Inc.  All rights reserved.

+.\" 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"),