Merge pull request #2301 from spdx/Apache-1.1-update

Update Apache-1.1.xml to match original

src/Apache-1.1.xml

@@ -8,11 +8,9 @@
       <notes>This license has been superseded by Apache License 2.0</notes>
     <text>
       <titleText>
-         <p>Apache License 1.1</p>
+         <p>The Apache Software License, Version 1.1</p>
       </titleText>
-      <copyrightText>
          <p>Copyright (c) 2000 The Apache Software Foundation. All rights reserved.</p>
-      </copyrightText>
       <p>Redistribution and use in source and binary forms, with or without modification, are permitted provided
        that the following conditions are met:</p>
       <list>
@@ -35,7 +33,6 @@
           <alt match=".+" name="organizationClause3">the Apache Software Foundation (http://www.apache.org/)</alt>."
           <br/>Alternately, this acknowledgment may appear in the software itself, if and wherever such
                third-party acknowledgments normally appear.
-
       </item>
          <item>
             <bullet>4.</bullet>
@@ -49,11 +46,11 @@
          <item>
             <bullet>5.</bullet>
         <alt match="(Products derived from this software may not be called\s.+nor may\s.+appear in their name, without prior written permission of\s.+.|Products may not include\s.+in their name, without prior written permission of\s.+.)" name="Clause5">Products derived from this software may not be called "Apache" 
-		[ex. "Jakarta," "Apache," or "Apache Commons,"] nor may "Apache" [ex. the names] appear in their name, 
+		nor may "Apache" [ex. the names] appear in their name, 
 		without prior written permission of the Apache Software Foundation.</alt>
       </item>
       </list>
-      <p>THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+      <p>THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
        TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
        NO EVENT SHALL
       <alt match=".+" name="copyrightHolderLiability">THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS</alt>
@@ -66,7 +63,7 @@
       <p>
          <optional>This software consists of voluntary contributions made by many individuals on behalf of the Apache
        Software Foundation. For more information on the Apache Software Foundation, please see
-       http://www.apache.org/. Portions of this software are based upon public domain software originally
+       &lt;http://www.apache.org/&gt;. Portions of this software are based upon public domain software originally
        written at the National Center for Supercomputing Applications, University of Illinois,
       Urbana-Champaign.</optional>
       </p>

test/simpleTestForGenerator/Apache-1.1.txt

@@ -1,4 +1,4 @@
-Apache License 1.1
+The Apache Software License, Version 1.1
 
 Copyright (c) 2000 The Apache Software Foundation.  All rights reserved.
 
@@ -14,8 +14,8 @@ Alternately, this acknowledgment may appear in the software itself, if and where
 
 4. The names "Apache" and "Apache Software Foundation" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact apache@apache.org.
 
-5. Products derived from this software may not be called "Apache" [ex. "Jakarta," "Apache," or "Apache Commons,"] nor may "Apache" [ex. the names] appear in their name, without prior written permission of the Apache Software Foundation.
+5. Products derived from this software may not be called "Apache" nor may "Apache" appear in their name, without prior written permission of the Apache Software Foundation.
 
-THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 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.
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 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.
 
- This software consists of voluntary contributions made by many individuals on behalf of the Apache Software Foundation. For more information on the Apache Software Foundation, please see http://www.apache.org/. Portions of this software are based upon public domain software originally written at the National Center for Supercomputing Applications, University of Illinois, Urbana-Champaign.
+ This software consists of voluntary contributions made by many individuals on behalf of the Apache Software Foundation. For more information on the Apache Software Foundation, please see <http://www.apache.org/>. Portions of this software are based upon public domain software originally written at the National Center for Supercomputing Applications, University of Illinois, Urbana-Champaign.