consolidate copyrights

diff --git a/bin/check/named-checkconf.docbook b/bin/check/named-checkconf.docbook
index 11b36714ff5748aa8fc5c2e03f8a443fca4ea5bd..040071e58b9c0fb28e4ebe61a68f4b075d2dff89 100644 (file)
--- a/bin/check/named-checkconf.docbook
+++ b/bin/check/named-checkconf.docbook
@@ -26,6 +26,9 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2002</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -35,12 +38,6 @@
       <year>2016</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2002</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>

diff --git a/bin/check/named-checkzone.docbook b/bin/check/named-checkzone.docbook
index c702cdf1b8d528aafa00619e234a94e7a84b1dd6..e7c5f60adcb12f0369bcaa47f099825d738b9a91 100644 (file)
--- a/bin/check/named-checkzone.docbook
+++ b/bin/check/named-checkzone.docbook
@@ -24,6 +24,9 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2002</year>
       <year>2004</year>
       <year>2005</year>
       <year>2006</year>
@@ -38,12 +41,6 @@
       <year>2016</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2002</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>

diff --git a/bin/confgen/rndc-confgen.docbook b/bin/confgen/rndc-confgen.docbook
index 094a376a5fdc7eaba6c1d0c25a22424a76d45a4a..d58964880f62311443f3a1d2e0c4ac84e324655e 100644 (file)
--- a/bin/confgen/rndc-confgen.docbook
+++ b/bin/confgen/rndc-confgen.docbook
@@ -29,6 +29,8 @@
 
   <docinfo>
     <copyright>
+      <year>2001</year>
+      <year>2003</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -39,11 +41,6 @@
       <year>2016</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2001</year>
-      <year>2003</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refsynopsisdiv>

diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook
index 7673a75630d8183cdece62e65c0a4163203695ea..cc056e76edd07f93cb5c309baa3de50c2a9b1555 100644 (file)
--- a/bin/dig/dig.docbook
+++ b/bin/dig/dig.docbook
@@ -31,6 +31,10 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2002</year>
+      <year>2003</year>
       <year>2004</year>
       <year>2005</year>
       <year>2006</year>
@@ -45,13 +49,6 @@
       <year>2016</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2002</year>
-      <year>2003</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refsynopsisdiv>

diff --git a/bin/dig/host.docbook b/bin/dig/host.docbook
index e59d11530f228e762e44648b56b9e92eb091eb4f..cdf9df729b250256c564fd793f6ef8b5cde53248 100644 (file)
--- a/bin/dig/host.docbook
+++ b/bin/dig/host.docbook
@@ -31,6 +31,9 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2002</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -41,12 +44,6 @@
       <year>2016</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2002</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refsynopsisdiv>

diff --git a/bin/dnssec/dnssec-keygen.docbook b/bin/dnssec/dnssec-keygen.docbook
index 865758cec4590912cfc548c11513556a0a963a6f..fd5fda637fb8cbb54f264dfe0aec8b5d2d508467 100644 (file)
--- a/bin/dnssec/dnssec-keygen.docbook
+++ b/bin/dnssec/dnssec-keygen.docbook
@@ -30,6 +30,10 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2002</year>
+      <year>2003</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -43,13 +47,6 @@
       <year>2016</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2002</year>
-      <year>2003</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refsynopsisdiv>

diff --git a/bin/dnssec/dnssec-signzone.docbook b/bin/dnssec/dnssec-signzone.docbook
index 5c7caaed5b67723402497d50838b78129959df80..761d343867484a214a227f793238be11b395050e 100644 (file)
--- a/bin/dnssec/dnssec-signzone.docbook
+++ b/bin/dnssec/dnssec-signzone.docbook
@@ -29,6 +29,10 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2002</year>
+      <year>2003</year>
       <year>2004</year>
       <year>2005</year>
       <year>2006</year>
@@ -43,13 +47,6 @@
       <year>2016</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2002</year>
-      <year>2003</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refsynopsisdiv>

