[PATCH libX11] specs: handle multiple sets of copyright notice/license/warranty

Gaetan Nadon memsize at videotron.ca
Fri Sep 16 08:36:12 PDT 2011


Docbook groups all the <copyright> elements together and all the
<legalnotice> elements together.

We cannot have a sequence:
<copyright> <legalnotice> <copyright> <legalnotice> [...]

A workaround, which was done in some documents, is to put the copyright
notice inside the legalnotice in plain text without the <copyright> element.
A formal paragraph title is added here which makes the copyright notice bold,
and makes it much easier to locate.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
	We cannot identify which part belongs to which copyright holder.
	Does not that make the doc dual-licensed where derivative work can
	select the license they which to use?

 specs/libX11/libX11.xml |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/specs/libX11/libX11.xml b/specs/libX11/libX11.xml
index 30d73b8..782c14f 100644
--- a/specs/libX11/libX11.xml
+++ b/specs/libX11/libX11.xml
@@ -60,17 +60,12 @@
          <affiliation><orgname>Fujitsu OSSI</orgname></affiliation>
       </othercredit>
    </authorgroup>
-   <copyright><year>1985</year><year>1986</year><year>1987</year>
-     <year>1988</year><year>1989</year><year>1991</year><year>1994</year>
-     <year>1996</year><year>2002</year><holder>The Open Group</holder>
-   </copyright>
-   <copyright><year>1985</year><year>1986</year><year>1987</year>
-     <year>1988</year><year>1989</year><year>1991</year>
-     <holder>Digital Equipment Corporation</holder>
-   </copyright>
 
 <legalnotice>
 
+<formalpara>
+<title>Copyright © 1985, 1986, 1987, 1988, 1989, 1991, 1994, 1996, 2002 The Open Group</title>
+<para></para></formalpara>
 <para>
 Permission is hereby granted, free of charge, to any person obtaining a copy 
 of this software and associated documentation files 
@@ -102,6 +97,9 @@ be used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 </para>
 
+<formalpara>
+<title>Copyright © 1985, 1986, 1987, 1988, 1989, 1991 Digital Equipment Corporation</title>
+<para></para></formalpara>
 <para>
 Permission to use, copy, modify and distribute this documentation for any
 purpose and without fee is hereby granted, provided that the above copyright
-- 
1.7.4.1



More information about the xorg-devel mailing list