From 383b0a0d20de4bf6674f7e852b804a9d91df3ea0 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Sat, 7 May 2016 04:14:02 +0000
Subject: Oops, TeX-style "--" numeric ranges in copyright comments are bad fit
 for XML.  Apparently we were carefully changing just the XML files to use a
 single "-" to work around this.  Enough already, just convert all copyright
 year ranges to single "-" and have done with this.

svn path=/branches/tk705/; revision=6427
---
 ca/irbe_cli                              |  4 ++--
 ca/rpki-nanny                            |  6 +++---
 ca/rpki-start-servers                    |  4 ++--
 ca/rpkic                                 |  6 +++---
 ca/rpkigui-apache-conf-gen               |  2 +-
 ca/tests/left-right-protocol-samples.xml |  4 ++--
 ca/tests/myrpki-xml-parse-test.py        |  2 +-
 ca/tests/old_irdbd.sql                   |  4 ++--
 ca/tests/smoketest.py                    |  6 +++---
 ca/tests/smoketest.setup.sql             |  2 +-
 ca/tests/sql-cleaner.py                  |  6 +++---
 ca/tests/sql-dumper.py                   |  2 +-
 ca/tests/testpoke.py                     |  4 ++--
 ca/tests/xml-parse-test.py               |  8 ++++----
 ca/tests/yamlconf.py                     |  6 +++---
 ca/tests/yamltest.py                     |  8 ++++----
 potpourri/oob-translate.xsl              |  2 +-
 rp/config/rpki-confgen                   |  2 +-
 rp/config/rpki-confgen.xml               |  4 ++--
 rp/config/rpki-generate-root-certificate |  2 +-
 rp/config/rpki-sql-backup                |  4 ++--
 rp/config/rpki-sql-setup                 |  4 ++--
 rp/rcynic/rcynic-cron                    |  2 +-
 rp/rcynic/rcynic-dump                    |  2 +-
 rp/rcynic/rcynic-html                    |  4 ++--
 rp/rcynic/rcynic.c                       |  6 +++---
 rp/rcynic/rcynicng                       |  2 +-
 rp/rcynic/rpki-torrent.py                |  2 +-
 rp/utils/find_roa                        |  2 +-
 rp/utils/hashdir                         |  2 +-
 rp/utils/print_roa                       |  2 +-
 rp/utils/print_rpki_manifest             |  2 +-
 rp/utils/scan_roas                       |  2 +-
 rp/utils/scan_routercerts                |  2 +-
 rp/utils/uri                             |  2 +-
 rpki/POW/__init__.py                     |  6 +++---
 rpki/adns.py                             |  6 +++---
 rpki/cli.py                              |  6 +++---
 rpki/config.py                           |  8 ++++----
 rpki/csv_utils.py                        |  6 +++---
 rpki/django_settings/common.py           |  2 +-
 rpki/django_settings/gui.py              |  2 +-
 rpki/django_settings/irdb.py             |  2 +-
 rpki/django_settings/pubd.py             |  2 +-
 rpki/django_settings/rcynic.py           |  2 +-
 rpki/django_settings/rpkid.py            |  2 +-
 rpki/exceptions.py                       |  4 ++--
 rpki/fields.py                           |  6 +++---
 rpki/http_simple.py                      |  2 +-
 rpki/ipaddrs.py                          |  2 +-
 rpki/irdb/models.py                      |  6 +++---
 rpki/irdb/zookeeper.py                   |  6 +++---
 rpki/irdbd.py                            |  8 ++++----
 rpki/left_right.py                       |  8 ++++----
 rpki/log.py                              |  8 ++++----
 rpki/mysql_import.py                     |  2 +-
 rpki/oids.py                             |  6 +++---
 rpki/old_irdbd.py                        |  8 ++++----
 rpki/pubd.py                             |  8 ++++----
 rpki/pubdb/models.py                     |  2 +-
 rpki/publication.py                      |  8 ++++----
 rpki/publication_control.py              |  8 ++++----
 rpki/rcynicdb/iterator.py                |  2 +-
 rpki/rcynicdb/models.py                  |  2 +-
 rpki/relaxng.py                          | 31 ++++++++++++++++---------------
 rpki/resource_set.py                     |  8 ++++----
 rpki/rootd.py                            |  8 ++++----
 rpki/rpkic.py                            |  4 ++--
 rpki/rpkid.py                            |  8 ++++----
 rpki/rpkid_tasks.py                      |  4 ++--
 rpki/rpkidb/models.py                    |  2 +-
 rpki/rtr/bgpdump.py                      |  4 ++--
 rpki/rtr/channels.py                     |  4 ++--
 rpki/rtr/generator.py                    |  4 ++--
 rpki/rtr/main.py                         |  4 ++--
 rpki/rtr/pdus.py                         |  4 ++--
 rpki/rtr/server.py                       |  4 ++--
 rpki/sundial.py                          |  4 ++--
 rpki/up_down.py                          |  8 ++++----
 rpki/x509.py                             |  6 +++---
 schemas/relaxng/left-right.rnc           |  8 ++++----
 schemas/relaxng/left-right.rng           | 23 ++++++++++++-----------
 schemas/relaxng/publication-control.rnc  |  6 +++---
 schemas/relaxng/publication-control.rng  |  8 ++++----
 84 files changed, 209 insertions(+), 207 deletions(-)

