diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook
index 6651af9b51..a134e811dd 100644
--- a/bin/dig/dig.docbook
+++ b/bin/dig/dig.docbook
@@ -708,7 +708,7 @@
 	    <para>
 	      Specify EDNS option with code point <option>code</option>
 	      and optionally payload of <option>value</option> as a
-	      hexadecimal string.  <option>code</option> can be 
+	      hexadecimal string.  <option>code</option> can be
 	      either an EDNS option name (for example,
 	      <literal>NSID</literal> or <literal>ECS</literal>),
 	      or an arbitrary numeric value.  <option>+noednsopt</option>
diff --git a/bin/tests/system/digdelv/ns3/named.conf b/bin/tests/system/digdelv/ns3/named.conf
index 0fda0754f1..fcd2abc6dd 100644
--- a/bin/tests/system/digdelv/ns3/named.conf
+++ b/bin/tests/system/digdelv/ns3/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015-2017  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
diff --git a/bin/tests/system/digdelv/tests.sh b/bin/tests/system/digdelv/tests.sh
index 713042d474..594f74fc9e 100644
--- a/bin/tests/system/digdelv/tests.sh
+++ b/bin/tests/system/digdelv/tests.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015-2017  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
diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index 1070c4e9ee..d17535d3fa 100644
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -122,7 +122,7 @@
       <listitem>
 	<para>
 	  <command>dig +ednsopt</command> now accepts the names
-	  for EDNS options in addition to numeric values. For example, 
+	  for EDNS options in addition to numeric values. For example,
 	  an EDNS Client-Subnet option could be sent using
 	  <command>dig +ednsopt=ecs:...</command>. Thanks to
 	  John Worley of Secure64 for the contribution. [RT #44461]