On 09/24/11 02:21 PM, Gaetan Nadon wrote:
Signed-off-by: Gaetan Nadon<[email protected]>
---
doc/Xinput.xml | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/doc/Xinput.xml b/doc/Xinput.xml
index 87c6d7f..b88707f 100644
--- a/doc/Xinput.xml
+++ b/doc/Xinput.xml
@@ -16,16 +16,9 @@
</author>
</authorgroup>
<releaseinfo>X server version&xserver.version;</releaseinfo>
-<corpname>X Consortium Standard</corpname>
-<copyright><year>1989</year><holder>Hewlett-Packard
Company</holder></copyright>
-<copyright><year>1990</year><holder>Hewlett-Packard
Company</holder></copyright>
-<copyright><year>1991</year><holder>Hewlett-Packard
Company</holder></copyright>
-
-<copyright><year>1989</year><holder>X Consortium</holder></copyright>
-<copyright><year>1990</year><holder>X Consortium</holder></copyright>
-<copyright><year>1991</year><holder>X Consortium</holder></copyright>
-<affiliation><orgname>X Consortium</orgname></affiliation>
-<productnumber>X Version 11, Release 6.7</productnumber>
+<copyright><year>1989</year><year>1990</year><year>1991</year>
+<holder>Hewlett-Packard Company</holder>
+</copyright>
<legalnotice>
@@ -37,13 +30,14 @@ Hewlett-Packard makes no representations about the
suitability for any purpose o
document. It is provided "as is" without express or implied warranty. This
document is only a draft stan-
dard of the X Consortium and is therefore subject to change.
</para>
+</legalnotice>
+<legalnotice>
<para>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:</para>
+<para role="multiLicensing">Copyright © 1989, 1990, 1991 X Consortium</para>
<para>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:</para>
-<para>The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.</para>
-
<para>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 X CONSORTIUM 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.</para>
<para>Except as contained in this notice, the name of the X Consortium shall not be
used in advertising or otherwise to promote the sale, use or other dealings in this
Software without prior written authorization from the X Consortium.</para>
That doesn't look quite right - the "Permission is hereby granted, ... subject
to the following conditions:" paragraph is duplicated (with no conditions after
the first one), and you seem to have accidentally removed one of the conditions
("The above [notices] shall be included....") in the second instance.
--
-Alan Coopersmith- [email protected]
Oracle Solaris Platform Engineering: X Window System
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