diff --git a/ca/irbe_cli b/ca/irbe_cli
index 7d62db9d..5aa6a72d 100755
--- a/ca/irbe_cli
+++ b/ca/irbe_cli
@@ -2,7 +2,7 @@
 
 # $Id$
 #
-# Copyright (C) 2009--2013  Internet Systems Consortium ("ISC")
+# Copyright (C) 2009-2013  Internet Systems Consortium ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -16,7 +16,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 #
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/ca/rpki-nanny b/ca/rpki-nanny
index 1efa2191..565ba5a7 100755
--- a/ca/rpki-nanny
+++ b/ca/rpki-nanny
@@ -2,10 +2,10 @@
 
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2013  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Portions copyright (C) 2009-2013  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/ca/rpki-start-servers b/ca/rpki-start-servers
index 1d7befb6..d7e72424 100755
--- a/ca/rpki-start-servers
+++ b/ca/rpki-start-servers
@@ -3,8 +3,8 @@
 # $Id$
 #
 # Copyright (C) 2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2013  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Portions copyright (C) 2009-2013  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/ca/rpkic b/ca/rpkic
index 86cac2cb..17ca5595 100755
--- a/ca/rpkic
+++ b/ca/rpkic
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
-# Portions copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
+# Portions copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/ca/rpkigui-apache-conf-gen b/ca/rpkigui-apache-conf-gen
index bdfc2d64..14b4bcef 100755
--- a/ca/rpkigui-apache-conf-gen
+++ b/ca/rpkigui-apache-conf-gen
@@ -2,7 +2,7 @@
 
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
 # Portions copyright (C) 2013  Internet Systems Consortium ("ISC")
 #
diff --git a/ca/tests/left-right-protocol-samples.xml b/ca/tests/left-right-protocol-samples.xml
index f0cb7843..b58b2120 100644
--- a/ca/tests/left-right-protocol-samples.xml
+++ b/ca/tests/left-right-protocol-samples.xml
@@ -1,10 +1,10 @@
 <!-- -*- SGML -*-
   -  $Id$
   -
-  - Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+  - Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
   - Portions copyright (C) 2014  Dragon Research Labs ("DRL")
   - Portions copyright (C) 2010  Internet Systems Consortium ("ISC")
-  - Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+  - Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
   -
   - Permission to use, copy, modify, and distribute this software for any
   - purpose with or without fee is hereby granted, provided that the above
diff --git a/ca/tests/myrpki-xml-parse-test.py b/ca/tests/myrpki-xml-parse-test.py
index d915ea5b..4e5a461c 100644
--- a/ca/tests/myrpki-xml-parse-test.py
+++ b/ca/tests/myrpki-xml-parse-test.py
@@ -1,6 +1,6 @@
 # $Id$
 #
-# Copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
+# Copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/ca/tests/old_irdbd.sql b/ca/tests/old_irdbd.sql
index e773bb2e..1aa1c84d 100644
--- a/ca/tests/old_irdbd.sql
+++ b/ca/tests/old_irdbd.sql
@@ -1,6 +1,6 @@
 -- $Id$
 
--- Copyright (C) 2009--2011  Internet Systems Consortium ("ISC")
+-- Copyright (C) 2009-2011  Internet Systems Consortium ("ISC")
 --
 -- Permission to use, copy, modify, and distribute this software for any
 -- purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
 -- OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 -- PERFORMANCE OF THIS SOFTWARE.
 
--- Copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+-- Copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 --
 -- Permission to use, copy, modify, and distribute this software for any
 -- purpose with or without fee is hereby granted, provided that the above
diff --git a/ca/tests/smoketest.py b/ca/tests/smoketest.py
index 2bce936b..e04b2b26 100644
--- a/ca/tests/smoketest.py
+++ b/ca/tests/smoketest.py
@@ -13,9 +13,9 @@ things that don't belong in yaml_file.
 
 # $Id$
 #
-# Copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/ca/tests/smoketest.setup.sql b/ca/tests/smoketest.setup.sql
index 8f7df211..38657bf7 100644
--- a/ca/tests/smoketest.setup.sql
+++ b/ca/tests/smoketest.setup.sql
@@ -18,7 +18,7 @@
 -- OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 -- PERFORMANCE OF THIS SOFTWARE.
 --
--- Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+-- Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 --
 -- Permission to use, copy, modify, and distribute this software for any
 -- purpose with or without fee is hereby granted, provided that the above
diff --git a/ca/tests/sql-cleaner.py b/ca/tests/sql-cleaner.py
index 38997821..c4786c1a 100644
--- a/ca/tests/sql-cleaner.py
+++ b/ca/tests/sql-cleaner.py
@@ -1,8 +1,8 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
-# Portions copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
+# Portions copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/ca/tests/sql-dumper.py b/ca/tests/sql-dumper.py
index af24f2d4..5cc12e83 100644
--- a/ca/tests/sql-dumper.py
+++ b/ca/tests/sql-dumper.py
@@ -1,6 +1,6 @@
 # $Id$
 #
-# Copyright (C) 2009--2012 Internet Systems Consortium ("ISC")
+# Copyright (C) 2009-2012 Internet Systems Consortium ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/ca/tests/testpoke.py b/ca/tests/testpoke.py
index 7ebe7d44..0b6d8dda 100644
--- a/ca/tests/testpoke.py
+++ b/ca/tests/testpoke.py
@@ -1,8 +1,8 @@
 # $Id$
 #
 # Copyright (C) 2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/ca/tests/xml-parse-test.py b/ca/tests/xml-parse-test.py
index b23cd7af..ef063c05 100644
--- a/ca/tests/xml-parse-test.py
+++ b/ca/tests/xml-parse-test.py
@@ -1,9 +1,9 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
-# Portions copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
+# Portions copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/ca/tests/yamlconf.py b/ca/tests/yamlconf.py
index db368320..a3f23895 100644
--- a/ca/tests/yamlconf.py
+++ b/ca/tests/yamlconf.py
@@ -1,8 +1,8 @@
 # $Id$
 #
-# Copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/ca/tests/yamltest.py b/ca/tests/yamltest.py
index ca96c12c..22621c67 100755
--- a/ca/tests/yamltest.py
+++ b/ca/tests/yamltest.py
@@ -9,10 +9,10 @@ and waits for one of them to exit.
 
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
-# Portions copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
+# Portions copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/potpourri/oob-translate.xsl b/potpourri/oob-translate.xsl
index 41be0c3b..c78f052f 100644
--- a/potpourri/oob-translate.xsl
+++ b/potpourri/oob-translate.xsl
@@ -1,7 +1,7 @@
 <!-- -*- SGML -*-
   - $Id$
   -
-  - Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+  - Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
   -
   - Permission to use, copy, modify, and distribute this software for any
   - purpose with or without fee is hereby granted, provided that the above
diff --git a/rp/config/rpki-confgen b/rp/config/rpki-confgen
index 9ab00eab..b25f9083 100755
--- a/rp/config/rpki-confgen
+++ b/rp/config/rpki-confgen
@@ -2,7 +2,7 @@
 
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
 # Portions copyright (C) 2013  Internet Systems Consortium ("ISC")
 #
diff --git a/rp/config/rpki-confgen.xml b/rp/config/rpki-confgen.xml
index 378a22f7..bc1458ea 100644
--- a/rp/config/rpki-confgen.xml
+++ b/rp/config/rpki-confgen.xml
@@ -4,9 +4,9 @@
   Documented option definitions for rpki-confgen to use in generating
   rpki.conf and TracWiki documentation.
 
-  Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+  Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
   Portions copyright (C) 2014  Dragon Research Labs ("DRL")
-  Portions copyright (C) 2009--2013  Internet Systems Consortium ("ISC")
+  Portions copyright (C) 2009-2013  Internet Systems Consortium ("ISC")
  
   Permission to use, copy, modify, and distribute this software for any
   purpose with or without fee is hereby granted, provided that the above
diff --git a/rp/config/rpki-generate-root-certificate b/rp/config/rpki-generate-root-certificate
index aa0b300d..8b2c8824 100755
--- a/rp/config/rpki-generate-root-certificate
+++ b/rp/config/rpki-generate-root-certificate
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rp/config/rpki-sql-backup b/rp/config/rpki-sql-backup
index 8097f899..cf90e0d0 100755
--- a/rp/config/rpki-sql-backup
+++ b/rp/config/rpki-sql-backup
@@ -2,9 +2,9 @@
 
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2010--2013  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2010-2013  Internet Systems Consortium ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rp/config/rpki-sql-setup b/rp/config/rpki-sql-setup
index 521f1e18..1a133e0b 100755
--- a/rp/config/rpki-sql-setup
+++ b/rp/config/rpki-sql-setup
@@ -2,9 +2,9 @@
 
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2013  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2009-2013  Internet Systems Consortium ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rp/rcynic/rcynic-cron b/rp/rcynic/rcynic-cron
index 6f57d2df..6bc9d165 100755
--- a/rp/rcynic/rcynic-cron
+++ b/rp/rcynic/rcynic-cron
@@ -2,7 +2,7 @@
 #
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
 # Portions copyright (C) 2013  Internet Systems Consortium ("ISC")
 #
