2621. [doc] Made copyright boilterplate consistent. [RT #19833]

diff --git a/CHANGES b/CHANGES
index 4cf9a4ddfef4927f6fb39b1d6a142326a923dd34..f2e254c61265278d250eb9486d8faaa551acd311 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2621.  [doc]           Made copyright boilterplate consistent.  [RT #19833]
+
 2618.  [bug]           The sdb and sdlz db_interator_seek() methods could
                        loop infinitely. [RT #19847]
 

diff --git a/doc/xsl/copyright.xsl b/doc/xsl/copyright.xsl
index 691cde2fb649a38d514acc5af8b9664d1c65c3b6..e9a457b39fc45955aa1b641052a9bd74a9271bf8 100644 (file)
--- a/doc/xsl/copyright.xsl
+++ b/doc/xsl/copyright.xsl
@@ -14,7 +14,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: copyright.xsl,v 1.6 2007/06/19 23:47:13 tbox Exp $ -->
+<!-- $Id: copyright.xsl,v 1.6.332.1 2009/07/10 07:22:45 jinmei Exp $ -->
 
 <!-- Generate ISC copyright comments from Docbook copyright metadata. -->
 
@@ -35,7 +35,7 @@
 
   <xsl:variable name="isc.copyright.text">
     <xsl:text>
-      Permission to use, copy, modify, and distribute this software for any
+      Permission to use, copy, modify, and/or distribute this software for any
       purpose with or without fee is hereby granted, provided that the above
       copyright notice and this permission notice appear in all copies.