copyrights

diff --git a/doc/design/db_rules b/doc/design/db_rules
index b2410c58a4221f3f1d1427f1210dbd6303a87eb8..f569c3c83260ee8e7ea7fbc8313dabb06616f091 100644 (file)
--- a/doc/design/db_rules
+++ b/doc/design/db_rules
@@ -2,13 +2,10 @@ Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: db_rules,v 1.8 2004/03/05 05:04:46 marka Exp $
-
 Here is a more formal statement of the important database design
 rules.  Each rule has a 5 character mnemonic, for use in source code
 comments.
 
-
 Reference Safety                                               [DBREF]
 
        1)      Any node reference retrieved from the database shall remain
@@ -91,4 +88,4 @@ Cache Rdataset Lookups                                                [DBCRL]
 Cache Updates                                                  [DBCUP]
 
        Concurrent attempts to update the same rdataset type of a given
-       node must appear to execute in some order.
\ No newline at end of file
+       node must appear to execute in some order.

diff --git a/doc/dev/tests b/doc/dev/tests
index 38e281ae93d95dc2cbb52d93f0f0e1954a738ba3..5cccc28a8fbe5cbf93731234f1c16c2f694a3aca 100644 (file)
--- a/doc/dev/tests
+++ b/doc/dev/tests
@@ -2,12 +2,9 @@ Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: tests,v 1.15 2004/03/05 05:04:50 marka Exp $
-
 We do hourly test builds of the bind9 tree.  This is an attempt to
 document how they work.
 
-
 * How things work
 
 The scripts driving the build system are in ~wpk/b9t.  They are now

diff --git a/lib/dns/tests/sigs_test.c b/lib/dns/tests/sigs_test.c
index 353ee8d5d65ba9c48d5367f9b6d14d333014ab39..6bd1f979d5119d5a9a688c1963754c1424807aba 100644 (file)
--- a/lib/dns/tests/sigs_test.c
+++ b/lib/dns/tests/sigs_test.c
@@ -1,12 +1,17 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
  */
 
 /*! \file */
@@ -461,11 +466,11 @@ ATF_TC_BODY(updatesigs, tc) {
 #else
 ATF_TC(untested);
 ATF_TC_HEAD(untested, tc) {
-        atf_tc_set_md_var(tc, "descr", "skipping dns__zone_updatesigs() test");
+       atf_tc_set_md_var(tc, "descr", "skipping dns__zone_updatesigs() test");
 }
 ATF_TC_BODY(untested, tc) {
-        UNUSED(tc);
-        atf_tc_skip("DNSSEC support not compiled in");
+       UNUSED(tc);
+       atf_tc_skip("DNSSEC support not compiled in");
 }
 #endif
 

diff --git a/lib/dns/zone_p.h b/lib/dns/zone_p.h
index e1bb7acc3d936bf2296cd243e5cb171bc9563a75..44feb8cb0c3b16afa5a754b3ce71e766d15c3483 100644 (file)
--- a/lib/dns/zone_p.h
+++ b/lib/dns/zone_p.h
@@ -1,12 +1,17 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
  */
 
 #ifndef DNS_ZONE_P_H

diff --git a/util/copyrights b/util/copyrights
index 2cadfdbdcbc2130a2454f878e2553d6612134c2b..6b02c58da735c750a84770bc166e106716212b9c 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -2730,6 +2730,7 @@
 ./doc/arm/notes.conf                           X       2015,2018
 ./doc/arm/notes.html                           X       2014,2015,2016,2017,2018
 ./doc/arm/notes.pdf                            X       2014,2015,2016,2017,2018
+./doc/arm/notes.txt                            X       2018
 ./doc/arm/notes.xml                            SGML    2014,2015,2016,2017,2018
 ./doc/arm/noteversion.xml.in                   SGML    2015,2018
 ./doc/arm/pkcs11.xml                           SGML    2010,2012,2013,2014,2015,2016,2018