From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Fri, 25 Oct 2013 09:03:49 +0000 (+0200)
Subject: limit accidental scope expansion, thanks @zeha
X-Git-Tag: rec-3.6.0-rc1~377
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c09b584a4d40025166da0de5cf801da0379c9195;p=pdns

limit accidental scope expansion, thanks @zeha
---

diff --git a/NOTICE b/NOTICE
index d3f7a1eb1..ddd9b4211 100644
--- a/NOTICE
+++ b/NOTICE
@@ -3,8 +3,8 @@ it under the terms of version 2 of the GNU General Public License as
 published by the Free Software Foundation.
 
 In addition, for the avoidance of any doubt, permission is granted to
-link this program with OpenSSL or any other library package and to
-(re)distribute the binaries produced as the result of such linking.
+link this program with OpenSSL and to (re)distribute the binaries
+produced as the result of such linking.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/pdns/docs/pdns.xml b/pdns/docs/pdns.xml
index 272cc6fd8..d576213b4 100755
--- a/pdns/docs/pdns.xml
+++ b/pdns/docs/pdns.xml
@@ -23436,9 +23436,8 @@ POSSIBILITY OF SUCH DAMAGES.
   <appendix id="further-copyrights"><title>Further copyright statements</title>
     <sect1><title>OpenSSL linking exception</title>
     <para>
-      Permission is granted to link this program with OpenSSL or any other
-      library package and to (re)distribute the binaries produced as the result of
-      such linking.
+      Permission is granted to link this program with OpenSSL and to
+      (re)distribute the binaries produced as the result of such linking.
     </para>
     </sect1>
     <sect1><title>AES implementation by Brian Gladman</title>