summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2011-09-30 07:21:57 -0400
committerKeith Packard <keithp@keithp.com>2011-10-03 12:19:58 -0700
commit466e4b3f174bdd7a69a76eb06e6c3e3344b8adc2 (patch)
tree526a23b1dcce2611ca3ab9c8af60e92416fec2a1
parent62940bf38f70e3d9fb80521de40d6361548a0ea5 (diff)
Xserver-spec: use appropriate copyright markup
Use docbook copyright markup for year and holder. Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--doc/Xserver-spec.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/Xserver-spec.xml b/doc/Xserver-spec.xml
index aabd262b2..37fd2b29a 100644
--- a/doc/Xserver-spec.xml
+++ b/doc/Xserver-spec.xml
@@ -44,8 +44,9 @@
<publisher><publishername>The X.Org Foundation</publishername></publisher>
<releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
<releaseinfo>X server version &xserver.version;</releaseinfo>
+ <copyright><year>1994</year><holder>X Consortium, Inc.</holder></copyright>
+ <copyright><year>2004</year><holder>X.org Foundation, Inc.</holder></copyright>
<legalnotice>
- <para>Copyright &#xA9; 1994 X Consortium, Inc., 2004 X.org Foundation, Inc.</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>