diff options
author | André Malo <nd@apache.org> | 2004-02-07 19:26:52 +0100 |
---|---|---|
committer | André Malo <nd@apache.org> | 2004-02-07 19:26:52 +0100 |
commit | 4734253a0f2de606775d4988c2c024ce762f2eef (patch) | |
tree | 1080aa812b36bf3429f82962d2b0c0083317f470 /docs/manual/license.xml | |
parent | *sigh* xalan did some recoding :-( (diff) | |
download | apache2-4734253a0f2de606775d4988c2c024ce762f2eef.tar.xz apache2-4734253a0f2de606775d4988c2c024ce762f2eef.zip |
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
Diffstat (limited to '')
-rw-r--r-- | docs/manual/license.xml | 28 |
1 files changed, 28 insertions, 0 deletions
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> |