Simple text files with docs on build or design don't really need copyright on their own

diff --git a/doc/dev/HOW-ADB-WORKS.txt b/doc/dev/HOW-ADB-WORKS.txt
index 05d14a816f8661923b0c39f6986ae401166bd04a..5f10ad79de37effbd49b6cc94889d049342437c2 100644 (file)
--- a/doc/dev/HOW-ADB-WORKS.txt
+++ b/doc/dev/HOW-ADB-WORKS.txt
@@ -1,7 +1,3 @@
-Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-
-See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
-
 Recently, several groups have expressed concern over potential
 denial of service attacks within BIND 9, specifically within the ADB
 (address database.)  This document hopes to provide a more clear

diff --git a/util/copyrights b/util/copyrights
index dbad7409b0881cfd2ba5cd981606cd11e453bd1a..d469c5e7068b369fa4edc375592497eb25253b7e 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -1477,7 +1477,6 @@
 ./doc/arm/notes.conf                           X       2015,2018,2019
 ./doc/arm/notes.html                           X       2014,2015,2016,2017,2018,2019
 ./doc/arm/notes.pdf                            X       2014,2015,2016,2017,2018,2019
-./doc/arm/notes.txt                            X       2018,2019
 ./doc/arm/notes.xml                            SGML    2014,2015,2016,2017,2018,2019
 ./doc/arm/noteversion.xml.in                   SGML    2015,2016,2018,2019
 ./doc/arm/options.grammar.xml                  SGML    2018,2019
@@ -1513,7 +1512,6 @@
 ./doc/design/windows-nt                                TXT.BRIEF       1999,2000,2001,2004,2016,2018,2019
 ./doc/design/zone                              TXT.BRIEF       1999,2000,2001,2004,2016,2018,2019
 ./doc/dev/DBC                                  TXT.BRIEF       1999,2000,2001,2004,2016,2018,2019
-./doc/dev/HOW-ADB-WORKS.txt                    TXT.BRIEF       2003,2004,2016,2018,2019
 ./doc/dev/autoconf                             TXT.BRIEF       2001,2002,2004,2016,2018,2019
 ./doc/dev/coding.html                          HTML    1999,2000,2001,2002,2004,2007,2016,2018,2019
 ./doc/dev/cvs-usage                            TXT.BRIEF       2000,2001,2004,2016,2018,2019
@@ -2581,6 +2579,4 @@
 ./win32utils/Configure                         PERL    2013,2014,2015,2016,2017,2018,2019
 ./win32utils/GeoIP.diff                                X       2013,2018,2019
 ./win32utils/bind9.sln.in                      X       2013,2014,2015,2016,2017,2018,2019
-./win32utils/build.txt                         TXT.BRIEF       2013,2014,2015,2016,2017,2018,2019
 ./win32utils/index.html                                HTML    2006,2007,2008,2012,2013,2014,2015,2016,2018,2019
-./win32utils/readme1st.txt                     TXT.BRIEF       2001,2003,2004,2005,2007,2008,2009,2012,2013,2014,2015,2016,2018,2019

diff --git a/util/merge_copyrights b/util/merge_copyrights
index 62d5d14cfff46427ac596b53a2ec64154b758e4d..5e5e35b9af0d70be3736303784b976a98ab5c77d 100644 (file)
--- a/util/merge_copyrights
+++ b/util/merge_copyrights
@@ -57,7 +57,8 @@ while (<CHANGES>) {
               \.conf\.in$ |    # configuration files
               \.dir-locals\.el | # emacs local variables
               /(dnssafe|openssl)/.*\.[ch]$ |   # imported
-              doc/(draft|expired|rfc)/         # imported
+              doc/(draft|expired|rfc)/ |       # imported
+              \.txt$           # text files don't really need copyright
             %x);
 
     if (!$file_types{$_}) {

diff --git a/win32utils/build.txt b/win32utils/build.txt
index 522f0fafc1ff8b3698c6b13160455b58e69866a3..95ddbcc036c753fbedf53ad9fa48d8ddba771090 100644 (file)
--- a/win32utils/build.txt
+++ b/win32utils/build.txt
@@ -1,7 +1,3 @@
-Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-
-See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
-
        BIND 9.10 for Win32 Source Build Instructions.  17-Apr-2015
 
 Building BIND 9.10 on Windows has the following prerequisites:

diff --git a/win32utils/readme1st.txt b/win32utils/readme1st.txt
index cb336e9587e2bc37f767168b8fa6f0047090cd02..adc093c9d17d2b3df00913f2fb455555da73e0f2 100644 (file)
--- a/win32utils/readme1st.txt
+++ b/win32utils/readme1st.txt
@@ -1,7 +1,3 @@
-Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-
-See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
-
 NOTES ON BIND 9.10 FOR WINDOWS:
 
 BIND 9.10 is known to run on Windows XP, Vista, Windows 7,