From 7ff012bb433109a622ac122ade71669e842ebdcf Mon Sep 17 00:00:00 2001
From: Gaetan Nadon <memsize@videotron.ca>
Date: Fri, 16 Sep 2011 10:09:57 -0400
Subject: specs: handle multiple sets of copyright notice/license/warranty

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.

Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
---
 specs/libX11/libX11.xml | 14 ++++++--------
 1 file 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
-- 
cgit v1.2.3