diff --git a/bin/named/lwresd.docbook b/bin/named/lwresd.docbook
index 44c8078d7935a55e17efd29232a88c54838f4dc1..43e54d4f956696e04c03364a103aa00491dc72a8 100644 (file)
--- a/bin/named/lwresd.docbook
+++ b/bin/named/lwresd.docbook
@@ -29,6 +29,8 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -39,11 +41,6 @@
       <year>2016</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refsynopsisdiv>

diff --git a/bin/named/named.docbook b/bin/named/named.docbook
index f1aa76bab686f0d044b39fa80d2391b0842c58f0..2e4e2a517ecfac203c40b4bd171c8e883486a6d3 100644 (file)
--- a/bin/named/named.docbook
+++ b/bin/named/named.docbook
@@ -29,6 +29,9 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2003</year>
       <year>2004</year>
       <year>2005</year>
       <year>2006</year>
@@ -42,12 +45,6 @@
       <year>2016</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2003</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refsynopsisdiv>

diff --git a/bin/nsupdate/nsupdate.docbook b/bin/nsupdate/nsupdate.docbook
index 984522c1f4fa4dc1237b942f752e8511737da111..2facc4bb17bccef0a8288562010c555e40f58a6d 100644 (file)
--- a/bin/nsupdate/nsupdate.docbook
+++ b/bin/nsupdate/nsupdate.docbook
@@ -28,6 +28,10 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2002</year>
+      <year>2003</year>
       <year>2004</year>
       <year>2005</year>
       <year>2006</year>
@@ -42,13 +46,6 @@
       <year>2016</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2002</year>
-      <year>2003</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refsynopsisdiv>

diff --git a/bin/rndc/rndc.conf.docbook b/bin/rndc/rndc.conf.docbook
index f769d9bef1ee1fdb0e9189bbdc5cd3de7634d5bd..0e51cb47a2fc9310c1456be32f8404df37f6db10 100644 (file)
--- a/bin/rndc/rndc.conf.docbook
+++ b/bin/rndc/rndc.conf.docbook
@@ -29,6 +29,8 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -38,11 +40,6 @@
       <year>2016</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refsynopsisdiv>

diff --git a/bin/rndc/rndc.docbook b/bin/rndc/rndc.docbook
index 9247e4835b366a350809ef1d117fac7dc4a65836..dcd228db2751e91c957b3b232363c6a2f0a4c8ba 100644 (file)
--- a/bin/rndc/rndc.docbook
+++ b/bin/rndc/rndc.docbook
@@ -29,6 +29,8 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -38,11 +40,6 @@
       <year>2016</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refsynopsisdiv>

diff --git a/lib/lwres/man/lwres.docbook b/lib/lwres/man/lwres.docbook
index 211965cb2831536ab3b991676bc59cf327636f36..b409b85f88c70e4ffcf6ac0cd95eabdccfb96ef7 100644 (file)
--- a/lib/lwres/man/lwres.docbook
+++ b/lib/lwres/man/lwres.docbook
@@ -28,6 +28,8 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -36,11 +38,6 @@
       <year>2016</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refsynopsisdiv>

diff --git a/lib/lwres/man/lwres_buffer.docbook b/lib/lwres/man/lwres_buffer.docbook
index 6efdcf93e2988bcd8526c8a2d506615524222808..f7c543ae214affa22c9658ebd71cb434e78b098b 100644 (file)
--- a/lib/lwres/man/lwres_buffer.docbook
+++ b/lib/lwres/man/lwres_buffer.docbook
@@ -24,6 +24,8 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -32,11 +34,6 @@
       <year>2016</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>

diff --git a/lib/lwres/man/lwres_config.docbook b/lib/lwres/man/lwres_config.docbook
index b405d3ade8a6dfd27001a30c710c5863ca9701bb..1516af8e7797e573821c83f3a2ce379e9ac28e2b 100644 (file)
--- a/lib/lwres/man/lwres_config.docbook
+++ b/lib/lwres/man/lwres_config.docbook
@@ -24,6 +24,8 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -32,11 +34,6 @@
       <year>2016</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>

