From d86d8f34f5c2ac5c80230aea2de49bb97eaf5f92 Mon Sep 17 00:00:00 2001
From: Gaetan Nadon <memsize@videotron.ca>
Date: Thu, 22 Sep 2011 09:20:38 -0400
Subject: doc: refactor legal text for multi licensing copyrights

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
---
 doc/fontlib.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/fontlib.xml b/doc/fontlib.xml
index 8e53424..48b8aa2 100644
--- a/doc/fontlib.xml
+++ b/doc/fontlib.xml
@@ -18,8 +18,6 @@
       <title>
 	The X Font Library
       </title>
-      <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
-      <pubdate>July 27, 1991</pubdate>
       <authorgroup>
 	<author>
 	  <firstname>Keith</firstname>
@@ -36,10 +34,10 @@
 	  </affiliation>
 	</author>
       </authorgroup>
+      <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
+      <copyright><year>1993</year><holder>Network Computing Devices</holder></copyright>
+
       <legalnotice>
-	<para>
-	  Copyright 1993 <orgname>Network Computing Devices</orgname>
-	</para>
 	<para>
 	  Permission to use, copy, modify, distribute, and sell this
 	  software and its documentation for any purpose is hereby
@@ -54,8 +52,8 @@
 	  any purpose.  It is provided &ldquo;as is&rdquo; without
 	  express or implied warranty.
 	</para>
-	<para>
-	  Copyright 1993, 1994 <orgname>X Consortium</orgname>
+	<para role="multiLicensing">
+	  Copyright &copy;1993, 1994 X Consortium
 	</para>
 	<para>
 	  Permission is hereby granted, free of charge, to any person
@@ -84,7 +82,9 @@
 	  promote the sale, use or other dealings in this Software
 	  without prior written authorization from the X Consortium.
 	</para>
+        <para>X Window System is a trademark of The Open Group.</para>
       </legalnotice>
+      <pubdate>July 27, 1991</pubdate>
     </articleinfo>
 
     <warning>
-- 
cgit v1.2.1