diff --git a/bin/check/named-checkconf.docbook b/bin/check/named-checkconf.docbook
index 11b36714ff..040071e58b 100644
--- a/bin/check/named-checkconf.docbook
+++ b/bin/check/named-checkconf.docbook
@@ -26,6 +26,9 @@
+ 2000
+ 2001
+ 2002
2004
2005
2007
@@ -35,12 +38,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- 2002
- Internet Software Consortium.
-
diff --git a/bin/check/named-checkzone.docbook b/bin/check/named-checkzone.docbook
index c702cdf1b8..e7c5f60adc 100644
--- a/bin/check/named-checkzone.docbook
+++ b/bin/check/named-checkzone.docbook
@@ -24,6 +24,9 @@
+ 2000
+ 2001
+ 2002
2004
2005
2006
@@ -38,12 +41,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- 2002
- Internet Software Consortium.
-
diff --git a/bin/confgen/rndc-confgen.docbook b/bin/confgen/rndc-confgen.docbook
index 094a376a5f..d58964880f 100644
--- a/bin/confgen/rndc-confgen.docbook
+++ b/bin/confgen/rndc-confgen.docbook
@@ -29,6 +29,8 @@
+ 2001
+ 2003
2004
2005
2007
@@ -39,11 +41,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2001
- 2003
- Internet Software Consortium.
-
diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook
index 7673a75630..cc056e76ed 100644
--- a/bin/dig/dig.docbook
+++ b/bin/dig/dig.docbook
@@ -31,6 +31,10 @@
+ 2000
+ 2001
+ 2002
+ 2003
2004
2005
2006
@@ -45,13 +49,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- 2002
- 2003
- Internet Software Consortium.
-
diff --git a/bin/dig/host.docbook b/bin/dig/host.docbook
index e59d11530f..cdf9df729b 100644
--- a/bin/dig/host.docbook
+++ b/bin/dig/host.docbook
@@ -31,6 +31,9 @@
+ 2000
+ 2001
+ 2002
2004
2005
2007
@@ -41,12 +44,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- 2002
- Internet Software Consortium.
-
diff --git a/bin/dnssec/dnssec-keygen.docbook b/bin/dnssec/dnssec-keygen.docbook
index 865758cec4..fd5fda637f 100644
--- a/bin/dnssec/dnssec-keygen.docbook
+++ b/bin/dnssec/dnssec-keygen.docbook
@@ -30,6 +30,10 @@
+ 2000
+ 2001
+ 2002
+ 2003
2004
2005
2007
@@ -43,13 +47,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- 2002
- 2003
- Internet Software Consortium.
-
diff --git a/bin/dnssec/dnssec-signzone.docbook b/bin/dnssec/dnssec-signzone.docbook
index 5c7caaed5b..761d343867 100644
--- a/bin/dnssec/dnssec-signzone.docbook
+++ b/bin/dnssec/dnssec-signzone.docbook
@@ -29,6 +29,10 @@
+ 2000
+ 2001
+ 2002
+ 2003
2004
2005
2006
@@ -43,13 +47,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- 2002
- 2003
- Internet Software Consortium.
-
diff --git a/bin/named/lwresd.docbook b/bin/named/lwresd.docbook
index 44c8078d79..43e54d4f95 100644
--- a/bin/named/lwresd.docbook
+++ b/bin/named/lwresd.docbook
@@ -29,6 +29,8 @@
+ 2000
+ 2001
2004
2005
2007
@@ -39,11 +41,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- Internet Software Consortium.
-
diff --git a/bin/named/named.docbook b/bin/named/named.docbook
index f1aa76bab6..2e4e2a517e 100644
--- a/bin/named/named.docbook
+++ b/bin/named/named.docbook
@@ -29,6 +29,9 @@
+ 2000
+ 2001
+ 2003
2004
2005
2006
@@ -42,12 +45,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- 2003
- Internet Software Consortium.
-
diff --git a/bin/nsupdate/nsupdate.docbook b/bin/nsupdate/nsupdate.docbook
index 984522c1f4..2facc4bb17 100644
--- a/bin/nsupdate/nsupdate.docbook
+++ b/bin/nsupdate/nsupdate.docbook
@@ -28,6 +28,10 @@
+ 2000
+ 2001
+ 2002
+ 2003
2004
2005
2006
@@ -42,13 +46,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- 2002
- 2003
- Internet Software Consortium.
-
diff --git a/bin/rndc/rndc.conf.docbook b/bin/rndc/rndc.conf.docbook
index f769d9bef1..0e51cb47a2 100644
--- a/bin/rndc/rndc.conf.docbook
+++ b/bin/rndc/rndc.conf.docbook
@@ -29,6 +29,8 @@
+ 2000
+ 2001
2004
2005
2007
@@ -38,11 +40,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- Internet Software Consortium.
-
diff --git a/bin/rndc/rndc.docbook b/bin/rndc/rndc.docbook
index 9247e4835b..dcd228db27 100644
--- a/bin/rndc/rndc.docbook
+++ b/bin/rndc/rndc.docbook
@@ -29,6 +29,8 @@
+ 2000
+ 2001
2004
2005
2007
@@ -38,11 +40,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- Internet Software Consortium.
-
diff --git a/lib/lwres/man/lwres.docbook b/lib/lwres/man/lwres.docbook
index 211965cb28..b409b85f88 100644
--- a/lib/lwres/man/lwres.docbook
+++ b/lib/lwres/man/lwres.docbook
@@ -28,6 +28,8 @@
+ 2000
+ 2001
2004
2005
2007
@@ -36,11 +38,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- Internet Software Consortium.
-
diff --git a/lib/lwres/man/lwres_buffer.docbook b/lib/lwres/man/lwres_buffer.docbook
index 6efdcf93e2..f7c543ae21 100644
--- a/lib/lwres/man/lwres_buffer.docbook
+++ b/lib/lwres/man/lwres_buffer.docbook
@@ -24,6 +24,8 @@
+ 2000
+ 2001
2004
2005
2007
@@ -32,11 +34,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- Internet Software Consortium.
-
diff --git a/lib/lwres/man/lwres_config.docbook b/lib/lwres/man/lwres_config.docbook
index b405d3ade8..1516af8e77 100644
--- a/lib/lwres/man/lwres_config.docbook
+++ b/lib/lwres/man/lwres_config.docbook
@@ -24,6 +24,8 @@
+ 2000
+ 2001
2004
2005
2007
@@ -32,11 +34,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- Internet Software Consortium.
-
diff --git a/lib/lwres/man/lwres_context.docbook b/lib/lwres/man/lwres_context.docbook
index 6100e7ff85..1754e4fdd1 100644
--- a/lib/lwres/man/lwres_context.docbook
+++ b/lib/lwres/man/lwres_context.docbook
@@ -26,6 +26,9 @@
+ 2000
+ 2001
+ 2003
2004
2005
2007
@@ -34,12 +37,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- 2003
- Internet Software Consortium.
-
diff --git a/lib/lwres/man/lwres_gabn.docbook b/lib/lwres/man/lwres_gabn.docbook
index a55c51ef8f..7bcbc2a5d0 100644
--- a/lib/lwres/man/lwres_gabn.docbook
+++ b/lib/lwres/man/lwres_gabn.docbook
@@ -26,6 +26,8 @@
+ 2000
+ 2001
2004
2005
2007
@@ -34,11 +36,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- Internet Software Consortium.
-
diff --git a/lib/lwres/man/lwres_gai_strerror.docbook b/lib/lwres/man/lwres_gai_strerror.docbook
index fcc30ff547..b5d3c62120 100644
--- a/lib/lwres/man/lwres_gai_strerror.docbook
+++ b/lib/lwres/man/lwres_gai_strerror.docbook
@@ -24,6 +24,8 @@
+ 2000
+ 2001
2004
2005
2007
@@ -32,11 +34,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- Internet Software Consortium.
-
diff --git a/lib/lwres/man/lwres_getaddrinfo.docbook b/lib/lwres/man/lwres_getaddrinfo.docbook
index 23eb3ce551..aad61f1c5f 100644
--- a/lib/lwres/man/lwres_getaddrinfo.docbook
+++ b/lib/lwres/man/lwres_getaddrinfo.docbook
@@ -26,6 +26,9 @@
+ 2000
+ 2001
+ 2003
2004
2005
2007
@@ -34,12 +37,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- 2003
- Internet Software Consortium.
-
diff --git a/lib/lwres/man/lwres_gethostent.docbook b/lib/lwres/man/lwres_gethostent.docbook
index 169c31adae..21ad2a1140 100644
--- a/lib/lwres/man/lwres_gethostent.docbook
+++ b/lib/lwres/man/lwres_gethostent.docbook
@@ -26,6 +26,7 @@
+ 2001
2004
2005
2007
@@ -34,10 +35,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2001
- Internet Software Consortium.
-
diff --git a/lib/lwres/man/lwres_getipnode.docbook b/lib/lwres/man/lwres_getipnode.docbook
index 6b0de5a8ad..b0625baec6 100644
--- a/lib/lwres/man/lwres_getipnode.docbook
+++ b/lib/lwres/man/lwres_getipnode.docbook
@@ -24,6 +24,9 @@
+ 2000
+ 2001
+ 2003
2004
2005
2007
@@ -32,12 +35,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- 2003
- Internet Software Consortium.
-
diff --git a/lib/lwres/man/lwres_getnameinfo.docbook b/lib/lwres/man/lwres_getnameinfo.docbook
index 39b539928d..a1e7f13963 100644
--- a/lib/lwres/man/lwres_getnameinfo.docbook
+++ b/lib/lwres/man/lwres_getnameinfo.docbook
@@ -24,6 +24,8 @@
+ 2000
+ 2001
2004
2005
2007
@@ -32,11 +34,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- Internet Software Consortium.
-
diff --git a/lib/lwres/man/lwres_getrrsetbyname.docbook b/lib/lwres/man/lwres_getrrsetbyname.docbook
index bb0d7716c2..5d5ee0db72 100644
--- a/lib/lwres/man/lwres_getrrsetbyname.docbook
+++ b/lib/lwres/man/lwres_getrrsetbyname.docbook
@@ -24,6 +24,8 @@
+ 2000
+ 2001
2004
2005
2007
@@ -32,11 +34,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- Internet Software Consortium.
-
diff --git a/lib/lwres/man/lwres_gnba.docbook b/lib/lwres/man/lwres_gnba.docbook
index e7adfb89c4..8d9b0e8d0c 100644
--- a/lib/lwres/man/lwres_gnba.docbook
+++ b/lib/lwres/man/lwres_gnba.docbook
@@ -26,6 +26,8 @@
+ 2000
+ 2001
2004
2005
2007
@@ -34,11 +36,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- Internet Software Consortium.
-
diff --git a/lib/lwres/man/lwres_hstrerror.docbook b/lib/lwres/man/lwres_hstrerror.docbook
index 9c345f4a42..c1b9056bf4 100644
--- a/lib/lwres/man/lwres_hstrerror.docbook
+++ b/lib/lwres/man/lwres_hstrerror.docbook
@@ -24,6 +24,8 @@
+ 2000
+ 2001
2004
2005
2007
@@ -32,11 +34,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- Internet Software Consortium.
-
diff --git a/lib/lwres/man/lwres_inetntop.docbook b/lib/lwres/man/lwres_inetntop.docbook
index 0ed006389c..ab3920ea6b 100644
--- a/lib/lwres/man/lwres_inetntop.docbook
+++ b/lib/lwres/man/lwres_inetntop.docbook
@@ -26,6 +26,8 @@
+ 2000
+ 2001
2004
2005
2007
@@ -34,11 +36,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- Internet Software Consortium.
-
diff --git a/lib/lwres/man/lwres_noop.docbook b/lib/lwres/man/lwres_noop.docbook
index 907d7175c7..900e79c348 100644
--- a/lib/lwres/man/lwres_noop.docbook
+++ b/lib/lwres/man/lwres_noop.docbook
@@ -26,6 +26,8 @@
+ 2000
+ 2001
2004
2005
2007
@@ -34,11 +36,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- Internet Software Consortium.
-
diff --git a/lib/lwres/man/lwres_packet.docbook b/lib/lwres/man/lwres_packet.docbook
index 7a0470bff4..66c22c2907 100644
--- a/lib/lwres/man/lwres_packet.docbook
+++ b/lib/lwres/man/lwres_packet.docbook
@@ -24,6 +24,8 @@
+ 2000
+ 2001
2004
2005
2007
@@ -32,11 +34,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- Internet Software Consortium.
-
diff --git a/lib/lwres/man/lwres_resutil.docbook b/lib/lwres/man/lwres_resutil.docbook
index 2c04b44cee..80c9bd22af 100644
--- a/lib/lwres/man/lwres_resutil.docbook
+++ b/lib/lwres/man/lwres_resutil.docbook
@@ -24,6 +24,8 @@
+ 2000
+ 2001
2004
2005
2007
@@ -32,11 +34,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- Internet Software Consortium.
-
diff --git a/util/copyrights b/util/copyrights
index c7b6e79f19..b50941b201 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -3279,7 +3279,6 @@
./doc/markdown/howto.mkd MKD 2014,2016
./doc/markdown/style.mkd MKD 2014,2016
./doc/misc/Makefile.in MAKE 2001,2004,2007,2009,2012,2016
-./doc/misc/SIT TXT.BRIEF 2014,2016
./doc/misc/dnssec TXT.BRIEF 2000,2001,2002,2004,2016
./doc/misc/format-options.pl PERL 2001,2004,2007,2012,2016
./doc/misc/ipv6 TXT.BRIEF 2000,2001,2004,2016
diff --git a/util/update_copyrights b/util/update_copyrights
index 6e05c32ec2..398a24f5b4 100644
--- a/util/update_copyrights
+++ b/util/update_copyrights
@@ -83,11 +83,8 @@ sub copyright {
}
sub copyrights {
- my $a = copyright("Internet Systems Consortium, Inc. (\"ISC\")",
- grep({ $_ >= 2004} @_));
- my $b = copyright("Internet Software Consortium.",
- grep({ $_ < 2004} @_));
- return "$a$b";
+ my $a = copyright("Internet Systems Consortium, Inc. (\"ISC\")", @_);
+ return "$a";
}
foreach $file (keys %file_types) {