diff --git a/lib/lwres/man/lwres_context.docbook b/lib/lwres/man/lwres_context.docbook
index 6100e7ff857103d119ece4cbcc7b9e6bce8b3621..1754e4fdd1cfbc928e9d08180e514c93345a723f 100644 (file)
--- a/lib/lwres/man/lwres_context.docbook
+++ b/lib/lwres/man/lwres_context.docbook
@@ -26,6 +26,9 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2003</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -34,12 +37,6 @@
       <year>2016</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2003</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>

diff --git a/lib/lwres/man/lwres_gabn.docbook b/lib/lwres/man/lwres_gabn.docbook
index a55c51ef8fd908b7991436aed6481ec8344c36f3..7bcbc2a5d0212981452f796df7b4e07468ef002d 100644 (file)
--- a/lib/lwres/man/lwres_gabn.docbook
+++ b/lib/lwres/man/lwres_gabn.docbook
@@ -26,6 +26,8 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -34,11 +36,6 @@
       <year>2016</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>

diff --git a/lib/lwres/man/lwres_gai_strerror.docbook b/lib/lwres/man/lwres_gai_strerror.docbook
index fcc30ff54792cc3d5c4d2c06d9dfad0f043fd9d2..b5d3c62120a296b2299350216a13eaa828b6efca 100644 (file)
--- a/lib/lwres/man/lwres_gai_strerror.docbook
+++ b/lib/lwres/man/lwres_gai_strerror.docbook
@@ -24,6 +24,8 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -32,11 +34,6 @@
       <year>2016</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>

diff --git a/lib/lwres/man/lwres_getaddrinfo.docbook b/lib/lwres/man/lwres_getaddrinfo.docbook
index 23eb3ce5512d89d17fedeffb0ca299f950601df9..aad61f1c5f8100e57237eca1ddb802af3cc0d712 100644 (file)
--- a/lib/lwres/man/lwres_getaddrinfo.docbook
+++ b/lib/lwres/man/lwres_getaddrinfo.docbook
@@ -26,6 +26,9 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2003</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -34,12 +37,6 @@
       <year>2016</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2003</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>

diff --git a/lib/lwres/man/lwres_gethostent.docbook b/lib/lwres/man/lwres_gethostent.docbook
index 169c31adae13efe224e6bd081222f09fcd6cd07b..21ad2a1140697e22b950ff869182d7030f0853a1 100644 (file)
--- a/lib/lwres/man/lwres_gethostent.docbook
+++ b/lib/lwres/man/lwres_gethostent.docbook
@@ -26,6 +26,7 @@
 
   <docinfo>
     <copyright>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -34,10 +35,6 @@
       <year>2016</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>

diff --git a/lib/lwres/man/lwres_getipnode.docbook b/lib/lwres/man/lwres_getipnode.docbook
index 6b0de5a8adf41ff5d871048c801b10fff8fad9b7..b0625baec61b8a55a2d9c8097a8c4743082b1315 100644 (file)
--- a/lib/lwres/man/lwres_getipnode.docbook
+++ b/lib/lwres/man/lwres_getipnode.docbook
@@ -24,6 +24,9 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2003</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -32,12 +35,6 @@
       <year>2016</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2003</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>

diff --git a/lib/lwres/man/lwres_getnameinfo.docbook b/lib/lwres/man/lwres_getnameinfo.docbook
index 39b539928d7ad2791d646360798fe902a1c72244..a1e7f13963f28d13ce0c7ec2d2470367b38c865f 100644 (file)
--- a/lib/lwres/man/lwres_getnameinfo.docbook
+++ b/lib/lwres/man/lwres_getnameinfo.docbook
@@ -24,6 +24,8 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -32,11 +34,6 @@
       <year>2016</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>

