Cleanup copyright.sdf and license.sdf.

Create wrappers *-plain.sdf to generate plain text versions.

doc/guide/copyright-plain.sdf

@@ -0,0 +1,4 @@
+#
+# Plain Copyright for Software Distribution
+#
+!include "copyright.sdf"; plain

doc/guide/copyright.sdf

@@ -1,10 +1,12 @@
 # Copyright 1999, The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 
-A1: OpenLDAP Copyright
+H1: OpenLDAP Software Copyrights
 
-Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
-All rights reserved.
+H2: OpenLDAP Copyright
+
+E:Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+E:All rights reserved.
 
 Redistribution and use in source and binary forms are permitted only
 as authorized by the OpenLDAP Public License.  A copy of this

doc/guide/license-plain.sdf

@@ -0,0 +1,4 @@
+#
+# Plain License for Software Distribution
+#
+!include "license.sdf"; plain

doc/guide/license.sdf

@@ -1,48 +1,51 @@
-A1: The OpenLDAP Public License
+H1: The OpenLDAP Public License
 
-.Version 1.4, 18 January 1999
-.Copyright 1998-1999, The OpenLDAP Foundation.
-.All Rights Reserved.
+E:Version 1.4, 18 January 1999
+E:Copyright 1998-1999, The OpenLDAP Foundation.
+E:All Rights Reserved.
 
-Note: This license is derived from the "Artistic License" as distributed
-with the Perl Programming Language.  As significant differences
-exist, the complete license should be read.
+. Note: This license is derived from the {{I:Artistic License}}
+as distributed with the {{I:Perl Programming Language}}.
+As significant differences exist,
+{{B: the complete license should be read}}.
 
-A2: PREAMBLE
+H2: Preamble
 
 The intent of this document is to state the conditions under which
-a Package may be copied, such that the Copyright Holder maintains
-some semblance of artistic control over the development of the
+a Package may be copied, such that the Copyright Holder
+maintains some semblance of artistic control over the development of the
 package, while giving the users of the package the right to use
 and distribute the Package in a more-or-less customary fashion,
 plus the right to make reasonable modifications.
 
-A2: Definitions:
+H2: Definitions
 
-    "Package" refers to the collection of files distributed by the
-    Copyright Holder, and derivatives of that collection of files
-    created through textual modification.
+. "Package" refers to the collection of files distributed by the
+Copyright Holder, and derivatives of that collection of files
+created through textual modification.
 
-    "Standard Version" refers to such a Package if it has not been
-    modified, or has been modified in accordance with the wishes
-    of the Copyright Holder.
+. "Standard Version" refers to such a Package if it has not been
+modified, or has been modified in accordance with the wishes
+of the Copyright Holder.
 
-    "Copyright Holder" is whoever is named in the copyright or
-    copyrights for the package.
+. "Copyright Holder" is whoever is named in the copyright or
+copyrights for the Package.
 
-    "You" is you, if you're thinking about copying or distributing
-    this Package.
+. "You" is you, if you're thinking about copying or distributing
+this Package.
 
-    "Reasonable copying fee" is whatever you can justify on the
-    basis of media cost, duplication charges, time of people
-    involved, and so on.  (You will not be required to justify it
-    to the Copyright Holder, but only to the computing community
-    at large as a market that must bear the fee.)
+. "Reasonable copying fee" is whatever you can justify on the
+basis of media cost, duplication charges, time of people
+involved, and so on.  (You will not be required to justify it
+to the Copyright Holder, but only to the computing community
+at large as a market that must bear the fee.)
 
-    "Freely Available" means that no fee is charged for the item
-    itself, though there may be fees involved in handling the item.
-    It also means that recipients of the item may redistribute it
-    under the same conditions they received it.
+. "Freely Available" means that no fee is charged for the item
+itself, though there may be fees involved in handling the item.
+It also means that recipients of the item may redistribute it
+under the same conditions they received it.
+
+H2: Terms and Conditions
 
 ^ You may make and give away verbatim copies of the source form
 of the Standard Version of this Package without restriction, provided
@@ -59,43 +62,50 @@ provided that you insert a prominent notice in each changed file
 stating how and when you changed that file, and provided that you
 do at least ONE of the following:
 
-^^ place your modifications in the Public Domain or otherwise
+&& a)
+place your modifications in the Public Domain or otherwise
 make them Freely Available, such as by posting said modifications
 to Usenet or an equivalent medium, or placing the modifications
 on a major archive site such as uunet.uu.net, or by allowing
 the Copyright Holder to include your modifications in the
 Standard Version of the Package.
 
-++ use the modified Package only within your corporation or
+&& b)
+use the modified Package only within your corporation or
 organization.
 
-++ rename any non-standard executables so the names do not
+&& c)
+rename any non-standard executables so the names do not
 conflict with standard executables, which must also be provided,
 and provide a separate manual page for each non-standard
 executable that clearly documents how it differs from the
 Standard Version.
 
-++ make other distribution arrangements with the Copyright Holder.
+&& d)
+make other distribution arrangements with the Copyright Holder.
 
 + You may distribute the programs of this Package in object code
 or executable form, provided that you do at least ONE of the
 following:
 
-^^ distribute a Standard Version of the executables and library
+&& a)
+distribute a Standard Version of the executables and library
 files, together with instructions (in the manual page or
 equivalent) on where to get the Standard Version.
 
-++ accompany the distribution with the machine-readable source
+&& b)
+accompany the distribution with the machine-readable source
 of the Package with your modifications.
 
-++ accompany any non-standard executables with their corresponding
+&& c)
+accompany any non-standard executables with their corresponding
 Standard Version executables, giving the non-standard executables
 non-standard names, and clearly documenting the differences in
 manual pages (or equivalent), together with instructions on
 where to get the Standard Version.
 
-++ make other distribution arrangements with the Copyright
-Holder.
+&& d) 
+make other distribution arrangements with the Copyright Holder.
 
 + You may charge a reasonable copying fee for any distribution of
 this Package.  You may charge any fee you choose for support of

doc/guide/master.sdf

@@ -8,7 +8,7 @@
 !include "title.sdf"
 
 # Document copyright, publishing info, acknowledgements, preface
-!include "preamble.sdf"
+!include "preamble.sdf"; plain
 
 # Chapters
 !include "intro.sdf"
@@ -26,5 +26,5 @@
 # Appendices 
 
 # Software Copyright/License
-!include "copyright.sdf"
-!include "license.sdf"
+!include "copyright.sdf"; appendix
+!include "license.sdf"; appendix

doc/guide/preamble.sdf

@@ -6,7 +6,7 @@
 # !include "copyright.sdf"
 
 # acknowledge U-M.  Probably should be placed in a separate file.
-H1: Acknowledgements
+P1: Acknowledgements
 
 The OpenLDAP Project would like to thank the University of Michigan
 LDAP Team for building the foundation of LDAP software and information