done with 2.1. Add missing appendix plus an appropriate CHANGES entry.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102542 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index a58adc9d33bef3cf91d5c7f04297a2ef5c65b00a..02d00083460d3387e05d80c0988c48467dcb4b47 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) The whole codebase was relicensed and is now available under
+     the Apache License, Version 2.0 (http://www.apache.org/licenses).
+     [Apache Software Foundation]
+
   *) FreeBSD: Use the httpready accept filter instead of dataready on
      newer levels of the OS.  [Paul Querna <chip force-elite.com>]
 

diff --git a/LICENSE b/LICENSE
index cbeed1aaafb110459e898f3daa4adf1b6123da55..7b69c6227f1cb4ef595a9c9da5a321efc15fc6f6 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -175,6 +175,32 @@
 
    END OF TERMS AND CONDITIONS
 
+   APPENDIX: How to apply the Apache License to your work.
+
+      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
+      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
+      identification within third-party archives.
+
+   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
+
+       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.
+
+
 
 APACHE HTTP SERVER SUBCOMPONENTS: 
 

diff --git a/docs/manual/LICENSE b/docs/manual/LICENSE
index d9a10c0d8e868ebf8da0b3dc95bb0be634c34bfe..57bc88a15a0ee8266c259b2667e64608d3f7e292 100644 (file)
--- a/docs/manual/LICENSE
+++ b/docs/manual/LICENSE
@@ -174,3 +174,29 @@
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      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
+      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
+      identification within third-party archives.
+
+   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
+
+       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.
+

diff --git a/docs/manual/license.html.en b/docs/manual/license.html.en
index e73f956986cb0cce4169461dab4c71be3f1432cc..d618adf0d9d8278e4455ceac444d3822fc8c90ce 100644 (file)
--- a/docs/manual/license.html.en
+++ b/docs/manual/license.html.en
@@ -202,6 +202,32 @@
     </ol>
 
     <p class="centered">END OF TERMS AND CONDITIONS</p>
+
+    <p class="centered">APPENDIX: How to apply the Apache License to your
+    work.</p>
+
+    <p>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
+    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
+    identification within third-party archives.</p>
+
+    <div class="example"><pre>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
+
+    http://www.apache.org/licenses/LICENSE-2.0<br />
+
+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.</pre></div>
 </div>
 </div>
 <div class="bottomlang">

diff --git a/docs/manual/license.xml b/docs/manual/license.xml
index 71183a715909db0bbea7f6e7b26ec9d6310b8779..212bbf5eeaaedc776240c0c55d06b6f41e33c049 100644 (file)
--- a/docs/manual/license.xml
+++ b/docs/manual/license.xml
@@ -205,6 +205,34 @@
     </ol>
 
     <p class="centered">END OF TERMS AND CONDITIONS</p>
+
+    <p class="centered">APPENDIX: How to apply the Apache License to your
+    work.</p>
+
+    <p>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
+    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
+    identification within third-party archives.</p>
+
+    <example>
+      <pre>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
+
+    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.</pre>
+    </example>
 </summary>
 </manualpage>