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

diff --git a/CHANGES b/CHANGES
index bd046d10777aec302eb669c7371f0d2ac8206ebf..4cb2b558f0d580170b9d67f09d5652eb7654e546 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2621.  [doc]           Made copyright boilterplate consistent.  [RT #19833]
+
 2620.  [bug]           Delay thawing the zone until the reload of it has
                        completed successfully.  [RT #19750]
 

diff --git a/doc/xsl/copyright.xsl b/doc/xsl/copyright.xsl
index 691cde2fb649a38d514acc5af8b9664d1c65c3b6..d5f598c908e2448902273676f53c9cfb3b9275f3 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.7 2009/07/10 07:22:06 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.