You are viewing a plain text version of this content. The canonical link for it is here.
Posted to legal-discuss@apache.org by ba...@apache.org on 2019/03/30 17:58:06 UTC
svn commit: r1856640 -
/infrastructure/site/trunk/content/licenses/LICENSE-2.0.mdtext
Author: bayard
Date: Sat Mar 30 17:58:06 2019
New Revision: 1856640
URL: http://svn.apache.org/viewvc?rev=1856640&view=rev
Log:
That was naive. I also need to add paragraph tags as those are automatic within markdown
Modified:
infrastructure/site/trunk/content/licenses/LICENSE-2.0.mdtext
Modified: infrastructure/site/trunk/content/licenses/LICENSE-2.0.mdtext
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/content/licenses/LICENSE-2.0.mdtext?rev=1856640&r1=1856639&r2=1856640&view=diff
==============================================================================
--- infrastructure/site/trunk/content/licenses/LICENSE-2.0.mdtext (original)
+++ infrastructure/site/trunk/content/licenses/LICENSE-2.0.mdtext Sat Mar 30 17:58:06 2019
@@ -20,52 +20,52 @@ Notice: Licensed to the Apache Softwa
<div style="text-align:center">
<strong>Apache License<br></br>Version 2.0, January 2004<br></br></strong>
-<strong>http://www.apache.org/licenses/](http://www.apache.org/licenses/)</strong>
+<strong><a href="http://www.apache.org/licenses/">http://www.apache.org/licenses/</a></strong>
</div>
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+<p>TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION</p>
-<strong>a name="definitions">1. Definitions</a></strong>.
+<p><strong>a name="definitions">1. Definitions</a></strong>.</p>
-"<strong>License</strong>" shall mean the terms and conditions for use, reproduction, and
-distribution as defined by Sections 1 through 9 of this document.
+<p>"<strong>License</strong>" shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.</p>
-"<strong>Licensor</strong>" shall mean the copyright owner or entity authorized by the
-copyright owner that is granting the License.
+<p>"<strong>Licensor</strong>" shall mean the copyright owner or entity authorized by the
+copyright owner that is granting the License.</p>
-"<strong>Legal Entity</strong>" shall mean the union of the acting entity and all other
+<p>"<strong>Legal Entity</strong>" 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, "<strong>control</strong>" 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.
+ownership of such entity.</p>
-"<strong>You</strong>" (or "<strong>Your</strong>") shall mean an individual or Legal Entity exercising
-permissions granted by this License.
+<p>"<strong>You</strong>" (or "<strong>Your</strong>") shall mean an individual or Legal Entity exercising
+permissions granted by this License.</p>
-"<strong>Source</strong>" form shall mean the preferred form for making modifications,
+<p>"<strong>Source</strong>" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation source,
-and configuration files.
+and configuration files.</p>
-"<strong>Object</strong>" form shall mean any form resulting from mechanical transformation
+<p>"<strong>Object</strong>" 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.
+object code, generated documentation, and conversions to other media types.</p>
-"<strong>Work</strong>" shall mean the work of authorship, whether in Source or Object form,
+<p>"<strong>Work</strong>" 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).
+Appendix below).</p>
-"<strong>Derivative Works</strong>" shall mean any work, whether in Source or Object form,
+<p>"<strong>Derivative Works</strong>" 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.
+Works thereof.</p>
-"<strong>Contribution</strong>" shall mean any work of authorship, including the original
+<p>"<strong>Contribution</strong>" 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
@@ -77,20 +77,20 @@ mailing lists, source code control syste
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 "<strong>Not a
-Contribution.</strong>"
+Contribution.</strong>"</p>
-"<strong>Contributor</strong>" shall mean Licensor and any individual or Legal Entity on
+<p>"<strong>Contributor</strong>" 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.
+subsequently incorporated within the Work.</p>
-<strong><a name="copyright">2. Grant of Copyright License</a></strong>. Subject to the
+<p><strong><a name="copyright">2. Grant of Copyright License</a></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.
+Derivative Works in Source or Object form.</p>
-<strong><a name="patent">3. Grant of Patent License</a></strong>. Subject to the terms
+<p><strong><a name="patent">3. Grant of Patent License</a></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,
@@ -103,12 +103,12 @@ any entity (including a cross-claim or c
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.
+date such litigation is filed.</p>
-<strong><a name="redistribution">4. Redistribution</a></strong>. You may reproduce and
+<p><strong><a name="redistribution">4. Redistribution</a></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:
+You meet the following conditions:</p>
<ol style="list-style: lower-latin;">
<li>You must give any other recipients of the Work or Derivative Works a
@@ -147,21 +147,21 @@ this License.
</ol>
-<strong><a name="contributions">5. Submission of Contributions</a></strong>. Unless You
+<p><strong><a name="contributions">5. Submission of Contributions</a></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.
+regarding such Contributions.</p>
-<strong><a name="trademarks">6. Trademarks</a></strong>. This License does not grant
+<p><strong><a name="trademarks">6. Trademarks</a></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.
+NOTICE file.</p>
-<strong><a name="no-warranty">7. Disclaimer of Warranty</a></strong>. Unless required by
+<p><strong><a name="no-warranty">7. Disclaimer of Warranty</a></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,
@@ -169,9 +169,9 @@ without limitation, any warranties or co
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.
+of permissions under this License.</p>
-<strong><a name="no-liability">8. Limitation of Liability</a></strong>. In no event and
+<p><strong><a name="no-liability">8. Limitation of Liability</a></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
@@ -181,9 +181,9 @@ of this License or out of the use or ina
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.
+damages.</p>
-<strong><a name="additional">9. Accepting Warranty or Additional Liability</a></strong>.
+<p><strong><a name="additional">9. Accepting Warranty or Additional Liability</a></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.
@@ -192,9 +192,9 @@ and on Your sole responsibility, not on
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.
+liability.</p>
-END OF TERMS AND CONDITIONS
+<p>END OF TERMS AND CONDITIONS</p>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: legal-discuss-unsubscribe@apache.org
For additional commands, e-mail: legal-discuss-help@apache.org