Hello,
A very minor comment: I think the paragraphs need to be rejustified
before the final release. (Some of the lines in Section 1 are 77
columns wide where as the first line of Section 7 is wrapping at less
than 73 columns.)
I notice the sample NOTICE file has differing justification between
notices too, and that the Apache acknowledgement changes from
This product includes software developed by the
Apache Software Foundation (http://www.apache.org/).
in Apache Software License v1.1 to
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
^
in Apache License v2.0. (Note the word "the" has changed to start with
an upper case letter.)
The following diff may or may not be of use; it mostly relates to the
Appendix and (i) removes what I believe is a superfluous space; (ii)
rejustifies the template to 71 columns and (iii) removes a few empty
newlines from the very bottom of the file:
--- LICENSE-2.0.txt 2004-01-14 21:21:36.000000000 +0000
+++ LICENSE-dmh.txt 2004-01-14 21:50:02.000000000 +0000
@@ -192,7 +192,7 @@
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
+ the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
@@ -200,17 +200,17 @@
Copyright [yyyy] [name of copyright owner]
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed under the Apache License, Version 2.0 (the "License"); you
+ may not use this file except in compliance with the License. You may
+ obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied. See the License for the specific language governing
+ permissions and limitations under the License.
====================================================================
== Sample NOTICE file, in this case for Apache httpd-2.0 ==
@@ -232,5 +232,4 @@
which is open source software, written by Philip Hazel, and copyright
by the University of Cambridge, England. The original software is
available from
- ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
-
+ ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
\ No newline at end of file
