Merge branch 'develop' into release_20140225

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013, Versign, Inc., NLnet Labs
+Copyright (c) 2013, Verisign, Inc., NLnet Labs
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -8,7 +8,7 @@ modification, are permitted provided that the following conditions are met:
 * Redistributions in binary form must reproduce the above copyright
   notice, this list of conditions and the following disclaimer in the
   documentation and/or other materials provided with the distribution.
-* Neither the name of the <organization> nor the
+* Neither the names of the copyright holders nor the
   names of its contributors may be used to endorse or promote products
   derived from this software without specific prior written permission.
 

Makefile.in

@@ -2,7 +2,7 @@
 # @configure_input@
 #
 #
-# Copyright (c) 2013, Versign, Inc., NLnet Labs
+# Copyright (c) 2013, Verisign, Inc., NLnet Labs
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without
@@ -12,7 +12,7 @@
 # * Redistributions in binary form must reproduce the above copyright
 #   notice, this list of conditions and the following disclaimer in the
 #   documentation and/or other materials provided with the distribution.
-# * Neither the name of the <organization> nor the
+# * Neither the names of the copyright holders nor the
 #   names of its contributors may be used to endorse or promote products
 #   derived from this software without specific prior written permission.
 # 

configure.ac

@@ -4,7 +4,7 @@
 #
 # @configure_input@
 #
-# Copyright (c) 2013, Versign, Inc., NLnet Labs
+# Copyright (c) 2013, Verisign, Inc., NLnet Labs
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
 # * Redistributions in binary form must reproduce the above copyright
 #   notice, this list of conditions and the following disclaimer in the
 #   documentation and/or other materials provided with the distribution.
-# * Neither the name of the <organization> nor the
+# * Neither the names of the copyright holders nor the
 #   names of its contributors may be used to endorse or promote products
 #   derived from this software without specific prior written permission.
 #

doc/Makefile.in

@@ -2,7 +2,7 @@
 # @configure_input@
 #
 #
-# Copyright (c) 2013, Versign, Inc., NLNet Labs
+# Copyright (c) 2013, Verisign, Inc., NLNet Labs
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without
@@ -12,7 +12,7 @@
 # * Redistributions in binary form must reproduce the above copyright
 #   notice, this list of conditions and the following disclaimer in the
 #   documentation and/or other materials provided with the distribution.
-# * Neither the name of the <organization> nor the
+# * Neither the names of the copyright holders nor the
 #   names of its contributors may be used to endorse or promote products
 #   derived from this software without specific prior written permission.
 # 

doc/getdns_address.3.in

@@ -10,7 +10,7 @@
 .\" * Redistributions in binary form must reproduce the above copyright
 .\"   notice, this list of conditions and the following disclaimer in the
 .\"   documentation and/or other materials provided with the distribution.
-.\" * Neither the name of the <organization> nor the
+.\" * Neither the names of the copyright holders nor the
 .\"   names of its contributors may be used to endorse or promote products
 .\"   derived from this software without specific prior written permission.
 .\" 

doc/getdns_cancel_callback.3.in

@@ -10,7 +10,7 @@
 .\" * Redistributions in binary form must reproduce the above copyright
 .\"   notice, this list of conditions and the following disclaimer in the
 .\"   documentation and/or other materials provided with the distribution.
-.\" * Neither the name of the <organization> nor the
+.\" * Neither the names of the copyright holders nor the
 .\"   names of its contributors may be used to endorse or promote products
 .\"   derived from this software without specific prior written permission.
 .\" 

doc/getdns_context.3.in

@@ -10,7 +10,7 @@
 .\" * Redistributions in binary form must reproduce the above copyright
 .\"   notice, this list of conditions and the following disclaimer in the
 .\"   documentation and/or other materials provided with the distribution.
-.\" * Neither the name of the <organization> nor the
+.\" * Neither the names of the copyright holders nor the
 .\"   names of its contributors may be used to endorse or promote products
 .\"   derived from this software without specific prior written permission.
 .\" 

doc/getdns_context_set.3.in

@@ -10,7 +10,7 @@
 .\" * Redistributions in binary form must reproduce the above copyright
 .\"   notice, this list of conditions and the following disclaimer in the
 .\"   documentation and/or other materials provided with the distribution.
-.\" * Neither the name of the <organization> nor the
+.\" * Neither the names of the copyright holders nor the
 .\"   names of its contributors may be used to endorse or promote products
 .\"   derived from this software without specific prior written permission.
 .\" 

doc/getdns_convert.3.in

