river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r779001 - /websites/staging/river/trunk/content/license.html
Date Tue, 09 Nov 2010 21:02:00 GMT
Author: buildbot
Date: Tue Nov  9 21:02:00 2010
New Revision: 779001

URL: http://svn.apache.org/viewvc?rev=779001&view=rev
Log:
Staging update by buildbot

Modified:
    websites/staging/river/trunk/content/license.html

Modified: websites/staging/river/trunk/content/license.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/license.html?rev=779001&r1=779000&r2=779001&view=diff
==============================================================================
--- websites/staging/river/trunk/content/license.html (original)
+++ websites/staging/river/trunk/content/license.html Tue Nov  9 21:02:00 2010
@@ -63,76 +63,81 @@
         <td style="overflow: hidden;" valign="top" width="100%">
           <div class="wiki-content">
 <h1 id="apache_license_v20">Apache License v2.0</h1>
-<div style="font-family:monospace ; white-space:pre ;" >
+<pre>
 
-<div class="codehilite"><pre>                         <span class="n">Apache</span>
<span class="n">License</span>
-                    <span class="n">Version</span> <span class="mi">2</span><span
class="o">.</span><span class="mi">0</span><span class="p">,</span>
<span class="n">January</span> <span class="mi">2004</span>
-                 <span class="n">http:</span><span class="sr">//</span><span
class="n">www</span><span class="o">.</span><span class="n">apache</span><span
class="o">.</span><span class="n">org</span><span class="sr">/licenses/</span>
-</pre></div>
-
-
-<p>TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION</p>
-<ol>
-<li>
-<p>Definitions.</p>
-<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>
-<p>Grant of Copyright License. Subject to the terms and conditions of
+Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+"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.
+
+"You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+"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.
+
+"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).
+
+"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.
+
+"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."
+
+"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.
+
+2. Grant of Copyright License. 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.</p>
-</li>
-<li>
-<p>Grant of Patent License. Subject to the terms and conditions of
+      Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. 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,
@@ -146,62 +151,63 @@
       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.</p>
-</li>
-<li>
-<p>Redistribution. You may reproduce and distribute copies of the
+      as of the date such litigation is filed.
+
+4. Redistribution. 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:</p>
-<p>(a) You must give any other recipients of the Work or
-      Derivative Works a copy of this License; and</p>
-<p>(b) You must cause any modified files to carry prominent notices
-      stating that You changed the files; and</p>
-<p>(c) 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</p>
-<p>(d) 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.</p>
-<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>
-<p>Submission of Contributions. Unless You explicitly state otherwise,
+      meet the following conditions:
+
+(a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+(b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+(c) 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
+
+(d) 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.
+
+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.
+
+5. Submission of Contributions. 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.</p>
-</li>
-<li>
-<p>Trademarks. This License does not grant permission to use the trade
+      with Licensor regarding such Contributions.
+
+6. Trademarks. 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.</p>
-</li>
-<li>
-<p>Disclaimer of Warranty. Unless required by applicable law or
+      origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. 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
@@ -209,10 +215,9 @@
       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.</p>
-</li>
-<li>
-<p>Limitation of Liability. In no event and under no legal theory,
+      risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. 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
@@ -222,10 +227,9 @@
       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.</p>
-</li>
-<li>
-<p>Accepting Warranty or Additional Liability. While redistributing
+      has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. 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
@@ -234,36 +238,36 @@
       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.</p>
-</li>
-</ol>
-<p>END OF TERMS AND CONDITIONS</p>
-<p>APPENDIX: How to apply the Apache License to your work.</p>
-<div class="codehilite"><pre>  <span class="n">To</span> <span
class="n">apply</span> <span class="n">the</span> <span class="n">Apache</span>
<span class="n">License</span> <span class="n">to</span> <span
class="n">your</span> <span class="n">work</span><span class="p">,</span>
<span class="n">attach</span> <span class="n">the</span> <span
class="n">following</span>
-  <span class="n">boilerplate</span> <span class="n">notice</span><span
class="p">,</span> <span class="n">with</span> <span class="n">the</span>
<span class="n">fields</span> <span class="n">enclosed</span> <span
class="n">by</span> <span class="n">brackets</span> <span class="s">&quot;[]&quot;</span>
-  <span class="n">replaced</span> <span class="n">with</span> <span
class="n">your</span> <span class="n">own</span> <span class="n">identifying</span>
<span class="n">information</span><span class="o">.</span> <span
class="p">(</span><span class="n">Don</span><span class="err">&#39;</span><span
class="n">t</span> <span class="n">include</span>
-  <span class="n">the</span> <span class="n">brackets</span><span
class="o">!</span><span class="p">)</span>  <span class="n">The</span>
<span class="n">text</span> <span class="n">should</span> <span
class="n">be</span> <span class="n">enclosed</span> <span class="n">in</span>
<span class="n">the</span> <span class="n">appropriate</span>
-  <span class="n">comment</span> <span class="n">syntax</span> <span
class="k">for</span> <span class="n">the</span> <span class="n">file</span>
<span class="nb">format</span><span class="o">.</span> <span class="n">We</span>
<span class="n">also</span> <span class="n">recommend</span> <span
class="n">that</span> <span class="n">a</span>
-  <span class="n">file</span> <span class="ow">or</span> <span
class="n">class</span> <span class="n">name</span> <span class="ow">and</span>
<span class="n">description</span> <span class="n">of</span> <span
class="n">purpose</span> <span class="n">be</span> <span class="n">included</span>
<span class="n">on</span> <span class="n">the</span>
-  <span class="n">same</span> <span class="s">&quot;printed page&quot;</span>
<span class="n">as</span> <span class="n">the</span> <span class="n">copyright</span>
<span class="n">notice</span> <span class="k">for</span> <span
class="n">easier</span>
-  <span class="n">identification</span> <span class="n">within</span>
<span class="n">third</span><span class="o">-</span><span class="n">party</span>
<span class="n">archives</span><span class="o">.</span>
-</pre></div>
+      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.
 
-<p>Copyright <a href="yyyy.html">yyyy</a> <a href="name-of-copyright-owner.html">name
of copyright owner</a></p>
-<p>Licensed under the Apache License, Version 2.0 (the "License");
+Copyright [yyyy](yyyy.html) [name of copyright owner](name-of-copyright-owner.html)
+
+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</p>
-<div class="codehilite"><pre>   <span class="n">http:</span><span
class="sr">//</span><span class="n">www</span><span class="o">.</span><span
class="n">apache</span><span class="o">.</span><span class="n">org</span><span
class="sr">/licenses/</span><span class="n">LICENSE</span><span class="o">-</span><span
class="mi">2</span><span class="o">.</span><span class="mi">0</span>
-</pre></div>
+   You may obtain a copy of the License at
 
+http://www.apache.org/licenses/LICENSE-2.0
 
-<p>Unless required by applicable law or agreed to in writing, software
+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.</p>
-</div>
+   limitations under the License.
+
+</pre>
           </div>
         </td>
         <td valign="top">



Mime
View raw message