diff --git a/lib/lwres/man/lwres_getrrsetbyname.docbook b/lib/lwres/man/lwres_getrrsetbyname.docbook
index bb0d7716c2d9b54af185f13bc0dcec9aff4d7b1b..5d5ee0db72fc05d0cefe3f67c122e5c4d647dd8b 100644 (file)
--- a/lib/lwres/man/lwres_getrrsetbyname.docbook
+++ b/lib/lwres/man/lwres_getrrsetbyname.docbook
@@ -24,6 +24,8 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -32,11 +34,6 @@
       <year>2016</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>

diff --git a/lib/lwres/man/lwres_gnba.docbook b/lib/lwres/man/lwres_gnba.docbook
index e7adfb89c40efa66481d24a7f016a74b4d6edc5a..8d9b0e8d0cbc475dadc9e8f098f8b42c9344aa2e 100644 (file)
--- a/lib/lwres/man/lwres_gnba.docbook
+++ b/lib/lwres/man/lwres_gnba.docbook
@@ -26,6 +26,8 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -34,11 +36,6 @@
       <year>2016</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>

diff --git a/lib/lwres/man/lwres_hstrerror.docbook b/lib/lwres/man/lwres_hstrerror.docbook
index 9c345f4a422d6565c66bdb62925479656302b2c6..c1b9056bf43a6381a22ec6739de2d81d36f6ca52 100644 (file)
--- a/lib/lwres/man/lwres_hstrerror.docbook
+++ b/lib/lwres/man/lwres_hstrerror.docbook
@@ -24,6 +24,8 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -32,11 +34,6 @@
       <year>2016</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>

diff --git a/lib/lwres/man/lwres_inetntop.docbook b/lib/lwres/man/lwres_inetntop.docbook
index 0ed006389cbe36d513c9b70898e9bc25828286d1..ab3920ea6be0290fc95857a705cfabd36101bcad 100644 (file)
--- a/lib/lwres/man/lwres_inetntop.docbook
+++ b/lib/lwres/man/lwres_inetntop.docbook
@@ -26,6 +26,8 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -34,11 +36,6 @@
       <year>2016</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>

diff --git a/lib/lwres/man/lwres_noop.docbook b/lib/lwres/man/lwres_noop.docbook
index 907d7175c7718c38bfca916c16a9b8967d495bcb..900e79c348363d8e3570eddb4c3d419437231342 100644 (file)
--- a/lib/lwres/man/lwres_noop.docbook
+++ b/lib/lwres/man/lwres_noop.docbook
@@ -26,6 +26,8 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -34,11 +36,6 @@
       <year>2016</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>

diff --git a/lib/lwres/man/lwres_packet.docbook b/lib/lwres/man/lwres_packet.docbook
index 7a0470bff4492f65c94867a310f7e5be35126b23..66c22c29078ddcfece91351d560fff9174843330 100644 (file)
--- a/lib/lwres/man/lwres_packet.docbook
+++ b/lib/lwres/man/lwres_packet.docbook
@@ -24,6 +24,8 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -32,11 +34,6 @@
       <year>2016</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>

diff --git a/lib/lwres/man/lwres_resutil.docbook b/lib/lwres/man/lwres_resutil.docbook
index 2c04b44cee258009be34821c21fd59b40c37d8bc..80c9bd22af6b42afce4bacf1e712ccc3aea44823 100644 (file)
--- a/lib/lwres/man/lwres_resutil.docbook
+++ b/lib/lwres/man/lwres_resutil.docbook
@@ -24,6 +24,8 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -32,11 +34,6 @@
       <year>2016</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>

diff --git a/util/copyrights b/util/copyrights
index c7b6e79f19d741b3e1b42dee8798bd05dd0618f4..b50941b201f7d9bf622493f219cc7cb9b708697e 100644 (file)
--- 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 6e05c32ec20b00bcf2016a3855e6e8a5dfd6c9c6..398a24f5b4cb2ae830907d2d97c48e6208cc8c46 100644 (file)
--- 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) {