diff options
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | LICENSE | 26 | ||||
| -rw-r--r-- | docs/manual/LICENSE | 26 | ||||
| -rw-r--r-- | docs/manual/license.html.en | 26 | ||||
| -rw-r--r-- | docs/manual/license.xml | 28 |
5 files changed, 110 insertions, 0 deletions
@@ -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>] @@ -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 d9a10c0d8e..57bc88a15a 100644 --- 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 e73f956986..d618adf0d9 100644 --- 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 71183a7159..212bbf5eea 100644 --- 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> |