diff --git a/rp/rcynic/rcynic-dump b/rp/rcynic/rcynic-dump
index 96436859..44e4d000 100755
--- a/rp/rcynic/rcynic-dump
+++ b/rp/rcynic/rcynic-dump
@@ -2,7 +2,7 @@
 
 # $Id$
 
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rp/rcynic/rcynic-html b/rp/rcynic/rcynic-html
index 154193b2..d893fbd3 100755
--- a/rp/rcynic/rcynic-html
+++ b/rp/rcynic/rcynic-html
@@ -2,8 +2,8 @@
 #
 # $Id$
 #
-# Copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
+# Copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rp/rcynic/rcynic.c b/rp/rcynic/rcynic.c
index 36c1950f..dcf8603c 100644
--- a/rp/rcynic/rcynic.c
+++ b/rp/rcynic/rcynic.c
@@ -1,7 +1,7 @@
 /*
- * Copyright (C) 2013--2014  Dragon Research Labs ("DRL")
- * Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
- * Portions copyright (C) 2006--2008  American Registry for Internet Numbers ("ARIN")
+ * Copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+ * Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
+ * Portions copyright (C) 2006-2008  American Registry for Internet Numbers ("ARIN")
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/rp/rcynic/rcynicng b/rp/rcynic/rcynicng
index b1d9d0d1..57930cb4 100755
--- a/rp/rcynic/rcynicng
+++ b/rp/rcynic/rcynicng
@@ -2,7 +2,7 @@
 
 # $Id$
 
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rp/rcynic/rpki-torrent.py b/rp/rcynic/rpki-torrent.py
index f9a3d620..b310d06d 100644
--- a/rp/rcynic/rpki-torrent.py
+++ b/rp/rcynic/rpki-torrent.py
@@ -2,7 +2,7 @@
 #
 # $Id$
 #
-# Copyright (C) 2013--2014  Dragon Research Labs ("DRL")
+# Copyright (C) 2013-2014  Dragon Research Labs ("DRL")
 # Portions copyright (C) 2012  Internet Systems Consortium ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
diff --git a/rp/utils/find_roa b/rp/utils/find_roa
index 4bf1d047..bd33d339 100755
--- a/rp/utils/find_roa
+++ b/rp/utils/find_roa
@@ -2,7 +2,7 @@
 #
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
 #
 # Permission to use, copy, modify, and distribute this software for any
diff --git a/rp/utils/hashdir b/rp/utils/hashdir
index 329034b4..aa5cf261 100755
--- a/rp/utils/hashdir
+++ b/rp/utils/hashdir
@@ -2,7 +2,7 @@
 #
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
 #
 # Permission to use, copy, modify, and distribute this software for any
diff --git a/rp/utils/print_roa b/rp/utils/print_roa
index dfa9d65e..453105fe 100755
--- a/rp/utils/print_roa
+++ b/rp/utils/print_roa
@@ -2,7 +2,7 @@
 #
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
 #
 # Permission to use, copy, modify, and distribute this software for any
diff --git a/rp/utils/print_rpki_manifest b/rp/utils/print_rpki_manifest
index 4e690364..04e841b9 100755
--- a/rp/utils/print_rpki_manifest
+++ b/rp/utils/print_rpki_manifest
@@ -2,7 +2,7 @@
 #
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
 #
 # Permission to use, copy, modify, and distribute this software for any
diff --git a/rp/utils/scan_roas b/rp/utils/scan_roas
index 07dbfe0a..957918bc 100755
--- a/rp/utils/scan_roas
+++ b/rp/utils/scan_roas
@@ -2,7 +2,7 @@
 #
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
 #
 # Permission to use, copy, modify, and distribute this software for any
diff --git a/rp/utils/scan_routercerts b/rp/utils/scan_routercerts
index 17a20375..a21b0705 100755
--- a/rp/utils/scan_routercerts
+++ b/rp/utils/scan_routercerts
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
 #
 # Permission to use, copy, modify, and distribute this software for any
diff --git a/rp/utils/uri b/rp/utils/uri
index 0a15296d..1292b396 100755
--- a/rp/utils/uri
+++ b/rp/utils/uri
@@ -2,7 +2,7 @@
 #
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
 #
 # Permission to use, copy, modify, and distribute this software for any
diff --git a/rpki/POW/__init__.py b/rpki/POW/__init__.py
index ba43e1ec..8e89981b 100644
--- a/rpki/POW/__init__.py
+++ b/rpki/POW/__init__.py
@@ -1,9 +1,9 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2013  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2006--2008  American Registry for Internet Numbers ("ARIN")
+# Portions copyright (C) 2009-2013  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2006-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/adns.py b/rpki/adns.py
index 4f8cf7ea..82fdd61d 100644
--- a/rpki/adns.py
+++ b/rpki/adns.py
@@ -1,8 +1,8 @@
 # $Id$
 #
-# Copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2010--2012  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2003--2007, 2009, 2010 Nominum, Inc. ("NOMINUM")
+# Copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2010-2012  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2003-2007, 2009, 2010 Nominum, Inc. ("NOMINUM")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/cli.py b/rpki/cli.py
index 6d609466..99b511d4 100644
--- a/rpki/cli.py
+++ b/rpki/cli.py
@@ -1,8 +1,8 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
-# Portions copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2010--2012  Internet Systems Consortium ("ISC")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
+# Portions copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2010-2012  Internet Systems Consortium ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/config.py b/rpki/config.py
index c92e63cd..d18f69bd 100644
--- a/rpki/config.py
+++ b/rpki/config.py
@@ -1,9 +1,9 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
-# Portions copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
+# Portions copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/csv_utils.py b/rpki/csv_utils.py
index d354da9a..8b940075 100644
--- a/rpki/csv_utils.py
+++ b/rpki/csv_utils.py
@@ -1,8 +1,8 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
-# Portions copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
+# Portions copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/django_settings/common.py b/rpki/django_settings/common.py
index 3ec387ed..cbc1cb4a 100644
--- a/rpki/django_settings/common.py
+++ b/rpki/django_settings/common.py
@@ -1,6 +1,6 @@
 # $Id$
 
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
 #
 # Permission to use, copy, modify, and distribute this software for any
diff --git a/rpki/django_settings/gui.py b/rpki/django_settings/gui.py
index c66cda4f..926c7dee 100644
--- a/rpki/django_settings/gui.py
+++ b/rpki/django_settings/gui.py
@@ -1,6 +1,6 @@
 # $Id$
 
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
 #
 # Permission to use, copy, modify, and distribute this software for any
diff --git a/rpki/django_settings/irdb.py b/rpki/django_settings/irdb.py
index c64c1208..2a3e9ed8 100644
--- a/rpki/django_settings/irdb.py
+++ b/rpki/django_settings/irdb.py
@@ -1,6 +1,6 @@
 # $Id$
 
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
 #
 # Permission to use, copy, modify, and distribute this software for any
diff --git a/rpki/django_settings/pubd.py b/rpki/django_settings/pubd.py
index 85c124eb..1686a945 100644
--- a/rpki/django_settings/pubd.py
+++ b/rpki/django_settings/pubd.py
@@ -1,6 +1,6 @@
 # $Id$
 
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
 #
 # Permission to use, copy, modify, and distribute this software for any
diff --git a/rpki/django_settings/rcynic.py b/rpki/django_settings/rcynic.py
index cba1e022..f2264378 100644
--- a/rpki/django_settings/rcynic.py
+++ b/rpki/django_settings/rcynic.py
@@ -1,6 +1,6 @@
 # $Id$
 
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
 #
 # Permission to use, copy, modify, and distribute this software for any
diff --git a/rpki/django_settings/rpkid.py b/rpki/django_settings/rpkid.py
index 1b66dcc0..38209069 100644
--- a/rpki/django_settings/rpkid.py
+++ b/rpki/django_settings/rpkid.py
@@ -1,6 +1,6 @@
 # $Id$
 
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
 #
 # Permission to use, copy, modify, and distribute this software for any
diff --git a/rpki/exceptions.py b/rpki/exceptions.py
index d66ad00c..78ad30f4 100644
--- a/rpki/exceptions.py
+++ b/rpki/exceptions.py
@@ -1,8 +1,8 @@
 # $Id$
 #
 # Copyright (C) 2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2013  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Portions copyright (C) 2009-2013  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/fields.py b/rpki/fields.py
index 30cf57c7..0b76d7fa 100644
--- a/rpki/fields.py
+++ b/rpki/fields.py
@@ -1,8 +1,8 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
-# Portions copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2011--2012  Internet Systems Consortium ("ISC")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
+# Portions copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2011-2012  Internet Systems Consortium ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/http_simple.py b/rpki/http_simple.py
index 4211267c..9e41c48e 100644
--- a/rpki/http_simple.py
+++ b/rpki/http_simple.py
@@ -1,6 +1,6 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
 #
 # Permission to use, copy, modify, and distribute this software for any
diff --git a/rpki/ipaddrs.py b/rpki/ipaddrs.py
index 5117585c..fefb3acb 100644
--- a/rpki/ipaddrs.py
+++ b/rpki/ipaddrs.py
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 #
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/irdb/models.py b/rpki/irdb/models.py
index d28665f5..d2b630c2 100644
--- a/rpki/irdb/models.py
+++ b/rpki/irdb/models.py
@@ -1,8 +1,8 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
-# Portions copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2011--2012  Internet Systems Consortium ("ISC")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
+# Portions copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2011-2012  Internet Systems Consortium ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/irdb/zookeeper.py b/rpki/irdb/zookeeper.py
index d0c36a17..fc35b753 100644
--- a/rpki/irdb/zookeeper.py
+++ b/rpki/irdb/zookeeper.py
@@ -1,8 +1,8 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
-# Portions copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
+# Portions copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/irdbd.py b/rpki/irdbd.py
index 2bd726f1..811c05c7 100644
--- a/rpki/irdbd.py
+++ b/rpki/irdbd.py
@@ -1,9 +1,9 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
-# Portions copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
+# Portions copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/left_right.py b/rpki/left_right.py
index 7d2c7da2..eb1bc0be 100644
--- a/rpki/left_right.py
+++ b/rpki/left_right.py
@@ -1,9 +1,9 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
-# Portions copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
+# Portions copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/log.py b/rpki/log.py
index 9fe995d1..8d8f593d 100644
--- a/rpki/log.py
+++ b/rpki/log.py
@@ -1,9 +1,9 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
-# Portions copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
+# Portions copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/mysql_import.py b/rpki/mysql_import.py
index bbb7ac22..b0929a34 100644
--- a/rpki/mysql_import.py
+++ b/rpki/mysql_import.py
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 #
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/oids.py b/rpki/oids.py
index b27be6f3..2ac2d1bb 100644
--- a/rpki/oids.py
+++ b/rpki/oids.py
@@ -1,8 +1,8 @@
 # $Id$
 #
-# Copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/old_irdbd.py b/rpki/old_irdbd.py
index e296bfdd..d74e252f 100644
--- a/rpki/old_irdbd.py
+++ b/rpki/old_irdbd.py
@@ -1,9 +1,9 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
-# Portions copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
+# Portions copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/pubd.py b/rpki/pubd.py
index 53b452fa..56a840d4 100644
--- a/rpki/pubd.py
+++ b/rpki/pubd.py
@@ -1,9 +1,9 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
-# Portions copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
+# Portions copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/pubdb/models.py b/rpki/pubdb/models.py
index 583dd912..20c6e0d8 100644
--- a/rpki/pubdb/models.py
+++ b/rpki/pubdb/models.py
@@ -1,6 +1,6 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
 #
 # Permission to use, copy, modify, and distribute this software for any
diff --git a/rpki/publication.py b/rpki/publication.py
index 4d95ff9b..b947ea9e 100644
--- a/rpki/publication.py
+++ b/rpki/publication.py
@@ -1,9 +1,9 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
-# Portions copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
+# Portions copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/publication_control.py b/rpki/publication_control.py
index 8340bdee..afdea730 100644
--- a/rpki/publication_control.py
+++ b/rpki/publication_control.py
@@ -1,9 +1,9 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
-# Portions copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
+# Portions copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/rcynicdb/iterator.py b/rpki/rcynicdb/iterator.py
index a0131dc8..6152b925 100644
--- a/rpki/rcynicdb/iterator.py
+++ b/rpki/rcynicdb/iterator.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/rcynicdb/models.py b/rpki/rcynicdb/models.py
index 23caceff..d8207251 100644
--- a/rpki/rcynicdb/models.py
+++ b/rpki/rcynicdb/models.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/relaxng.py b/rpki/relaxng.py
index 9a01306c..b8b8134a 100644
--- a/rpki/relaxng.py
+++ b/rpki/relaxng.py
@@ -12,22 +12,23 @@ left_right = RelaxNGParser(r'''<?xml version="1.0" encoding="UTF-8"?>
   
   RelaxNG schema for RPKI left-right protocol.
   
-  Copyright (C) 2012- -2014  Dragon Research Labs ("DRL")
-  Portions copyright (C) 2009- -2011  Internet Systems Consortium ("ISC")
-  Portions copyright (C) 2007- -2008  American Registry for Internet Numbers ("ARIN")
+  Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
+  Portions copyright (C) 2012-2014  Dragon Research Labs ("DRL")
+  Portions copyright (C) 2009-2011  Internet Systems Consortium ("ISC")
+  Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
   
   Permission to use, copy, modify, and distribute this software for any
   purpose with or without fee is hereby granted, provided that the above
   copyright notices and this permission notice appear in all copies.
   
-  THE SOFTWARE IS PROVIDED "AS IS" AND DRL, ISC, AND ARIN DISCLAIM ALL
-  WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL DRL,
-  ISC, OR ARIN 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.
+  THE SOFTWARE IS PROVIDED "AS IS" AND PARSONS, DRL, ISC, AND ARIN
+  DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT
+  SHALL PARSONS, DRL, ISC, OR ARIN 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.
 -->
 <grammar ns="http://www.hactrn.net/uris/rpki/left-right-spec/" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <define name="version">
@@ -1688,13 +1689,13 @@ oob_setup = RelaxNGParser(r'''<?xml version="1.0" encoding="UTF-8"?>
 ## Parsed RelaxNG publication_control schema
 publication_control = RelaxNGParser(r'''<?xml version="1.0" encoding="UTF-8"?>
 <!--
-  $Id: publication-control.rnc 5903 2014-07-18 17:08:13Z sra $
+  $Id$
   
   RelaxNG schema for RPKI publication protocol.
   
-  Copyright (C) 2012- -2014  Dragon Research Labs ("DRL")
-  Portions copyright (C) 2009- -2011  Internet Systems Consortium ("ISC")
-  Portions copyright (C) 2007- -2008  American Registry for Internet Numbers ("ARIN")
+  Copyright (C) 2012-2014  Dragon Research Labs ("DRL")
+  Portions copyright (C) 2009-2011  Internet Systems Consortium ("ISC")
+  Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
   
   Permission to use, copy, modify, and distribute this software for any
   purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/resource_set.py b/rpki/resource_set.py
index 0a3c2e49..21624b98 100644
--- a/rpki/resource_set.py
+++ b/rpki/resource_set.py
@@ -1,9 +1,9 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
-# Portions copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
+# Portions copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/rootd.py b/rpki/rootd.py
index 49667205..56c5984a 100644
--- a/rpki/rootd.py
+++ b/rpki/rootd.py
@@ -1,9 +1,9 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
-# Portions copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
+# Portions copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/rpkic.py b/rpki/rpkic.py
index dfc9e061..6b9fd786 100644
--- a/rpki/rpkic.py
+++ b/rpki/rpkic.py
@@ -1,8 +1,8 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2013  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2009-2013  Internet Systems Consortium ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/rpkid.py b/rpki/rpkid.py
index e09cfb78..cc595af1 100644
--- a/rpki/rpkid.py
+++ b/rpki/rpkid.py
@@ -1,9 +1,9 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
-# Portions copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
+# Portions copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/rpkid_tasks.py b/rpki/rpkid_tasks.py
index d80e9013..7137c973 100644
--- a/rpki/rpkid_tasks.py
+++ b/rpki/rpkid_tasks.py
@@ -1,8 +1,8 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2012--2013  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2012-2013  Internet Systems Consortium ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/rpkidb/models.py b/rpki/rpkidb/models.py
index b734db7a..d5264dad 100644
--- a/rpki/rpkidb/models.py
+++ b/rpki/rpkidb/models.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/rtr/bgpdump.py b/rpki/rtr/bgpdump.py
index 99b1222b..190fdb60 100755
--- a/rpki/rtr/bgpdump.py
+++ b/rpki/rtr/bgpdump.py
@@ -1,8 +1,8 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2013  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2009-2013  Internet Systems Consortium ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/rtr/channels.py b/rpki/rtr/channels.py
index 15d2545f..3146d2ff 100644
--- a/rpki/rtr/channels.py
+++ b/rpki/rtr/channels.py
@@ -1,8 +1,8 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2013  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2009-2013  Internet Systems Consortium ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/rtr/generator.py b/rpki/rtr/generator.py
index e3f65cdb..f486a96d 100644
--- a/rpki/rtr/generator.py
+++ b/rpki/rtr/generator.py
@@ -1,8 +1,8 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2013  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2009-2013  Internet Systems Consortium ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/rtr/main.py b/rpki/rtr/main.py
index 97640207..86685241 100644
--- a/rpki/rtr/main.py
+++ b/rpki/rtr/main.py
@@ -1,8 +1,8 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2013  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2009-2013  Internet Systems Consortium ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/rtr/pdus.py b/rpki/rtr/pdus.py
index 96fe7d9e..1776bc61 100644
--- a/rpki/rtr/pdus.py
+++ b/rpki/rtr/pdus.py
@@ -1,8 +1,8 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2013  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2009-2013  Internet Systems Consortium ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/rtr/server.py b/rpki/rtr/server.py
index c47b01c1..7f7416a6 100644
--- a/rpki/rtr/server.py
+++ b/rpki/rtr/server.py
@@ -1,8 +1,8 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2013  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2009-2013  Internet Systems Consortium ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/sundial.py b/rpki/sundial.py
index b788940d..bbb44934 100644
--- a/rpki/sundial.py
+++ b/rpki/sundial.py
@@ -1,6 +1,6 @@
 # $Id$
 #
-# Copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
+# Copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 #
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/up_down.py b/rpki/up_down.py
index 67b3106b..c617c0d0 100644
--- a/rpki/up_down.py
+++ b/rpki/up_down.py
@@ -1,9 +1,9 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
-# Portions copyright (C) 2013--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
+# Portions copyright (C) 2013-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2009-2012  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/rpki/x509.py b/rpki/x509.py
index 1c1d9551..323c94a1 100644
--- a/rpki/x509.py
+++ b/rpki/x509.py
@@ -1,9 +1,9 @@
 # $Id$
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
 # Portions copyright (C) 2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2013  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Portions copyright (C) 2009-2013  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/schemas/relaxng/left-right.rnc b/schemas/relaxng/left-right.rnc
index e8ba0114..0ab81a6f 100644
--- a/schemas/relaxng/left-right.rnc
+++ b/schemas/relaxng/left-right.rnc
@@ -2,10 +2,10 @@
 #
 # RelaxNG schema for RPKI left-right protocol.
 #
-# Copyright (C) 2015--2016  Parsons Government Services ("PARSONS")
-# Portions copyright (C) 2012--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2011  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
+# Portions copyright (C) 2012-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2009-2011  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/schemas/relaxng/left-right.rng b/schemas/relaxng/left-right.rng
index cd8c1896..22d81b84 100644
--- a/schemas/relaxng/left-right.rng
+++ b/schemas/relaxng/left-right.rng
@@ -4,22 +4,23 @@
   
   RelaxNG schema for RPKI left-right protocol.
   
-  Copyright (C) 2012- -2014  Dragon Research Labs ("DRL")
-  Portions copyright (C) 2009- -2011  Internet Systems Consortium ("ISC")
-  Portions copyright (C) 2007- -2008  American Registry for Internet Numbers ("ARIN")
+  Copyright (C) 2015-2016  Parsons Government Services ("PARSONS")
+  Portions copyright (C) 2012-2014  Dragon Research Labs ("DRL")
+  Portions copyright (C) 2009-2011  Internet Systems Consortium ("ISC")
+  Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
   
   Permission to use, copy, modify, and distribute this software for any
   purpose with or without fee is hereby granted, provided that the above
   copyright notices and this permission notice appear in all copies.
   
-  THE SOFTWARE IS PROVIDED "AS IS" AND DRL, ISC, AND ARIN DISCLAIM ALL
-  WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL DRL,
-  ISC, OR ARIN 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.
+  THE SOFTWARE IS PROVIDED "AS IS" AND PARSONS, DRL, ISC, AND ARIN
+  DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT
+  SHALL PARSONS, DRL, ISC, OR ARIN 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.
 -->
 <grammar ns="http://www.hactrn.net/uris/rpki/left-right-spec/" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <define name="version">
diff --git a/schemas/relaxng/publication-control.rnc b/schemas/relaxng/publication-control.rnc
index ac59c617..a5f5fc23 100644
--- a/schemas/relaxng/publication-control.rnc
+++ b/schemas/relaxng/publication-control.rnc
@@ -2,9 +2,9 @@
 #
 # RelaxNG schema for RPKI publication protocol.
 #
-# Copyright (C) 2012--2014  Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2011  Internet Systems Consortium ("ISC")
-# Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
+# Copyright (C) 2012-2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2009-2011  Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/schemas/relaxng/publication-control.rng b/schemas/relaxng/publication-control.rng
index 606deb53..58035ff6 100644
--- a/schemas/relaxng/publication-control.rng
+++ b/schemas/relaxng/publication-control.rng
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  $Id: publication-control.rnc 5903 2014-07-18 17:08:13Z sra $
+  $Id$
   
   RelaxNG schema for RPKI publication protocol.
   
-  Copyright (C) 2012- -2014  Dragon Research Labs ("DRL")
-  Portions copyright (C) 2009- -2011  Internet Systems Consortium ("ISC")
-  Portions copyright (C) 2007- -2008  American Registry for Internet Numbers ("ARIN")
+  Copyright (C) 2012-2014  Dragon Research Labs ("DRL")
+  Portions copyright (C) 2009-2011  Internet Systems Consortium ("ISC")
+  Portions copyright (C) 2007-2008  American Registry for Internet Numbers ("ARIN")
   
   Permission to use, copy, modify, and distribute this software for any
   purpose with or without fee is hereby granted, provided that the above
-- 
cgit v1.2.3