Merge pull request #1 from bradleeedmondson/patch-1

Apache 1.0: format acknowledge requirement
spdx · May 6, 2016 · 1d42be4 · 1d42be4
2 parents 93863b1 + d893b05
commit 1d42be4
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/Apache-1.0.xml b/src/Apache-1.0.xml
@@ -50,12 +50,10 @@
         <li>
           <b>6.</b>
           <p>Redistributions of any form whatsoever must retain the following acknowledgment:</p>
+          <p>"This product includes software developed by <alt name="nameClause6" match=".+">the 
+          Apache Group for use in the Apache HTTP server project (http://www.apache.org/)</alt>.</p>
         </li>
       </list>
-      <p>"This product includes software developed by 
-        <alt name="nameClause6" match=".+">the Apache Group for use in the Apache HTTP server project
-        (http://www.apache.org/)</alt>. 
-      </p>
       <p>THIS SOFTWARE IS PROVIDED BY 
         <alt name="copyrightHolderAsIs" match=".+">THE APACHE GROUP</alt> ``AS IS'' AND ANY EXPRESSED OR IMPLIED
         WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
@@ -73,4 +71,4 @@
          the Apache HTTP server project, please see &lt;http://www.apache.org/&gt;.</p>
     </body>
   </license>
-</SPDX>
+</SPDX>