diff options
| author | Rob Austein <sra@hactrn.net> | 2016-05-07 04:14:02 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2016-05-07 04:14:02 +0000 |
| commit | 383b0a0d20de4bf6674f7e852b804a9d91df3ea0 (patch) | |
| tree | fc4d4cab56df2129f58581cc38b7327835876b83 /rpki/relaxng.py | |
| parent | da8998dc54696f9e0e2ee6d45b32fc3175c0ece3 (diff) | |
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
Diffstat (limited to 'rpki/relaxng.py')
| -rw-r--r-- | rpki/relaxng.py | 31 |
1 files changed, 16 insertions, 15 deletions
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 |