@@ -10,7 +10,7 @@
 .\" * Redistributions in binary form must reproduce the above copyright
 .\"   notice, this list of conditions and the following disclaimer in the
 .\"   documentation and/or other materials provided with the distribution.
-.\" * Neither the name of the <organization> nor the
+.\" * Neither the names of the copyright holders nor the
 .\"   names of its contributors may be used to endorse or promote products
 .\"   derived from this software without specific prior written permission.
 .\" 

doc/getdns_dict.3.in

@@ -10,7 +10,7 @@
 .\" * Redistributions in binary form must reproduce the above copyright
 .\"   notice, this list of conditions and the following disclaimer in the
 .\"   documentation and/or other materials provided with the distribution.
-.\" * Neither the name of the <organization> nor the
+.\" * Neither the names of the copyright holders nor the
 .\"   names of its contributors may be used to endorse or promote products
 .\"   derived from this software without specific prior written permission.
 .\" 

doc/getdns_dict_get.3.in

@@ -10,7 +10,7 @@
 .\" * Redistributions in binary form must reproduce the above copyright
 .\"   notice, this list of conditions and the following disclaimer in the
 .\"   documentation and/or other materials provided with the distribution.
-.\" * Neither the name of the <organization> nor the
+.\" * Neither the names of the copyright holders nor the
 .\"   names of its contributors may be used to endorse or promote products
 .\"   derived from this software without specific prior written permission.
 .\" 

doc/getdns_dict_set.3.in

@@ -10,7 +10,7 @@
 .\" * Redistributions in binary form must reproduce the above copyright
 .\"   notice, this list of conditions and the following disclaimer in the
 .\"   documentation and/or other materials provided with the distribution.
-.\" * Neither the name of the <organization> nor the
+.\" * Neither the names of the copyright holders nor the
 .\"   names of its contributors may be used to endorse or promote products
 .\"   derived from this software without specific prior written permission.
 .\" 

doc/getdns_free_sync_request_memory.3.in

@@ -10,7 +10,7 @@
 .\" * Redistributions in binary form must reproduce the above copyright
 .\"   notice, this list of conditions and the following disclaimer in the
 .\"   documentation and/or other materials provided with the distribution.
-.\" * Neither the name of the <organization> nor the
+.\" * Neither the names of the copyright holders nor the
 .\"   names of its contributors may be used to endorse or promote products
 .\"   derived from this software without specific prior written permission.
 .\" 

doc/getdns_general.3.in

@@ -10,7 +10,7 @@
 .\" * Redistributions in binary form must reproduce the above copyright
 .\"   notice, this list of conditions and the following disclaimer in the
 .\"   documentation and/or other materials provided with the distribution.
-.\" * Neither the name of the <organization> nor the
+.\" * Neither the names of the copyright holders nor the
 .\"   names of its contributors may be used to endorse or promote products
 .\"   derived from this software without specific prior written permission.
 .\" 

doc/getdns_hostname.3.in

@@ -10,7 +10,7 @@
 .\" * Redistributions in binary form must reproduce the above copyright
 .\"   notice, this list of conditions and the following disclaimer in the
 .\"   documentation and/or other materials provided with the distribution.
-.\" * Neither the name of the <organization> nor the
+.\" * Neither the names of the copyright holders nor the
 .\"   names of its contributors may be used to endorse or promote products
 .\"   derived from this software without specific prior written permission.
 .\" 

doc/getdns_list.3.in

@@ -10,7 +10,7 @@
 .\" * Redistributions in binary form must reproduce the above copyright
 .\"   notice, this list of conditions and the following disclaimer in the
 .\"   documentation and/or other materials provided with the distribution.
-.\" * Neither the name of the <organization> nor the
+.\" * Neither the names of the copyright holders nor the
 .\"   names of its contributors may be used to endorse or promote products
 .\"   derived from this software without specific prior written permission.
 .\" 

doc/getdns_list_get.3.in

@@ -10,7 +10,7 @@
 .\" * Redistributions in binary form must reproduce the above copyright
 .\"   notice, this list of conditions and the following disclaimer in the
 .\"   documentation and/or other materials provided with the distribution.
-.\" * Neither the name of the <organization> nor the
+.\" * Neither the names of the copyright holders nor the
 .\"   names of its contributors may be used to endorse or promote products
 .\"   derived from this software without specific prior written permission.
 .\" 

doc/getdns_list_set.3.in

@@ -10,7 +10,7 @@
 .\" * Redistributions in binary form must reproduce the above copyright
 .\"   notice, this list of conditions and the following disclaimer in the
 .\"   documentation and/or other materials provided with the distribution.
