Author: buildbot
Date: Tue Jul 23 21:40:42 2013
New Revision: 870888
Log:
Staging update by buildbot for sis
Modified:
websites/staging/sis/trunk/content/ (props changed)
websites/staging/sis/trunk/content/license.html
Propchange: websites/staging/sis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Jul 23 21:40:42 2013
@@ -1 +1 @@
-1506297
+1506303
Modified: websites/staging/sis/trunk/content/license.html
==============================================================================
--- websites/staging/sis/trunk/content/license.html (original)
+++ websites/staging/sis/trunk/content/license.html Tue Jul 23 21:40:42 2013
@@ -76,9 +76,9 @@
<section id="content" class="row">
<article class="span12">
<p class="page-title">Apache License</p>
- <p>Apache License<br></br>Version 2.0, January 2004<br></br>
-<a href="http://www.apache.org/licenses/";>http://www.apache.org/licenses/</a>
</p>
-<p>TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION</p>
+ <p>Version 2.0, January 2004<br/>
+<a
href="http://www.apache.org/licenses/";>http://www.apache.org/licenses/</a></p>
+<h2 id="terms-and-conditions-for-use-reproduction-and-distribution">TERMS AND
CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION</h2>
<p><strong><a name="definitions">1. Definitions</a></strong>.</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>
@@ -230,7 +230,7 @@ harmless for any liability incurred by,
Contributor by reason of your accepting any such warranty or additional
liability.</p>
<p>END OF TERMS AND CONDITIONS</p>
-<h1 id="apply">APPENDIX: How to apply the Apache License to your work</h1>
+<h2 id="apply">APPENDIX: How to apply the Apache License to your work</h2>
<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
@@ -238,20 +238,19 @@ enclosed in the appropriate comment synt
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="codehilite"><pre> <span class="p">:::</span><span
class="n">text</span>
- <span class="n">Copyright</span> <span class="p">[</span><span
class="n">yyyy</span><span class="p">]</span> <span class="p">[</span><span
class="n">name</span> <span class="n">of</span> <span
class="n">copyright</span> <span class="n">owner</span><span class="p">]</span>
+<div class="codehilite"><pre>Copyright [yyyy] [name of copyright owner]
- <span class="n">Licensed</span> <span class="n">under</span> <span
class="n">the</span> <span class="n">Apache</span> <span
class="n">License</span><span class="p">,</span> <span class="n">Version</span>
2<span class="p">.</span>0 <span class="p">(</span><span class="n">the</span>
"<span class="n">License</span>"<span class="p">);</span>
- <span class="n">you</span> <span class="n">may</span> <span
class="n">not</span> <span class="n">use</span> <span class="n">this</span>
<span class="n">file</span> <span class="n">except</span> <span
class="n">in</span> <span class="n">compliance</span> <span
class="n">with</span> <span class="n">the</span> <span
class="n">License</span><span class="p">.</span>
- <span class="n">You</span> <span class="n">may</span> <span
class="n">obtain</span> <span class="n">a</span> <span class="n">copy</span>
<span class="n">of</span> <span class="n">the</span> <span
class="n">License</span> <span class="n">at</span>
-
- <span class="n">http</span><span class="p">:</span><span
class="o">//</span><span class="n">www</span><span class="p">.</span><span
class="n">apache</span><span class="p">.</span><span class="n">org</span><span
class="o">/</span><span class="n">licenses</span><span class="o">/</span><span
class="n">LICENSE</span><span class="o">-</span>2<span class="p">.</span>0
-
- <span class="n">Unless</span> <span class="n">required</span> <span
class="n">by</span> <span class="n">applicable</span> <span
class="n">law</span> <span class="n">or</span> <span class="n">agreed</span>
<span class="n">to</span> <span class="n">in</span> <span
class="n">writing</span><span class="p">,</span> <span class="n">software</span>
- <span class="n">distributed</span> <span class="n">under</span> <span
class="n">the</span> <span class="n">License</span> <span class="n">is</span>
<span class="n">distributed</span> <span class="n">on</span> <span
class="n">an</span> "<span class="n">AS</span> <span
class="n">IS</span>" <span class="n">BASIS</span><span class="p">,</span>
- <span class="n">WITHOUT</span> <span class="n">WARRANTIES</span> <span
class="n">OR</span> <span class="n">CONDITIONS</span> <span class="n">OF</span>
<span class="n">ANY</span> <span class="n">KIND</span><span class="p">,</span>
<span class="n">either</span> <span class="n">express</span> <span
class="n">or</span> <span class="n">implied</span><span class="p">.</span>
- <span class="n">See</span> <span class="n">the</span> <span
class="n">License</span> <span class="k">for</span> <span class="n">the</span>
<span class="n">specific</span> <span class="n">language</span> <span
class="n">governing</span> <span class="n">permissions</span> <span
class="n">and</span>
- <span class="n">limitations</span> <span class="n">under</span> <span
class="n">the</span> <span class="n">License</span><span class="p">.</span>
+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></div>
</article>
</section>
