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

diff --git a/CHANGES b/CHANGES
index 1fafec3b0c30857027087938c4800ada61b4f2a2..9f3fdc7dc084eeab163b145a8868d882a6591988 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 536885ae22f07caa16d2fca00af33c330a106c59..4e7499af6e7a377e8a9f3b1d51aa83bb3663cf57 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.2.2.3 2005/07/19 05:55:48 marka Exp $ -->
+<!-- $Id: copyright.xsl,v 1.2.2.4 2009/07/10 07:23:37 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.