-.\" * Neither the name of the <organization> nor the
+.\" * Neither the names of the copyright holders nor the
 .\"   names of its contributors may be used to endorse or promote products
 .\"   derived from this software without specific prior written permission.
 .\" 

doc/getdns_service.3.in

@@ -10,7 +10,7 @@
 .\" * Redistributions in binary form must reproduce the above copyright
 .\"   notice, this list of conditions and the following disclaimer in the
 .\"   documentation and/or other materials provided with the distribution.
-.\" * Neither the name of the <organization> nor the
+.\" * Neither the names of the copyright holders nor the
 .\"   names of its contributors may be used to endorse or promote products
 .\"   derived from this software without specific prior written permission.
 .\" 

doc/libgetdns.3.in

@@ -10,7 +10,7 @@
 .\" * Redistributions in binary form must reproduce the above copyright
 .\"   notice, this list of conditions and the following disclaimer in the
 .\"   documentation and/or other materials provided with the distribution.
-.\" * Neither the name of the <organization> nor the
+.\" * Neither the names of the copyright holders nor the
 .\"   names of its contributors may be used to endorse or promote products
 .\"   derived from this software without specific prior written permission.
 .\" 

doc/manpgaltnames

@@ -2,7 +2,7 @@
 # generate list of alternate names for the specified man page
 # used to generate alternative man pages
 #
-# Copyright (c) 2013, Versign, Inc., NLNet Labs
+# Copyright (c) 2013, Verisign, Inc., NLNet Labs
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without
@@ -12,7 +12,7 @@
 # * Redistributions in binary form must reproduce the above copyright
 #   notice, this list of conditions and the following disclaimer in the
 #   documentation and/or other materials provided with the distribution.
-# * Neither the name of the <organization> nor the
+# * Neither the names of the copyright holders nor the
 #   names of its contributors may be used to endorse or promote products
 #   derived from this software without specific prior written permission.
 # 

src/Doxyfile.in

@@ -1,5 +1,5 @@
 # Doxyfile 1.8.3.1
-# Copyright (c) 2013, Versign, Inc., NLnet Labs
+# Copyright (c) 2013, Verisign, Inc., NLnet Labs
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
 # * Redistributions in binary form must reproduce the above copyright
 #   notice, this list of conditions and the following disclaimer in the
 #   documentation and/or other materials provided with the distribution.
-# * Neither the name of the <organization> nor the
+# * Neither the names of the copyright holders nor the
 #   names of its contributors may be used to endorse or promote products
 #   derived from this software without specific prior written permission.
 # 

src/Makefile.in

@@ -1,7 +1,7 @@
 #
 # @configure_input@
 #
-# Copyright (c) 2013, Versign, Inc., NLnet Labs
+# Copyright (c) 2013, Verisign, Inc., NLnet Labs
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@
 # * Redistributions in binary form must reproduce the above copyright
 #   notice, this list of conditions and the following disclaimer in the
 #   documentation and/or other materials provided with the distribution.
-# * Neither the name of the <organization> nor the
+# * Neither the names of the copyright holders nor the
 #   names of its contributors may be used to endorse or promote products
 #   derived from this software without specific prior written permission.
 #

src/const-info.h

@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright (c) 2013, NLnet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLnet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -20,7 +20,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/context.c

