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

(cherry picked from commit 1877139a3216ee0ce962734142455765a5cde17d)

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 22b7896f691370669f776bb21bb582cb43e46425..df5ecec5519bceaf3a46df5bdd90686799936d7f 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -3121,7 +3121,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
@@ -3156,7 +3155,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
@@ -4480,7 +4478,6 @@
 ./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,2018,2019
 ./win32utils/index.html                                HTML    2006,2007,2008,2012,2013,2014,2015,2016,2018,2019
 ./win32utils/legacy/BINDBuild.dsw.in           X       2001,2005,2006,2008,2009,2010,2013,2014,2015,2016,2018,2019
 ./win32utils/legacy/BuildAll.bat.in            BAT     2001,2002,2004,2005,2006,2007,2008,2009,2010,2013,2014,2015,2016,2018,2019
@@ -4488,4 +4485,3 @@
 ./win32utils/legacy/BuildSetup.bat.in          BAT     2001,2002,2004,2005,2006,2007,2008,2009,2010,2012,2013,2014,2015,2016,2018,2019
 ./win32utils/legacy/makedefs.pl                        PERL    2001,2004,2007,2009,2012,2013,2014,2016,2018,2019
 ./win32utils/legacy/win32-build.txt            TXT.BRIEF       2001,2002,2004,2005,2008,2009,2012,2013,2014,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 ad3632fe2b36b1d1c51052539c47783dd601444c..bb763aef21463952ee2f6710115b2a8e7571054b 100644 (file)
--- a/util/merge_copyrights
+++ b/util/merge_copyrights
@@ -38,7 +38,8 @@ while (<CHANGES>) {
               util/newcopyrights | # our output
               \.bak$ |         # created by update_copyrights
               /(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 ed810daa0639ddb79764a1da0e0cff3b136f40e4..4a254b7a2de8c431f96aa653d673ba127c9ca5c6 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,