Correctly identify DESY as copyright owner, include third clause in BSD license

paulmillar · paulmillar · commit cca426661c5e · 2008-06-25T09:09:31.000Z
diff --git a/License.txt b/License.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2008, Paul Millar
+Copyright (c) 2008, Deutsches Elektronen-Synchrotron (DESY)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -13,6 +13,11 @@ met:
      the documentation and/or other materials provided with the
      distribution.
 
+  o  Neither the name of Deutsches Elektronen-Synchrotron (DESY) nor
+     the names of its contributors may be used to endorse or promote
+     products derived from this software without specific prior
+     written permission.
+
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -23,4 +28,4 @@ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/xsl/xylophone-import.xsl b/xsl/xylophone-import.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--+
-    | Copyright (c) 2008, Paul Millar
+    | Copyright (c) 2008, Deutsches Elektronen-Synchrotron (DESY)
     | All rights reserved.
     | 
     | Redistribution and use in source and binary forms, with
@@ -16,7 +16,12 @@
     |      above copyright notice, this list of conditions and
     |      the following disclaimer in the documentation and/or
     |      other materials provided with the distribution.
-    | 
+    |
+    |   o  Neither the name of Deutsches Elektronen-Synchrotron
+    |      (DESY) nor the names of its contributors may be used
+    |      to endorse or promote products derived from this
+    |      software without specific prior written permission.
+    |
     | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
     | CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
     | INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
diff --git a/xsl/xylophone-map.xsl b/xsl/xylophone-map.xsl
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 
 <!--+
-    | Copyright (c) 2008, Paul Millar
+    | Copyright (c) 2008, Deutsches Elektronen-Synchrotron (DESY)
     | All rights reserved.
     | 
     | Redistribution and use in source and binary forms, with
@@ -16,7 +16,12 @@
     |      above copyright notice, this list of conditions and
     |      the following disclaimer in the documentation and/or
     |      other materials provided with the distribution.
-    | 
+    |
+    |   o  Neither the name of Deutsches Elektronen-Synchrotron
+    |      (DESY) nor the names of its contributors may be used
+    |      to endorse or promote products derived from this
+    |      software without specific prior written permission.
+    |
     | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
     | CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
     | INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
diff --git a/xsl/xylophone-output.xsl b/xsl/xylophone-output.xsl
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 
 <!--+
-    | Copyright (c) 2008, Paul Millar
+    | Copyright (c) 2008, Deutsches Elektronen-Synchrotron (DESY)
     | All rights reserved.
     | 
     | Redistribution and use in source and binary forms, with
@@ -16,7 +16,12 @@
     |      above copyright notice, this list of conditions and
     |      the following disclaimer in the documentation and/or
     |      other materials provided with the distribution.
-    | 
+    |
+    |   o  Neither the name of Deutsches Elektronen-Synchrotron
+    |      (DESY) nor the names of its contributors may be used
+    |      to endorse or promote products derived from this
+    |      software without specific prior written permission.
+    |
     | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
     | CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
     | INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
diff --git a/xsl/xylophone-path.xsl b/xsl/xylophone-path.xsl
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 
 <!--+
-    | Copyright (c) 2008, Paul Millar
+    | Copyright (c) 2008, Deutsches Elektronen-Synchrotron (DESY)
     | All rights reserved.
     | 
     | Redistribution and use in source and binary forms, with
@@ -16,7 +16,12 @@
     |      above copyright notice, this list of conditions and
     |      the following disclaimer in the documentation and/or
     |      other materials provided with the distribution.
-    | 
+    |
+    |   o  Neither the name of Deutsches Elektronen-Synchrotron
+    |      (DESY) nor the names of its contributors may be used
+    |      to endorse or promote products derived from this
+    |      software without specific prior written permission.
+    |
     | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
     | CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
     | INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
diff --git a/xsl/xylophone-predicate.xsl b/xsl/xylophone-predicate.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--+
-    | Copyright (c) 2008, Paul Millar
+    | Copyright (c) 2008, Deutsches Elektronen-Synchrotron (DESY)
     | All rights reserved.
     | 
     | Redistribution and use in source and binary forms, with
@@ -16,7 +16,12 @@
     |      above copyright notice, this list of conditions and
     |      the following disclaimer in the documentation and/or
     |      other materials provided with the distribution.
-    | 
+    |
+    |   o  Neither the name of Deutsches Elektronen-Synchrotron
+    |      (DESY) nor the names of its contributors may be used
+    |      to endorse or promote products derived from this
+    |      software without specific prior written permission.
+    |
     | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
     | CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
     | INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
diff --git a/xsl/xylophone-publish.xsl b/xsl/xylophone-publish.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--+
-    | Copyright (c) 2008, Paul Millar
+    | Copyright (c) 2008, Deutsches Elektronen-Synchrotron (DESY)
     | All rights reserved.
     | 
     | Redistribution and use in source and binary forms, with
@@ -16,7 +16,12 @@
     |      above copyright notice, this list of conditions and
     |      the following disclaimer in the documentation and/or
     |      other materials provided with the distribution.
-    | 
+    |
+    |   o  Neither the name of Deutsches Elektronen-Synchrotron
+    |      (DESY) nor the names of its contributors may be used
+    |      to endorse or promote products derived from this
+    |      software without specific prior written permission.
+    |
     | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
     | CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
     | INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
diff --git a/xsl/xylophone-user-elements.xsl b/xsl/xylophone-user-elements.xsl
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 
 <!--+
-    | Copyright (c) 2008, Paul Millar
+    | Copyright (c) 2008, Deutsches Elektronen-Synchrotron (DESY)
     | All rights reserved.
     | 
     | Redistribution and use in source and binary forms, with
@@ -16,7 +16,12 @@
     |      above copyright notice, this list of conditions and
     |      the following disclaimer in the documentation and/or
     |      other materials provided with the distribution.
-    | 
+    |
+    |   o  Neither the name of Deutsches Elektronen-Synchrotron
+    |      (DESY) nor the names of its contributors may be used
+    |      to endorse or promote products derived from this
+    |      software without specific prior written permission.
+    |
     | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
     | CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
     | INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
diff --git a/xsl/xylophone.xsl b/xsl/xylophone.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--+
-    | Copyright (c) 2008, Paul Millar
+    | Copyright (c) 2008, Deutsches Elektronen-Synchrotron (DESY)
     | All rights reserved.
     | 
     | Redistribution and use in source and binary forms, with
@@ -16,7 +16,12 @@
     |      above copyright notice, this list of conditions and
     |      the following disclaimer in the documentation and/or
     |      other materials provided with the distribution.
-    | 
+    |
+    |   o  Neither the name of Deutsches Elektronen-Synchrotron
+    |      (DESY) nor the names of its contributors may be used
+    |      to endorse or promote products derived from this
+    |      software without specific prior written permission.
+    |
     | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
     | CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
     | INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -44,7 +49,8 @@
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
 
-<!-- TODO: what is the MIME media type for LDIF?  This seems poorly defined -->
+<!-- TODO: what is the MIME media type for LDIF?  This seems poorly
+     defined -->
 <xsl:output method="text" media-type="text/plain"/>
 
 <xsl:param name="xml-src-uri" select="'dynamic.xml'"/>