@@ -8,7 +8,7 @@
  */
 
 /*
- * Copyright (c) 2013, NLnet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLnet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -18,7 +18,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/context.h

@@ -8,7 +8,7 @@
  */
 
 /*
- * Copyright (c) 2013, NLnet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLnet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -18,7 +18,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/convert.c

@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (c) 2013, NLnet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLnet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -16,7 +16,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/dict.c

@@ -8,7 +8,7 @@
  */
 
 /*
- * Copyright (c) 2013, NLnet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLnet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -18,7 +18,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/dict.h

@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (c) 2013, NLnet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLnet Labs, Verisign, Inc.
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -16,7 +16,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/dnssec.c

@@ -9,7 +9,7 @@
  */
 
 /*
- * Copyright (c) 2013, NLnet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLnet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -19,7 +19,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/dnssec.h

@@ -9,7 +9,7 @@
  */
 
 /*
- * Copyright (c) 2013, NLnet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLnet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -19,7 +19,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/example/Makefile.in

@@ -1,7 +1,7 @@
 #
 # @configure_input@
 #
-# Copyright (c) 2013, Versign, Inc., NLNet Labs
+# Copyright (c) 2013, Verisign, Inc., NLNet Labs
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@
 # * Redistributions in binary form must reproduce the above copyright
 #   notice, this list of conditions and the following disclaimer in the
 #   documentation and/or other materials provided with the distribution.
-# * Neither the name of the <organization> nor the
+# * Neither the names of the copyright holders nor the
 #   names of its contributors may be used to endorse or promote products
 #   derived from this software without specific prior written permission.
 #

src/example/getdns_core_only.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/example/getdns_libevent.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/extension/libev.c

@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -17,7 +17,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/extension/libevent.c

@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -17,7 +17,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/extension/libuv.c

@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -17,7 +17,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/general.c

@@ -9,7 +9,7 @@
  */
 
 /*
- * Copyright (c) 2013, NLnet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLnet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -19,7 +19,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/general.h

@@ -7,7 +7,7 @@
  *
  */
 /*
- * Copyright (c) 2013, NLnet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLnet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -17,7 +17,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/getdns/getdns.h.in

@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -17,7 +17,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/getdns/getdns_ext_libev.h

@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -17,7 +17,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/getdns/getdns_ext_libevent.h

@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -17,7 +17,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/getdns/getdns_ext_libuv.h

@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -17,7 +17,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/getdns/getdns_extra.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/getdns_error.c

@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2013, NLnet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLnet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -15,7 +15,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/getdns_error.h

@@ -6,7 +6,7 @@
  * Paul Hoffman.
  */
 /*
- * Copyright (c) 2013, NLnet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLnet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -16,7 +16,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/hostname.c

@@ -8,7 +8,7 @@
  */
 
 /*
- * Copyright (c) 2013, NLnet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLnet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -18,7 +18,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/list.c

@@ -8,7 +8,7 @@
  */
 
 /*
- * Copyright (c) 2013, NLnet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLnet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -18,7 +18,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/list.h

@@ -8,7 +8,7 @@
  */
 
 /*
- * Copyright (c) 2013, NLnet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLnet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -18,7 +18,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/request-internal.c

@@ -7,7 +7,7 @@
  *
  */
 /*
- * Copyright (c) 2013, NLnet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLnet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -17,7 +17,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/rr-dict.c

@@ -8,7 +8,7 @@
  *
  */
 /*
- * Copyright (c) 2013, NLnet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLnet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -18,7 +18,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/rr-dict.h

@@ -3,7 +3,7 @@
  * /brief getdns support functions for DNS Resource Records
  */
 /*
- * Copyright (c) 2013, NLnet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLnet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -13,7 +13,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/service.c

@@ -8,7 +8,7 @@
  */
 
 /*
- * Copyright (c) 2013, NLnet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLnet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -18,7 +18,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/sync.c

@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (c) 2013, NLnet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLnet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -17,7 +17,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/Makefile.in

@@ -1,7 +1,7 @@
 #
 # @configure_input@
 #
-# Copyright (c) 2013, Versign, Inc., NLNet Labs
+# Copyright (c) 2013, Verisign, Inc., NLNet Labs
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@
 # * Redistributions in binary form must reproduce the above copyright
 #   notice, this list of conditions and the following disclaimer in the
 #   documentation and/or other materials provided with the distribution.
-# * Neither the name of the <organization> nor the
+# * Neither the names of the copyright holders nor the
 #   names of its contributors may be used to endorse or promote products
 #   derived from this software without specific prior written permission.
 #

src/test/check_getdns.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_address.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_address_sync.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_cancel_callback.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_common.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_common.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_context_create.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_context_destroy.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_context_set_context_update_callback.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_context_set_dns_transport.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_context_set_timeout.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_context_set_timeout.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_context_set_upstream_recursive_servers.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_convert_alabel_to_ulabel.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_convert_ulabel_to_alabel.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_dict_destroy.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_dict_get_bindata.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_dict_get_data_type.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_dict_get_dict.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_dict_get_int.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_dict_get_list.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_dict_get_names.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_dict_set_bindata.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_dict_set_dict.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_dict_set_int.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_dict_set_list.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_display_ip_address.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_eventloop.h

@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -17,7 +17,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_general.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_general_sync.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_hostname.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_hostname_sync.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_libev.c

@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -17,7 +17,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_libevent.c

@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -17,7 +17,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_libevent.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_libuv.c

@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -17,7 +17,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_list_get_bindata.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_list_get_data_type.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_list_get_dict.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_list_get_int.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_list_get_length.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_list_get_list.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_pretty_print_dict.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_selectloop.c

@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -17,7 +17,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *

src/test/check_getdns_service.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NLNet Labs, Versign, Inc.
+ * Copyright (c) 2013, NLNet Labs, Verisign, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the <organization> nor the
+ * * Neither the names of the copyright holders nor the
  *   names of its contributors may be used to endorse or promote products
  *   derived from this software without specific prior written permission.
  *