apply Apache License, Version 2.0

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

1 files changed, 183 insertions, 59 deletions

diff --git a/docs/manual/license.html.en b/docs/manual/license.html.en
index 6092437072..e73f956986 100644
--- a/docs/manual/license.html.en
+++ b/docs/manual/license.html.en
@@ -5,7 +5,7 @@
               This file is generated from xml source: DO NOT EDIT
         XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
       -->
-<title>The Apache Software License, Version 1.1 - Apache HTTP Server</title>
+<title>The Apache License, Version 2.0 - Apache HTTP Server</title>
 <link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
 <link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
 <link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
@@ -16,68 +16,192 @@
 <img alt="" src="./images/feather.gif" /></div>
 <div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
 <div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Server</a> &gt; <a href="http://httpd.apache.org/docs-project/">Documentation</a> &gt; <a href="./">Version 2.1</a></div><div id="page-content"><div id="preamble"><h1>The Apache Software License, Version 1.1</h1>
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Server</a> &gt; <a href="http://httpd.apache.org/docs-project/">Documentation</a> &gt; <a href="./">Version 2.1</a></div><div id="page-content"><div id="preamble"><h1>The Apache License, Version 2.0</h1>
 <div class="toplang">
 <p><span>Available Languages: </span><a href="./en/license.html" title="English">&nbsp;en&nbsp;</a></p>
 </div>
 
-  <p>Copyright (c) 2000-2004 The Apache Software Foundation.  All rights
-  reserved.</p>
-
-  <p>Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:</p>
-
-  <ol>
-  <li>Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.</li>
-
-  <li>Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in
-  the documentation and/or other materials provided with the
-  distribution.</li>
-
-  <li>The end-user documentation included with the redistribution,
-  if any, must include the following acknowledgment:
-  <div class="example"><p><code>
-    "This product includes software developed by the
-    Apache Software Foundation (http://www.apache.org/)."
-  </code></p></div>
-
-  <p>Alternately, this acknowledgment may appear in the software itself,
-  if and wherever such third-party acknowledgments normally appear.</p></li>
-
-  <li>The names "Apache" and "Apache Software Foundation" must
-  not be used to endorse or promote products derived from this
-  software without prior written permission. For written
-  permission, please contact apache@apache.org.</li>
-
-  <li>Products derived from this software may not be called "Apache",
-  nor may "Apache" appear in their name, without prior written
-  permission of the Apache Software Foundation.</li>
-  </ol>
-
-  <div class="note">THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
-  ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-  SUCH DAMAGE.</div>
-
-  <p>This software consists of voluntary contributions made by many
-  individuals on behalf of the Apache Software Foundation.  For more
-  information on the Apache Software Foundation, please see
-  &lt;<a href="http://www.apache.org/">http://www.apache.org/</a>&gt;.</p>
-
-  <p>Portions of this software are based upon public domain software
-  originally written at the National Center for Supercomputing Applications,
-  University of Illinois, Urbana-Champaign.</p>
+    <p class="centered">Apache License<br />
+    Version 2.0, January 2004<br />
+    <a href="http://www.apache.org/licenses/">http://www.apache.org/licenses/</a><br /><br />
+
+    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION</p>
+
+    <ol>
+    <li><strong>Definitions</strong><br />
+
+    <p>"License" shall mean the terms and conditions for use, reproduction,
+    and distribution as defined by Sections 1 through 9 of this document.</p>
+
+    <p>"Licensor" shall mean the copyright owner or entity authorized by
+    the copyright owner that is granting the License.</p>
+
+    <p>"Legal Entity" shall mean the union of the acting entity and all
+    other entities that control, are controlled by, or are under common
+    control with that entity. For the purposes of this definition,
+    "control" means (i) the power, direct or indirect, to cause the
+    direction or management of such entity, whether by contract or
+    otherwise, or (ii) ownership of fifty percent (50%) or more of the
+    outstanding shares, or (iii) beneficial ownership of such entity.</p>
+
+    <p>"You" (or "Your") shall mean an individual or Legal Entity
+    exercising permissions granted by this License.</p>
+
+    <p>"Source" form shall mean the preferred form for making modifications,
+    including but not limited to software source code, documentation
+    source, and configuration files.</p>
+
+    <p>"Object" form shall mean any form resulting from mechanical
+    transformation or translation of a Source form, including but
+    not limited to compiled object code, generated documentation,
+    and conversions to other media types.</p>
+
+    <p>"Work" shall mean the work of authorship, whether in Source or
+    Object form, made available under the License, as indicated by a
+    copyright notice that is included in or attached to the work
+    (an example is provided in the Appendix below).</p>
+
+    <p>"Derivative Works" shall mean any work, whether in Source or Object
+    form, that is based on (or derived from) the Work and for which the
+    editorial revisions, annotations, elaborations, or other modifications
+    represent, as a whole, an original work of authorship. For the purposes
+    of this License, Derivative Works shall not include works that remain
+    separable from, or merely link (or bind by name) to the interfaces of,
+    the Work and Derivative Works thereof.</p>
+
+    <p>"Contribution" shall mean any work of authorship, including
+    the original version of the Work and any modifications or additions
+    to that Work or Derivative Works thereof, that is intentionally
+    submitted to Licensor for inclusion in the Work by the copyright owner
+    or by an individual or Legal Entity authorized to submit on behalf of
+    the copyright owner. For the purposes of this definition, "submitted"
+    means any form of electronic, verbal, or written communication sent
+    to the Licensor or its representatives, including but not limited to
+    communication on electronic mailing lists, source code control systems,
+    and issue tracking systems that are managed by, or on behalf of, the
+    Licensor for the purpose of discussing and improving the Work, but
+    excluding communication that is conspicuously marked or otherwise
+    designated in writing by the copyright owner as "Not a Contribution."</p>
+
+    <p>"Contributor" shall mean Licensor and any individual or Legal Entity
+    on behalf of whom a Contribution has been received by Licensor and
+    subsequently incorporated within the Work.</p></li>
+
+    <li><strong>Grant of Copyright License.</strong> Subject to the terms
+    and conditions of this License, each Contributor hereby grants to You
+    a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+    irrevocable copyright license to reproduce, prepare Derivative Works of,
+    publicly display, publicly perform, sublicense, and distribute the
+    Work and such Derivative Works in Source or Object form.</li>
+
+    <li><strong>Grant of Patent License.</strong> Subject to the terms
+    and conditions of this License, each Contributor hereby grants to You a
+    perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+    (except as stated in this section) patent license to make, have made,
+    use, offer to sell, sell, import, and otherwise transfer the Work,
+    where such license applies only to those patent claims licensable
+    by such Contributor that are necessarily infringed by their
+    Contribution(s) alone or by combination of their Contribution(s)
+    with the Work to which such Contribution(s) was submitted. If You
+    institute patent litigation against any entity (including a
+    cross-claim or counterclaim in a lawsuit) alleging that the Work
+    or a Contribution incorporated within the Work constitutes direct
+    or contributory patent infringement, then any patent licenses
+    granted to You under this License for that Work shall terminate
+    as of the date such litigation is filed.</li>
+
+    <li><strong>Redistribution.</strong> You may reproduce and distribute
+    copies of the Work or Derivative Works thereof in any medium, with or
+    without modifications, and in Source or Object form, provided that You
+    meet the following conditions:
+
+    <ol class="lo-A">
+        <li>You must give any other recipients of the Work or
+        Derivative Works a copy of this License; and</li>
+
+        <li>You must cause any modified files to carry prominent notices
+        stating that You changed the files; and</li>
+
+        <li>You must retain, in the Source form of any Derivative Works
+        that You distribute, all copyright, patent, trademark, and
+        attribution notices from the Source form of the Work,
+        excluding those notices that do not pertain to any part of
+        the Derivative Works; and</li>
+
+        <li>If the Work includes a "NOTICE" text file as part of its
+        distribution, then any Derivative Works that You distribute must
+        include a readable copy of the attribution notices contained
+        within such NOTICE file, excluding those notices that do not
+        pertain to any part of the Derivative Works, in at least one
+        of the following places: within a NOTICE text file distributed
+        as part of the Derivative Works; within the Source form or
+        documentation, if provided along with the Derivative Works; or,
+        within a display generated by the Derivative Works, if and
+        wherever such third-party notices normally appear. The contents
+        of the NOTICE file are for informational purposes only and
+        do not modify the License. You may add Your own attribution
+        notices within Derivative Works that You distribute, alongside
+        or as an addendum to the NOTICE text from the Work, provided
+        that such additional attribution notices cannot be construed
+        as modifying the License.</li>
+    </ol>
+
+    <p>You may add Your own copyright statement to Your modifications and
+    may provide additional or different license terms and conditions
+    for use, reproduction, or distribution of Your modifications, or
+    for any such Derivative Works as a whole, provided Your use,
+    reproduction, and distribution of the Work otherwise complies with
+    the conditions stated in this License.</p></li>
+
+    <li><strong>Submission of Contributions.</strong> Unless You explicitly
+    state otherwise, any Contribution intentionally submitted for inclusion
+    in the Work by You to the Licensor shall be under the terms and
+    conditions of this License, without any additional terms or conditions.
+    Notwithstanding the above, nothing herein shall supersede or modify
+    the terms of any separate license agreement you may have executed
+    with Licensor regarding such Contributions.</li>
+
+    <li><strong>Trademarks.</strong> This License does not grant permission
+    to use the trade names, trademarks, service marks, or product names of
+    the Licensor, except as required for reasonable and customary use in
+    describing the origin of the Work and reproducing the content of the
+    NOTICE file.</li>
+
+    <li><strong>Disclaimer of Warranty.</strong> Unless required by
+    applicable law or agreed to in writing, Licensor provides the Work (and
+    each Contributor provides its Contributions) on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+    implied, including, without limitation, any warranties or conditions
+    of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+    PARTICULAR PURPOSE. You are solely responsible for determining the
+    appropriateness of using or redistributing the Work and assume any
+    risks associated with Your exercise of permissions under this License.</li>
+
+    <li><strong>Limitation of Liability.</strong> In no event and under no
+    legal theory, whether in tort (including negligence), contract, or
+    otherwise, unless required by applicable law (such as deliberate and
+    grossly negligent acts) or agreed to in writing, shall any Contributor be
+    liable to You for damages, including any direct, indirect, special,
+    incidental, or consequential damages of any character arising as a
+    result of this License or out of the use or inability to use the
+    Work (including but not limited to damages for loss of goodwill,
+    work stoppage, computer failure or malfunction, or any and all
+    other commercial damages or losses), even if such Contributor
+    has been advised of the possibility of such damages.</li>
+
+    <li><strong>Accepting Warranty or Additional Liability.</strong> While
+    redistributing the Work or Derivative Works thereof, You may choose to
+    offer, and charge a fee for, acceptance of support, warranty, indemnity,
+    or other liability obligations and/or rights consistent with this
+    License. However, in accepting such obligations, You may act only
+    on Your own behalf and on Your sole responsibility, not on behalf
+    of any other Contributor, and only if You agree to indemnify,
+    defend, and hold each Contributor harmless for any liability
+    incurred by, or claims asserted against, such Contributor by reason
+    of your accepting any such warranty or additional liability.</li>
+    </ol>
+
+    <p class="centered">END OF TERMS AND CONDITIONS</p>
 </div>
 </div>
 <div class="bottomlang">