velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cbris...@apache.org
Subject svn commit: r1760548 [3/4] - in /velocity/site/production: ./ anakia/ docbook/ dvsl/ engine/ engine/1.7/ engine/devel/ texen/ tools/ tools/2.0/ tools/devel/
Date Tue, 13 Sep 2016 13:55:59 GMT
Modified: velocity/site/production/engine/devel/license.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/devel/license.html?rev=1760548&r1=1760547&r2=1760548&view=diff
==============================================================================
--- velocity/site/production/engine/devel/license.html (original)
+++ velocity/site/production/engine/devel/license.html Tue Sep 13 13:55:58 2016
@@ -226,207 +226,207 @@ h2:hover > .headerlink, h3:hover > .head
 <h2 id="overview">Overview<a class="headerlink" href="#overview" title="Permanent link">&para;</a></h2>
 <p>Typically the licenses listed for the project are that of the project itself, and not of dependencies.</p>
 <h2 id="project-licence">Project Licence<a class="headerlink" href="#project-licence" title="Permanent link">&para;</a></h2>
-<div class="codehilite"><pre>                             <span class="nx">Apache</span> <span class="nx">License</span>
-                       <span class="nx">Version</span> <span class="mf">2.0</span><span class="p">,</span> <span class="nx">January</span> <span class="mi">2004</span>
-                    <span class="nx">http</span><span class="o">:</span><span class="c1">//www.apache.org/licenses/</span>
-
-<span class="nx">TERMS</span> <span class="nx">AND</span> <span class="nx">CONDITIONS</span> <span class="nx">FOR</span> <span class="nx">USE</span><span class="p">,</span> <span class="nx">REPRODUCTION</span><span class="p">,</span> <span class="nx">AND</span> <span class="nx">DISTRIBUTION</span>
-
-<span class="mi">1</span><span class="p">.</span> <span class="nx">Definitions</span><span class="p">.</span>
-
-   <span class="s2">&quot;License&quot;</span> <span class="nx">shall</span> <span class="nx">mean</span> <span class="nx">the</span> <span class="nx">terms</span> <span class="nx">and</span> <span class="nx">conditions</span> <span class="k">for</span> <span class="nx">use</span><span class="p">,</span> <span class="nx">reproduction</span><span class="p">,</span>
-   <span class="nx">and</span> <span class="nx">distribution</span> <span class="nx">as</span> <span class="nx">defined</span> <span class="nx">by</span> <span class="nx">Sections</span> <span class="mi">1</span> <span class="nx">through</span> <span class="mi">9</span> <span class="nx">of</span> <span class="k">this</span> <span class="nb">document</span><span class="p">.</span>
-
-   <span class="s2">&quot;Licensor&quot;</span> <span class="nx">shall</span> <span class="nx">mean</span> <span class="nx">the</span> <span class="nx">copyright</span> <span class="nx">owner</span> <span class="nx">or</span> <span class="nx">entity</span> <span class="nx">authorized</span> <span class="nx">by</span>
-   <span class="nx">the</span> <span class="nx">copyright</span> <span class="nx">owner</span> <span class="nx">that</span> <span class="nx">is</span> <span class="nx">granting</span> <span class="nx">the</span> <span class="nx">License</span><span class="p">.</span>
-
-   <span class="s2">&quot;Legal Entity&quot;</span> <span class="nx">shall</span> <span class="nx">mean</span> <span class="nx">the</span> <span class="nx">union</span> <span class="nx">of</span> <span class="nx">the</span> <span class="nx">acting</span> <span class="nx">entity</span> <span class="nx">and</span> <span class="nx">all</span>
-   <span class="nx">other</span> <span class="nx">entities</span> <span class="nx">that</span> <span class="nx">control</span><span class="p">,</span> <span class="nx">are</span> <span class="nx">controlled</span> <span class="nx">by</span><span class="p">,</span> <span class="nx">or</span> <span class="nx">are</span> <span class="nx">under</span> <span class="nx">common</span>
-   <span class="nx">control</span> <span class="kd">with</span> <span class="nx">that</span> <span class="nx">entity</span><span class="p">.</span> <span class="nx">For</span> <span class="nx">the</span> <span class="nx">purposes</span> <span class="nx">of</span> <span class="k">this</span> <span class="nx">definition</span><span class="p">,</span>
-   <span class="s2">&quot;control&quot;</span> <span class="nx">means</span> <span class="p">(</span><span class="nx">i</span><span class="p">)</span> <span class="nx">the</span> <span class="nx">power</span><span class="p">,</span> <span class="nx">direct</span> <span class="nx">or</span> <span class="nx">indirect</span><span class="p">,</span> <span class="nx">to</span> <span class="nx">cause</span> <span class="nx">the</span>
-   <span class="nx">direction</span> <span class="nx">or</span> <span class="nx">management</span> <span class="nx">of</span> <span class="nx">such</span> <span class="nx">entity</span><span class="p">,</span> <span class="nx">whether</span> <span class="nx">by</span> <span class="nx">contract</span> <span class="nx">or</span>
-   <span class="nx">otherwise</span><span class="p">,</span> <span class="nx">or</span> <span class="p">(</span><span class="nx">ii</span><span class="p">)</span> <span class="nx">ownership</span> <span class="nx">of</span> <span class="nx">fifty</span> <span class="nx">percent</span> <span class="p">(</span><span class="mi">50</span><span class="o">%</span><span class="p">)</span> <span class="nx">or</span> <span class="nx">more</span> <span class="nx">of</span> <span class="nx">the</span>
-   <span class="nx">outstanding</span> <span class="nx">shares</span><span class="p">,</span> <span class="nx">or</span> <span class="p">(</span><span class="nx">iii</span><span class="p">)</span> <span class="nx">beneficial</span> <span class="nx">ownership</span> <span class="nx">of</span> <span class="nx">such</span> <span class="nx">entity</span><span class="p">.</span>
-
-   <span class="s2">&quot;You&quot;</span> <span class="p">(</span><span class="nx">or</span> <span class="s2">&quot;Your&quot;</span><span class="p">)</span> <span class="nx">shall</span> <span class="nx">mean</span> <span class="nx">an</span> <span class="nx">individual</span> <span class="nx">or</span> <span class="nx">Legal</span> <span class="nx">Entity</span>
-   <span class="nx">exercising</span> <span class="nx">permissions</span> <span class="nx">granted</span> <span class="nx">by</span> <span class="k">this</span> <span class="nx">License</span><span class="p">.</span>
-
-   <span class="s2">&quot;Source&quot;</span> <span class="nx">form</span> <span class="nx">shall</span> <span class="nx">mean</span> <span class="nx">the</span> <span class="nx">preferred</span> <span class="nx">form</span> <span class="k">for</span> <span class="nx">making</span> <span class="nx">modifications</span><span class="p">,</span>
-   <span class="nx">including</span> <span class="nx">but</span> <span class="nx">not</span> <span class="nx">limited</span> <span class="nx">to</span> <span class="nx">software</span> <span class="nx">source</span> <span class="nx">code</span><span class="p">,</span> <span class="nx">documentation</span>
-   <span class="nx">source</span><span class="p">,</span> <span class="nx">and</span> <span class="nx">configuration</span> <span class="nx">files</span><span class="p">.</span>
-
-   <span class="s2">&quot;Object&quot;</span> <span class="nx">form</span> <span class="nx">shall</span> <span class="nx">mean</span> <span class="nx">any</span> <span class="nx">form</span> <span class="nx">resulting</span> <span class="nx">from</span> <span class="nx">mechanical</span>
-   <span class="nx">transformation</span> <span class="nx">or</span> <span class="nx">translation</span> <span class="nx">of</span> <span class="nx">a</span> <span class="nx">Source</span> <span class="nx">form</span><span class="p">,</span> <span class="nx">including</span> <span class="nx">but</span>
-   <span class="nx">not</span> <span class="nx">limited</span> <span class="nx">to</span> <span class="nx">compiled</span> <span class="nx">object</span> <span class="nx">code</span><span class="p">,</span> <span class="nx">generated</span> <span class="nx">documentation</span><span class="p">,</span>
-   <span class="nx">and</span> <span class="nx">conversions</span> <span class="nx">to</span> <span class="nx">other</span> <span class="nx">media</span> <span class="nx">types</span><span class="p">.</span>
-
-   <span class="s2">&quot;Work&quot;</span> <span class="nx">shall</span> <span class="nx">mean</span> <span class="nx">the</span> <span class="nx">work</span> <span class="nx">of</span> <span class="nx">authorship</span><span class="p">,</span> <span class="nx">whether</span> <span class="k">in</span> <span class="nx">Source</span> <span class="nx">or</span>
-   <span class="nb">Object</span> <span class="nx">form</span><span class="p">,</span> <span class="nx">made</span> <span class="nx">available</span> <span class="nx">under</span> <span class="nx">the</span> <span class="nx">License</span><span class="p">,</span> <span class="nx">as</span> <span class="nx">indicated</span> <span class="nx">by</span> <span class="nx">a</span>
-   <span class="nx">copyright</span> <span class="nx">notice</span> <span class="nx">that</span> <span class="nx">is</span> <span class="nx">included</span> <span class="k">in</span> <span class="nx">or</span> <span class="nx">attached</span> <span class="nx">to</span> <span class="nx">the</span> <span class="nx">work</span>
-   <span class="p">(</span><span class="nx">an</span> <span class="nx">example</span> <span class="nx">is</span> <span class="nx">provided</span> <span class="k">in</span> <span class="nx">the</span> <span class="nx">Appendix</span> <span class="nx">below</span><span class="p">).</span>
-
-   <span class="s2">&quot;Derivative Works&quot;</span> <span class="nx">shall</span> <span class="nx">mean</span> <span class="nx">any</span> <span class="nx">work</span><span class="p">,</span> <span class="nx">whether</span> <span class="k">in</span> <span class="nx">Source</span> <span class="nx">or</span> <span class="nb">Object</span>
-   <span class="nx">form</span><span class="p">,</span> <span class="nx">that</span> <span class="nx">is</span> <span class="nx">based</span> <span class="nx">on</span> <span class="p">(</span><span class="nx">or</span> <span class="nx">derived</span> <span class="nx">from</span><span class="p">)</span> <span class="nx">the</span> <span class="nx">Work</span> <span class="nx">and</span> <span class="k">for</span> <span class="nx">which</span> <span class="nx">the</span>
-   <span class="nx">editorial</span> <span class="nx">revisions</span><span class="p">,</span> <span class="nx">annotations</span><span class="p">,</span> <span class="nx">elaborations</span><span class="p">,</span> <span class="nx">or</span> <span class="nx">other</span> <span class="nx">modifications</span>
-   <span class="nx">represent</span><span class="p">,</span> <span class="nx">as</span> <span class="nx">a</span> <span class="nx">whole</span><span class="p">,</span> <span class="nx">an</span> <span class="nx">original</span> <span class="nx">work</span> <span class="nx">of</span> <span class="nx">authorship</span><span class="p">.</span> <span class="nx">For</span> <span class="nx">the</span> <span class="nx">purposes</span>
-   <span class="nx">of</span> <span class="k">this</span> <span class="nx">License</span><span class="p">,</span> <span class="nx">Derivative</span> <span class="nx">Works</span> <span class="nx">shall</span> <span class="nx">not</span> <span class="nx">include</span> <span class="nx">works</span> <span class="nx">that</span> <span class="nx">remain</span>
-   <span class="nx">separable</span> <span class="nx">from</span><span class="p">,</span> <span class="nx">or</span> <span class="nx">merely</span> <span class="nx">link</span> <span class="p">(</span><span class="nx">or</span> <span class="nx">bind</span> <span class="nx">by</span> <span class="nx">name</span><span class="p">)</span> <span class="nx">to</span> <span class="nx">the</span> <span class="nx">interfaces</span> <span class="nx">of</span><span class="p">,</span>
-   <span class="nx">the</span> <span class="nx">Work</span> <span class="nx">and</span> <span class="nx">Derivative</span> <span class="nx">Works</span> <span class="nx">thereof</span><span class="p">.</span>
-
-   <span class="s2">&quot;Contribution&quot;</span> <span class="nx">shall</span> <span class="nx">mean</span> <span class="nx">any</span> <span class="nx">work</span> <span class="nx">of</span> <span class="nx">authorship</span><span class="p">,</span> <span class="nx">including</span>
-   <span class="nx">the</span> <span class="nx">original</span> <span class="nx">version</span> <span class="nx">of</span> <span class="nx">the</span> <span class="nx">Work</span> <span class="nx">and</span> <span class="nx">any</span> <span class="nx">modifications</span> <span class="nx">or</span> <span class="nx">additions</span>
-   <span class="nx">to</span> <span class="nx">that</span> <span class="nx">Work</span> <span class="nx">or</span> <span class="nx">Derivative</span> <span class="nx">Works</span> <span class="nx">thereof</span><span class="p">,</span> <span class="nx">that</span> <span class="nx">is</span> <span class="nx">intentionally</span>
-   <span class="nx">submitted</span> <span class="nx">to</span> <span class="nx">Licensor</span> <span class="k">for</span> <span class="nx">inclusion</span> <span class="k">in</span> <span class="nx">the</span> <span class="nx">Work</span> <span class="nx">by</span> <span class="nx">the</span> <span class="nx">copyright</span> <span class="nx">owner</span>
-   <span class="nx">or</span> <span class="nx">by</span> <span class="nx">an</span> <span class="nx">individual</span> <span class="nx">or</span> <span class="nx">Legal</span> <span class="nx">Entity</span> <span class="nx">authorized</span> <span class="nx">to</span> <span class="nx">submit</span> <span class="nx">on</span> <span class="nx">behalf</span> <span class="nx">of</span>
-   <span class="nx">the</span> <span class="nx">copyright</span> <span class="nx">owner</span><span class="p">.</span> <span class="nx">For</span> <span class="nx">the</span> <span class="nx">purposes</span> <span class="nx">of</span> <span class="k">this</span> <span class="nx">definition</span><span class="p">,</span> <span class="s2">&quot;submitted&quot;</span>
-   <span class="nx">means</span> <span class="nx">any</span> <span class="nx">form</span> <span class="nx">of</span> <span class="nx">electronic</span><span class="p">,</span> <span class="nx">verbal</span><span class="p">,</span> <span class="nx">or</span> <span class="nx">written</span> <span class="nx">communication</span> <span class="nx">sent</span>
-   <span class="nx">to</span> <span class="nx">the</span> <span class="nx">Licensor</span> <span class="nx">or</span> <span class="nx">its</span> <span class="nx">representatives</span><span class="p">,</span> <span class="nx">including</span> <span class="nx">but</span> <span class="nx">not</span> <span class="nx">limited</span> <span class="nx">to</span>
-   <span class="nx">communication</span> <span class="nx">on</span> <span class="nx">electronic</span> <span class="nx">mailing</span> <span class="nx">lists</span><span class="p">,</span> <span class="nx">source</span> <span class="nx">code</span> <span class="nx">control</span> <span class="nx">systems</span><span class="p">,</span>
-   <span class="nx">and</span> <span class="nx">issue</span> <span class="nx">tracking</span> <span class="nx">systems</span> <span class="nx">that</span> <span class="nx">are</span> <span class="nx">managed</span> <span class="nx">by</span><span class="p">,</span> <span class="nx">or</span> <span class="nx">on</span> <span class="nx">behalf</span> <span class="nx">of</span><span class="p">,</span> <span class="nx">the</span>
-   <span class="nx">Licensor</span> <span class="k">for</span> <span class="nx">the</span> <span class="nx">purpose</span> <span class="nx">of</span> <span class="nx">discussing</span> <span class="nx">and</span> <span class="nx">improving</span> <span class="nx">the</span> <span class="nx">Work</span><span class="p">,</span> <span class="nx">but</span>
-   <span class="nx">excluding</span> <span class="nx">communication</span> <span class="nx">that</span> <span class="nx">is</span> <span class="nx">conspicuously</span> <span class="nx">marked</span> <span class="nx">or</span> <span class="nx">otherwise</span>
-   <span class="nx">designated</span> <span class="k">in</span> <span class="nx">writing</span> <span class="nx">by</span> <span class="nx">the</span> <span class="nx">copyright</span> <span class="nx">owner</span> <span class="nx">as</span> <span class="s2">&quot;Not a Contribution.&quot;</span>
-
-   <span class="s2">&quot;Contributor&quot;</span> <span class="nx">shall</span> <span class="nx">mean</span> <span class="nx">Licensor</span> <span class="nx">and</span> <span class="nx">any</span> <span class="nx">individual</span> <span class="nx">or</span> <span class="nx">Legal</span> <span class="nx">Entity</span>
-   <span class="nx">on</span> <span class="nx">behalf</span> <span class="nx">of</span> <span class="nx">whom</span> <span class="nx">a</span> <span class="nx">Contribution</span> <span class="nx">has</span> <span class="nx">been</span> <span class="nx">received</span> <span class="nx">by</span> <span class="nx">Licensor</span> <span class="nx">and</span>
-   <span class="nx">subsequently</span> <span class="nx">incorporated</span> <span class="nx">within</span> <span class="nx">the</span> <span class="nx">Work</span><span class="p">.</span>
-
-<span class="mi">2</span><span class="p">.</span> <span class="nx">Grant</span> <span class="nx">of</span> <span class="nx">Copyright</span> <span class="nx">License</span><span class="p">.</span> <span class="nx">Subject</span> <span class="nx">to</span> <span class="nx">the</span> <span class="nx">terms</span> <span class="nx">and</span> <span class="nx">conditions</span> <span class="nx">of</span>
-   <span class="k">this</span> <span class="nx">License</span><span class="p">,</span> <span class="nx">each</span> <span class="nx">Contributor</span> <span class="nx">hereby</span> <span class="nx">grants</span> <span class="nx">to</span> <span class="nx">You</span> <span class="nx">a</span> <span class="nx">perpetual</span><span class="p">,</span>
-   <span class="nx">worldwide</span><span class="p">,</span> <span class="nx">non</span><span class="o">-</span><span class="nx">exclusive</span><span class="p">,</span> <span class="nx">no</span><span class="o">-</span><span class="nx">charge</span><span class="p">,</span> <span class="nx">royalty</span><span class="o">-</span><span class="nx">free</span><span class="p">,</span> <span class="nx">irrevocable</span>
-   <span class="nx">copyright</span> <span class="nx">license</span> <span class="nx">to</span> <span class="nx">reproduce</span><span class="p">,</span> <span class="nx">prepare</span> <span class="nx">Derivative</span> <span class="nx">Works</span> <span class="nx">of</span><span class="p">,</span>
-   <span class="nx">publicly</span> <span class="nx">display</span><span class="p">,</span> <span class="nx">publicly</span> <span class="nx">perform</span><span class="p">,</span> <span class="nx">sublicense</span><span class="p">,</span> <span class="nx">and</span> <span class="nx">distribute</span> <span class="nx">the</span>
-   <span class="nx">Work</span> <span class="nx">and</span> <span class="nx">such</span> <span class="nx">Derivative</span> <span class="nx">Works</span> <span class="k">in</span> <span class="nx">Source</span> <span class="nx">or</span> <span class="nb">Object</span> <span class="nx">form</span><span class="p">.</span>
-
-<span class="mi">3</span><span class="p">.</span> <span class="nx">Grant</span> <span class="nx">of</span> <span class="nx">Patent</span> <span class="nx">License</span><span class="p">.</span> <span class="nx">Subject</span> <span class="nx">to</span> <span class="nx">the</span> <span class="nx">terms</span> <span class="nx">and</span> <span class="nx">conditions</span> <span class="nx">of</span>
-   <span class="k">this</span> <span class="nx">License</span><span class="p">,</span> <span class="nx">each</span> <span class="nx">Contributor</span> <span class="nx">hereby</span> <span class="nx">grants</span> <span class="nx">to</span> <span class="nx">You</span> <span class="nx">a</span> <span class="nx">perpetual</span><span class="p">,</span>
-   <span class="nx">worldwide</span><span class="p">,</span> <span class="nx">non</span><span class="o">-</span><span class="nx">exclusive</span><span class="p">,</span> <span class="nx">no</span><span class="o">-</span><span class="nx">charge</span><span class="p">,</span> <span class="nx">royalty</span><span class="o">-</span><span class="nx">free</span><span class="p">,</span> <span class="nx">irrevocable</span>
-   <span class="p">(</span><span class="nx">except</span> <span class="nx">as</span> <span class="nx">stated</span> <span class="k">in</span> <span class="k">this</span> <span class="nx">section</span><span class="p">)</span> <span class="nx">patent</span> <span class="nx">license</span> <span class="nx">to</span> <span class="nx">make</span><span class="p">,</span> <span class="nx">have</span> <span class="nx">made</span><span class="p">,</span>
-   <span class="nx">use</span><span class="p">,</span> <span class="nx">offer</span> <span class="nx">to</span> <span class="nx">sell</span><span class="p">,</span> <span class="nx">sell</span><span class="p">,</span> <span class="kr">import</span><span class="p">,</span> <span class="nx">and</span> <span class="nx">otherwise</span> <span class="nx">transfer</span> <span class="nx">the</span> <span class="nx">Work</span><span class="p">,</span>
-   <span class="nx">where</span> <span class="nx">such</span> <span class="nx">license</span> <span class="nx">applies</span> <span class="nx">only</span> <span class="nx">to</span> <span class="nx">those</span> <span class="nx">patent</span> <span class="nx">claims</span> <span class="nx">licensable</span>
-   <span class="nx">by</span> <span class="nx">such</span> <span class="nx">Contributor</span> <span class="nx">that</span> <span class="nx">are</span> <span class="nx">necessarily</span> <span class="nx">infringed</span> <span class="nx">by</span> <span class="nx">their</span>
-   <span class="nx">Contribution</span><span class="p">(</span><span class="nx">s</span><span class="p">)</span> <span class="nx">alone</span> <span class="nx">or</span> <span class="nx">by</span> <span class="nx">combination</span> <span class="nx">of</span> <span class="nx">their</span> <span class="nx">Contribution</span><span class="p">(</span><span class="nx">s</span><span class="p">)</span>
-   <span class="kd">with</span> <span class="nx">the</span> <span class="nx">Work</span> <span class="nx">to</span> <span class="nx">which</span> <span class="nx">such</span> <span class="nx">Contribution</span><span class="p">(</span><span class="nx">s</span><span class="p">)</span> <span class="nx">was</span> <span class="nx">submitted</span><span class="p">.</span> <span class="nx">If</span> <span class="nx">You</span>
-   <span class="nx">institute</span> <span class="nx">patent</span> <span class="nx">litigation</span> <span class="nx">against</span> <span class="nx">any</span> <span class="nx">entity</span> <span class="p">(</span><span class="nx">including</span> <span class="nx">a</span>
-   <span class="nx">cross</span><span class="o">-</span><span class="nx">claim</span> <span class="nx">or</span> <span class="nx">counterclaim</span> <span class="k">in</span> <span class="nx">a</span> <span class="nx">lawsuit</span><span class="p">)</span> <span class="nx">alleging</span> <span class="nx">that</span> <span class="nx">the</span> <span class="nx">Work</span>
-   <span class="nx">or</span> <span class="nx">a</span> <span class="nx">Contribution</span> <span class="nx">incorporated</span> <span class="nx">within</span> <span class="nx">the</span> <span class="nx">Work</span> <span class="nx">constitutes</span> <span class="nx">direct</span>
-   <span class="nx">or</span> <span class="nx">contributory</span> <span class="nx">patent</span> <span class="nx">infringement</span><span class="p">,</span> <span class="nx">then</span> <span class="nx">any</span> <span class="nx">patent</span> <span class="nx">licenses</span>
-   <span class="nx">granted</span> <span class="nx">to</span> <span class="nx">You</span> <span class="nx">under</span> <span class="k">this</span> <span class="nx">License</span> <span class="k">for</span> <span class="nx">that</span> <span class="nx">Work</span> <span class="nx">shall</span> <span class="nx">terminate</span>
-   <span class="nx">as</span> <span class="nx">of</span> <span class="nx">the</span> <span class="nx">date</span> <span class="nx">such</span> <span class="nx">litigation</span> <span class="nx">is</span> <span class="nx">filed</span><span class="p">.</span>
-
-<span class="mi">4</span><span class="p">.</span> <span class="nx">Redistribution</span><span class="p">.</span> <span class="nx">You</span> <span class="nx">may</span> <span class="nx">reproduce</span> <span class="nx">and</span> <span class="nx">distribute</span> <span class="nx">copies</span> <span class="nx">of</span> <span class="nx">the</span>
-   <span class="nx">Work</span> <span class="nx">or</span> <span class="nx">Derivative</span> <span class="nx">Works</span> <span class="nx">thereof</span> <span class="k">in</span> <span class="nx">any</span> <span class="nx">medium</span><span class="p">,</span> <span class="kd">with</span> <span class="nx">or</span> <span class="nx">without</span>
-   <span class="nx">modifications</span><span class="p">,</span> <span class="nx">and</span> <span class="k">in</span> <span class="nx">Source</span> <span class="nx">or</span> <span class="nb">Object</span> <span class="nx">form</span><span class="p">,</span> <span class="nx">provided</span> <span class="nx">that</span> <span class="nx">You</span>
-   <span class="nx">meet</span> <span class="nx">the</span> <span class="nx">following</span> <span class="nx">conditions</span><span class="o">:</span>
-
-   <span class="p">(</span><span class="nx">a</span><span class="p">)</span> <span class="nx">You</span> <span class="nx">must</span> <span class="nx">give</span> <span class="nx">any</span> <span class="nx">other</span> <span class="nx">recipients</span> <span class="nx">of</span> <span class="nx">the</span> <span class="nx">Work</span> <span class="nx">or</span>
-       <span class="nx">Derivative</span> <span class="nx">Works</span> <span class="nx">a</span> <span class="nx">copy</span> <span class="nx">of</span> <span class="k">this</span> <span class="nx">License</span><span class="p">;</span> <span class="nx">and</span>
-
-   <span class="p">(</span><span class="nx">b</span><span class="p">)</span> <span class="nx">You</span> <span class="nx">must</span> <span class="nx">cause</span> <span class="nx">any</span> <span class="nx">modified</span> <span class="nx">files</span> <span class="nx">to</span> <span class="nx">carry</span> <span class="nx">prominent</span> <span class="nx">notices</span>
-       <span class="nx">stating</span> <span class="nx">that</span> <span class="nx">You</span> <span class="nx">changed</span> <span class="nx">the</span> <span class="nx">files</span><span class="p">;</span> <span class="nx">and</span>
-
-   <span class="p">(</span><span class="nx">c</span><span class="p">)</span> <span class="nx">You</span> <span class="nx">must</span> <span class="nx">retain</span><span class="p">,</span> <span class="k">in</span> <span class="nx">the</span> <span class="nx">Source</span> <span class="nx">form</span> <span class="nx">of</span> <span class="nx">any</span> <span class="nx">Derivative</span> <span class="nx">Works</span>
-       <span class="nx">that</span> <span class="nx">You</span> <span class="nx">distribute</span><span class="p">,</span> <span class="nx">all</span> <span class="nx">copyright</span><span class="p">,</span> <span class="nx">patent</span><span class="p">,</span> <span class="nx">trademark</span><span class="p">,</span> <span class="nx">and</span>
-       <span class="nx">attribution</span> <span class="nx">notices</span> <span class="nx">from</span> <span class="nx">the</span> <span class="nx">Source</span> <span class="nx">form</span> <span class="nx">of</span> <span class="nx">the</span> <span class="nx">Work</span><span class="p">,</span>
-       <span class="nx">excluding</span> <span class="nx">those</span> <span class="nx">notices</span> <span class="nx">that</span> <span class="k">do</span> <span class="nx">not</span> <span class="nx">pertain</span> <span class="nx">to</span> <span class="nx">any</span> <span class="nx">part</span> <span class="nx">of</span>
-       <span class="nx">the</span> <span class="nx">Derivative</span> <span class="nx">Works</span><span class="p">;</span> <span class="nx">and</span>
-
-   <span class="p">(</span><span class="nx">d</span><span class="p">)</span> <span class="nx">If</span> <span class="nx">the</span> <span class="nx">Work</span> <span class="nx">includes</span> <span class="nx">a</span> <span class="s2">&quot;NOTICE&quot;</span> <span class="nx">text</span> <span class="nx">file</span> <span class="nx">as</span> <span class="nx">part</span> <span class="nx">of</span> <span class="nx">its</span>
-       <span class="nx">distribution</span><span class="p">,</span> <span class="nx">then</span> <span class="nx">any</span> <span class="nx">Derivative</span> <span class="nx">Works</span> <span class="nx">that</span> <span class="nx">You</span> <span class="nx">distribute</span> <span class="nx">must</span>
-       <span class="nx">include</span> <span class="nx">a</span> <span class="nx">readable</span> <span class="nx">copy</span> <span class="nx">of</span> <span class="nx">the</span> <span class="nx">attribution</span> <span class="nx">notices</span> <span class="nx">contained</span>
-       <span class="nx">within</span> <span class="nx">such</span> <span class="nx">NOTICE</span> <span class="nx">file</span><span class="p">,</span> <span class="nx">excluding</span> <span class="nx">those</span> <span class="nx">notices</span> <span class="nx">that</span> <span class="k">do</span> <span class="nx">not</span>
-       <span class="nx">pertain</span> <span class="nx">to</span> <span class="nx">any</span> <span class="nx">part</span> <span class="nx">of</span> <span class="nx">the</span> <span class="nx">Derivative</span> <span class="nx">Works</span><span class="p">,</span> <span class="k">in</span> <span class="nx">at</span> <span class="nx">least</span> <span class="nx">one</span>
-       <span class="nx">of</span> <span class="nx">the</span> <span class="nx">following</span> <span class="nx">places</span><span class="o">:</span> <span class="nx">within</span> <span class="nx">a</span> <span class="nx">NOTICE</span> <span class="nx">text</span> <span class="nx">file</span> <span class="nx">distributed</span>
-       <span class="nx">as</span> <span class="nx">part</span> <span class="nx">of</span> <span class="nx">the</span> <span class="nx">Derivative</span> <span class="nx">Works</span><span class="p">;</span> <span class="nx">within</span> <span class="nx">the</span> <span class="nx">Source</span> <span class="nx">form</span> <span class="nx">or</span>
-       <span class="nx">documentation</span><span class="p">,</span> <span class="k">if</span> <span class="nx">provided</span> <span class="nx">along</span> <span class="kd">with</span> <span class="nx">the</span> <span class="nx">Derivative</span> <span class="nx">Works</span><span class="p">;</span> <span class="nx">or</span><span class="p">,</span>
-       <span class="nx">within</span> <span class="nx">a</span> <span class="nx">display</span> <span class="nx">generated</span> <span class="nx">by</span> <span class="nx">the</span> <span class="nx">Derivative</span> <span class="nx">Works</span><span class="p">,</span> <span class="k">if</span> <span class="nx">and</span>
-       <span class="nx">wherever</span> <span class="nx">such</span> <span class="nx">third</span><span class="o">-</span><span class="nx">party</span> <span class="nx">notices</span> <span class="nx">normally</span> <span class="nx">appear</span><span class="p">.</span> <span class="nx">The</span> <span class="nx">contents</span>
-       <span class="nx">of</span> <span class="nx">the</span> <span class="nx">NOTICE</span> <span class="nx">file</span> <span class="nx">are</span> <span class="k">for</span> <span class="nx">informational</span> <span class="nx">purposes</span> <span class="nx">only</span> <span class="nx">and</span>
-       <span class="k">do</span> <span class="nx">not</span> <span class="nx">modify</span> <span class="nx">the</span> <span class="nx">License</span><span class="p">.</span> <span class="nx">You</span> <span class="nx">may</span> <span class="nx">add</span> <span class="nx">Your</span> <span class="nx">own</span> <span class="nx">attribution</span>
-       <span class="nx">notices</span> <span class="nx">within</span> <span class="nx">Derivative</span> <span class="nx">Works</span> <span class="nx">that</span> <span class="nx">You</span> <span class="nx">distribute</span><span class="p">,</span> <span class="nx">alongside</span>
-       <span class="nx">or</span> <span class="nx">as</span> <span class="nx">an</span> <span class="nx">addendum</span> <span class="nx">to</span> <span class="nx">the</span> <span class="nx">NOTICE</span> <span class="nx">text</span> <span class="nx">from</span> <span class="nx">the</span> <span class="nx">Work</span><span class="p">,</span> <span class="nx">provided</span>
-       <span class="nx">that</span> <span class="nx">such</span> <span class="nx">additional</span> <span class="nx">attribution</span> <span class="nx">notices</span> <span class="nx">cannot</span> <span class="nx">be</span> <span class="nx">construed</span>
-       <span class="nx">as</span> <span class="nx">modifying</span> <span class="nx">the</span> <span class="nx">License</span><span class="p">.</span>
-
-   <span class="nx">You</span> <span class="nx">may</span> <span class="nx">add</span> <span class="nx">Your</span> <span class="nx">own</span> <span class="nx">copyright</span> <span class="nx">statement</span> <span class="nx">to</span> <span class="nx">Your</span> <span class="nx">modifications</span> <span class="nx">and</span>
-   <span class="nx">may</span> <span class="nx">provide</span> <span class="nx">additional</span> <span class="nx">or</span> <span class="nx">different</span> <span class="nx">license</span> <span class="nx">terms</span> <span class="nx">and</span> <span class="nx">conditions</span>
-   <span class="k">for</span> <span class="nx">use</span><span class="p">,</span> <span class="nx">reproduction</span><span class="p">,</span> <span class="nx">or</span> <span class="nx">distribution</span> <span class="nx">of</span> <span class="nx">Your</span> <span class="nx">modifications</span><span class="p">,</span> <span class="nx">or</span>
-   <span class="k">for</span> <span class="nx">any</span> <span class="nx">such</span> <span class="nx">Derivative</span> <span class="nx">Works</span> <span class="nx">as</span> <span class="nx">a</span> <span class="nx">whole</span><span class="p">,</span> <span class="nx">provided</span> <span class="nx">Your</span> <span class="nx">use</span><span class="p">,</span>
-   <span class="nx">reproduction</span><span class="p">,</span> <span class="nx">and</span> <span class="nx">distribution</span> <span class="nx">of</span> <span class="nx">the</span> <span class="nx">Work</span> <span class="nx">otherwise</span> <span class="nx">complies</span> <span class="kd">with</span>
-   <span class="nx">the</span> <span class="nx">conditions</span> <span class="nx">stated</span> <span class="k">in</span> <span class="k">this</span> <span class="nx">License</span><span class="p">.</span>
-
-<span class="mi">5</span><span class="p">.</span> <span class="nx">Submission</span> <span class="nx">of</span> <span class="nx">Contributions</span><span class="p">.</span> <span class="nx">Unless</span> <span class="nx">You</span> <span class="nx">explicitly</span> <span class="nx">state</span> <span class="nx">otherwise</span><span class="p">,</span>
-   <span class="nx">any</span> <span class="nx">Contribution</span> <span class="nx">intentionally</span> <span class="nx">submitted</span> <span class="k">for</span> <span class="nx">inclusion</span> <span class="k">in</span> <span class="nx">the</span> <span class="nx">Work</span>
-   <span class="nx">by</span> <span class="nx">You</span> <span class="nx">to</span> <span class="nx">the</span> <span class="nx">Licensor</span> <span class="nx">shall</span> <span class="nx">be</span> <span class="nx">under</span> <span class="nx">the</span> <span class="nx">terms</span> <span class="nx">and</span> <span class="nx">conditions</span> <span class="nx">of</span>
-   <span class="k">this</span> <span class="nx">License</span><span class="p">,</span> <span class="nx">without</span> <span class="nx">any</span> <span class="nx">additional</span> <span class="nx">terms</span> <span class="nx">or</span> <span class="nx">conditions</span><span class="p">.</span>
-   <span class="nx">Notwithstanding</span> <span class="nx">the</span> <span class="nx">above</span><span class="p">,</span> <span class="nx">nothing</span> <span class="nx">herein</span> <span class="nx">shall</span> <span class="nx">supersede</span> <span class="nx">or</span> <span class="nx">modify</span>
-   <span class="nx">the</span> <span class="nx">terms</span> <span class="nx">of</span> <span class="nx">any</span> <span class="nx">separate</span> <span class="nx">license</span> <span class="nx">agreement</span> <span class="nx">you</span> <span class="nx">may</span> <span class="nx">have</span> <span class="nx">executed</span>
-   <span class="kd">with</span> <span class="nx">Licensor</span> <span class="nx">regarding</span> <span class="nx">such</span> <span class="nx">Contributions</span><span class="p">.</span>
-
-<span class="mi">6</span><span class="p">.</span> <span class="nx">Trademarks</span><span class="p">.</span> <span class="nx">This</span> <span class="nx">License</span> <span class="nx">does</span> <span class="nx">not</span> <span class="nx">grant</span> <span class="nx">permission</span> <span class="nx">to</span> <span class="nx">use</span> <span class="nx">the</span> <span class="nx">trade</span>
-   <span class="nx">names</span><span class="p">,</span> <span class="nx">trademarks</span><span class="p">,</span> <span class="nx">service</span> <span class="nx">marks</span><span class="p">,</span> <span class="nx">or</span> <span class="nx">product</span> <span class="nx">names</span> <span class="nx">of</span> <span class="nx">the</span> <span class="nx">Licensor</span><span class="p">,</span>
-   <span class="nx">except</span> <span class="nx">as</span> <span class="nx">required</span> <span class="k">for</span> <span class="nx">reasonable</span> <span class="nx">and</span> <span class="nx">customary</span> <span class="nx">use</span> <span class="k">in</span> <span class="nx">describing</span> <span class="nx">the</span>
-   <span class="nx">origin</span> <span class="nx">of</span> <span class="nx">the</span> <span class="nx">Work</span> <span class="nx">and</span> <span class="nx">reproducing</span> <span class="nx">the</span> <span class="nx">content</span> <span class="nx">of</span> <span class="nx">the</span> <span class="nx">NOTICE</span> <span class="nx">file</span><span class="p">.</span>
-
-<span class="mi">7</span><span class="p">.</span> <span class="nx">Disclaimer</span> <span class="nx">of</span> <span class="nx">Warranty</span><span class="p">.</span> <span class="nx">Unless</span> <span class="nx">required</span> <span class="nx">by</span> <span class="nx">applicable</span> <span class="nx">law</span> <span class="nx">or</span>
-   <span class="nx">agreed</span> <span class="nx">to</span> <span class="k">in</span> <span class="nx">writing</span><span class="p">,</span> <span class="nx">Licensor</span> <span class="nx">provides</span> <span class="nx">the</span> <span class="nx">Work</span> <span class="p">(</span><span class="nx">and</span> <span class="nx">each</span>
-   <span class="nx">Contributor</span> <span class="nx">provides</span> <span class="nx">its</span> <span class="nx">Contributions</span><span class="p">)</span> <span class="nx">on</span> <span class="nx">an</span> <span class="s2">&quot;AS IS&quot;</span> <span class="nx">BASIS</span><span class="p">,</span>
-   <span class="nx">WITHOUT</span> <span class="nx">WARRANTIES</span> <span class="nx">OR</span> <span class="nx">CONDITIONS</span> <span class="nx">OF</span> <span class="nx">ANY</span> <span class="nx">KIND</span><span class="p">,</span> <span class="nx">either</span> <span class="nx">express</span> <span class="nx">or</span>
-   <span class="nx">implied</span><span class="p">,</span> <span class="nx">including</span><span class="p">,</span> <span class="nx">without</span> <span class="nx">limitation</span><span class="p">,</span> <span class="nx">any</span> <span class="nx">warranties</span> <span class="nx">or</span> <span class="nx">conditions</span>
-   <span class="nx">of</span> <span class="nx">TITLE</span><span class="p">,</span> <span class="nx">NON</span><span class="o">-</span><span class="nx">INFRINGEMENT</span><span class="p">,</span> <span class="nx">MERCHANTABILITY</span><span class="p">,</span> <span class="nx">or</span> <span class="nx">FITNESS</span> <span class="nx">FOR</span> <span class="nx">A</span>
-   <span class="nx">PARTICULAR</span> <span class="nx">PURPOSE</span><span class="p">.</span> <span class="nx">You</span> <span class="nx">are</span> <span class="nx">solely</span> <span class="nx">responsible</span> <span class="k">for</span> <span class="nx">determining</span> <span class="nx">the</span>
-   <span class="nx">appropriateness</span> <span class="nx">of</span> <span class="nx">using</span> <span class="nx">or</span> <span class="nx">redistributing</span> <span class="nx">the</span> <span class="nx">Work</span> <span class="nx">and</span> <span class="nx">assume</span> <span class="nx">any</span>
-   <span class="nx">risks</span> <span class="nx">associated</span> <span class="kd">with</span> <span class="nx">Your</span> <span class="nx">exercise</span> <span class="nx">of</span> <span class="nx">permissions</span> <span class="nx">under</span> <span class="k">this</span> <span class="nx">License</span><span class="p">.</span>
-
-<span class="mi">8</span><span class="p">.</span> <span class="nx">Limitation</span> <span class="nx">of</span> <span class="nx">Liability</span><span class="p">.</span> <span class="nx">In</span> <span class="nx">no</span> <span class="nx">event</span> <span class="nx">and</span> <span class="nx">under</span> <span class="nx">no</span> <span class="nx">legal</span> <span class="nx">theory</span><span class="p">,</span>
-   <span class="nx">whether</span> <span class="k">in</span> <span class="nx">tort</span> <span class="p">(</span><span class="nx">including</span> <span class="nx">negligence</span><span class="p">),</span> <span class="nx">contract</span><span class="p">,</span> <span class="nx">or</span> <span class="nx">otherwise</span><span class="p">,</span>
-   <span class="nx">unless</span> <span class="nx">required</span> <span class="nx">by</span> <span class="nx">applicable</span> <span class="nx">law</span> <span class="p">(</span><span class="nx">such</span> <span class="nx">as</span> <span class="nx">deliberate</span> <span class="nx">and</span> <span class="nx">grossly</span>
-   <span class="nx">negligent</span> <span class="nx">acts</span><span class="p">)</span> <span class="nx">or</span> <span class="nx">agreed</span> <span class="nx">to</span> <span class="k">in</span> <span class="nx">writing</span><span class="p">,</span> <span class="nx">shall</span> <span class="nx">any</span> <span class="nx">Contributor</span> <span class="nx">be</span>
-   <span class="nx">liable</span> <span class="nx">to</span> <span class="nx">You</span> <span class="k">for</span> <span class="nx">damages</span><span class="p">,</span> <span class="nx">including</span> <span class="nx">any</span> <span class="nx">direct</span><span class="p">,</span> <span class="nx">indirect</span><span class="p">,</span> <span class="nx">special</span><span class="p">,</span>
-   <span class="nx">incidental</span><span class="p">,</span> <span class="nx">or</span> <span class="nx">consequential</span> <span class="nx">damages</span> <span class="nx">of</span> <span class="nx">any</span> <span class="nx">character</span> <span class="nx">arising</span> <span class="nx">as</span> <span class="nx">a</span>
-   <span class="nx">result</span> <span class="nx">of</span> <span class="k">this</span> <span class="nx">License</span> <span class="nx">or</span> <span class="nx">out</span> <span class="nx">of</span> <span class="nx">the</span> <span class="nx">use</span> <span class="nx">or</span> <span class="nx">inability</span> <span class="nx">to</span> <span class="nx">use</span> <span class="nx">the</span>
-   <span class="nx">Work</span> <span class="p">(</span><span class="nx">including</span> <span class="nx">but</span> <span class="nx">not</span> <span class="nx">limited</span> <span class="nx">to</span> <span class="nx">damages</span> <span class="k">for</span> <span class="nx">loss</span> <span class="nx">of</span> <span class="nx">goodwill</span><span class="p">,</span>
-   <span class="nx">work</span> <span class="nx">stoppage</span><span class="p">,</span> <span class="nx">computer</span> <span class="nx">failure</span> <span class="nx">or</span> <span class="nx">malfunction</span><span class="p">,</span> <span class="nx">or</span> <span class="nx">any</span> <span class="nx">and</span> <span class="nx">all</span>
-   <span class="nx">other</span> <span class="nx">commercial</span> <span class="nx">damages</span> <span class="nx">or</span> <span class="nx">losses</span><span class="p">),</span> <span class="nx">even</span> <span class="k">if</span> <span class="nx">such</span> <span class="nx">Contributor</span>
-   <span class="nx">has</span> <span class="nx">been</span> <span class="nx">advised</span> <span class="nx">of</span> <span class="nx">the</span> <span class="nx">possibility</span> <span class="nx">of</span> <span class="nx">such</span> <span class="nx">damages</span><span class="p">.</span>
-
-<span class="mi">9</span><span class="p">.</span> <span class="nx">Accepting</span> <span class="nx">Warranty</span> <span class="nx">or</span> <span class="nx">Additional</span> <span class="nx">Liability</span><span class="p">.</span> <span class="nx">While</span> <span class="nx">redistributing</span>
-   <span class="nx">the</span> <span class="nx">Work</span> <span class="nx">or</span> <span class="nx">Derivative</span> <span class="nx">Works</span> <span class="nx">thereof</span><span class="p">,</span> <span class="nx">You</span> <span class="nx">may</span> <span class="nx">choose</span> <span class="nx">to</span> <span class="nx">offer</span><span class="p">,</span>
-   <span class="nx">and</span> <span class="nx">charge</span> <span class="nx">a</span> <span class="nx">fee</span> <span class="k">for</span><span class="p">,</span> <span class="nx">acceptance</span> <span class="nx">of</span> <span class="nx">support</span><span class="p">,</span> <span class="nx">warranty</span><span class="p">,</span> <span class="nx">indemnity</span><span class="p">,</span>
-   <span class="nx">or</span> <span class="nx">other</span> <span class="nx">liability</span> <span class="nx">obligations</span> <span class="nx">and</span><span class="o">/</span><span class="nx">or</span> <span class="nx">rights</span> <span class="nx">consistent</span> <span class="kd">with</span> <span class="k">this</span>
-   <span class="nx">License</span><span class="p">.</span> <span class="nx">However</span><span class="p">,</span> <span class="k">in</span> <span class="nx">accepting</span> <span class="nx">such</span> <span class="nx">obligations</span><span class="p">,</span> <span class="nx">You</span> <span class="nx">may</span> <span class="nx">act</span> <span class="nx">only</span>
-   <span class="nx">on</span> <span class="nx">Your</span> <span class="nx">own</span> <span class="nx">behalf</span> <span class="nx">and</span> <span class="nx">on</span> <span class="nx">Your</span> <span class="nx">sole</span> <span class="nx">responsibility</span><span class="p">,</span> <span class="nx">not</span> <span class="nx">on</span> <span class="nx">behalf</span>
-   <span class="nx">of</span> <span class="nx">any</span> <span class="nx">other</span> <span class="nx">Contributor</span><span class="p">,</span> <span class="nx">and</span> <span class="nx">only</span> <span class="k">if</span> <span class="nx">You</span> <span class="nx">agree</span> <span class="nx">to</span> <span class="nx">indemnify</span><span class="p">,</span>
-   <span class="nx">defend</span><span class="p">,</span> <span class="nx">and</span> <span class="nx">hold</span> <span class="nx">each</span> <span class="nx">Contributor</span> <span class="nx">harmless</span> <span class="k">for</span> <span class="nx">any</span> <span class="nx">liability</span>
-   <span class="nx">incurred</span> <span class="nx">by</span><span class="p">,</span> <span class="nx">or</span> <span class="nx">claims</span> <span class="nx">asserted</span> <span class="nx">against</span><span class="p">,</span> <span class="nx">such</span> <span class="nx">Contributor</span> <span class="nx">by</span> <span class="nx">reason</span>
-   <span class="nx">of</span> <span class="nx">your</span> <span class="nx">accepting</span> <span class="nx">any</span> <span class="nx">such</span> <span class="nx">warranty</span> <span class="nx">or</span> <span class="nx">additional</span> <span class="nx">liability</span><span class="p">.</span>
-
-<span class="nx">END</span> <span class="nx">OF</span> <span class="nx">TERMS</span> <span class="nx">AND</span> <span class="nx">CONDITIONS</span>
-
-<span class="nx">APPENDIX</span><span class="o">:</span> <span class="nx">How</span> <span class="nx">to</span> <span class="nx">apply</span> <span class="nx">the</span> <span class="nx">Apache</span> <span class="nx">License</span> <span class="nx">to</span> <span class="nx">your</span> <span class="nx">work</span><span class="p">.</span>
-
-   <span class="nx">To</span> <span class="nx">apply</span> <span class="nx">the</span> <span class="nx">Apache</span> <span class="nx">License</span> <span class="nx">to</span> <span class="nx">your</span> <span class="nx">work</span><span class="p">,</span> <span class="nx">attach</span> <span class="nx">the</span> <span class="nx">following</span>
-   <span class="nx">boilerplate</span> <span class="nx">notice</span><span class="p">,</span> <span class="kd">with</span> <span class="nx">the</span> <span class="nx">fields</span> <span class="nx">enclosed</span> <span class="nx">by</span> <span class="nx">brackets</span> <span class="s2">&quot;</span><span class="cp">[]</span><span class="s2">&quot;</span>
-   <span class="nx">replaced</span> <span class="kd">with</span> <span class="nx">your</span> <span class="nx">own</span> <span class="nx">identifying</span> <span class="nx">information</span><span class="p">.</span> <span class="p">(</span><span class="nx">Don</span><span class="err">&#39;</span><span class="nx">t</span> <span class="nx">include</span>
-   <span class="nx">the</span> <span class="nx">brackets</span><span class="o">!</span><span class="p">)</span>  <span class="nx">The</span> <span class="nx">text</span> <span class="nx">should</span> <span class="nx">be</span> <span class="nx">enclosed</span> <span class="k">in</span> <span class="nx">the</span> <span class="nx">appropriate</span>
-   <span class="nx">comment</span> <span class="nx">syntax</span> <span class="k">for</span> <span class="nx">the</span> <span class="nx">file</span> <span class="nx">format</span><span class="p">.</span> <span class="nx">We</span> <span class="nx">also</span> <span class="nx">recommend</span> <span class="nx">that</span> <span class="nx">a</span>
-   <span class="nx">file</span> <span class="nx">or</span> <span class="kr">class</span> <span class="nx">name</span> <span class="nx">and</span> <span class="nx">description</span> <span class="nx">of</span> <span class="nx">purpose</span> <span class="nx">be</span> <span class="nx">included</span> <span class="nx">on</span> <span class="nx">the</span>
-   <span class="nx">same</span> <span class="s2">&quot;printed page&quot;</span> <span class="nx">as</span> <span class="nx">the</span> <span class="nx">copyright</span> <span class="nx">notice</span> <span class="k">for</span> <span class="nx">easier</span>
-   <span class="nx">identification</span> <span class="nx">within</span> <span class="nx">third</span><span class="o">-</span><span class="nx">party</span> <span class="nx">archives</span><span class="p">.</span>
-
-<span class="nx">Copyright</span> <span class="cp">[</span><span class="nx">yyyy</span><span class="cp">]</span> <span class="cp">[</span><span class="nx">name</span> <span class="nx">of</span> <span class="nx">copyright</span> <span class="nx">owner</span><span class="cp">]</span>
-
-<span class="nx">Licensed</span> <span class="nx">under</span> <span class="nx">the</span> <span class="nx">Apache</span> <span class="nx">License</span><span class="p">,</span> <span class="nx">Version</span> <span class="mf">2.0</span> <span class="p">(</span><span class="nx">the</span> <span class="s2">&quot;License&quot;</span><span class="p">);</span>
-<span class="nx">you</span> <span class="nx">may</span> <span class="nx">not</span> <span class="nx">use</span> <span class="k">this</span> <span class="nx">file</span> <span class="nx">except</span> <span class="k">in</span> <span class="nx">compliance</span> <span class="kd">with</span> <span class="nx">the</span> <span class="nx">License</span><span class="p">.</span>
-<span class="nx">You</span> <span class="nx">may</span> <span class="nx">obtain</span> <span class="nx">a</span> <span class="nx">copy</span> <span class="nx">of</span> <span class="nx">the</span> <span class="nx">License</span> <span class="nx">at</span>
-
-    <span class="nx">http</span><span class="o">:</span><span class="c1">//www.apache.org/licenses/LICENSE-2.0</span>
-
-<span class="nx">Unless</span> <span class="nx">required</span> <span class="nx">by</span> <span class="nx">applicable</span> <span class="nx">law</span> <span class="nx">or</span> <span class="nx">agreed</span> <span class="nx">to</span> <span class="k">in</span> <span class="nx">writing</span><span class="p">,</span> <span class="nx">software</span>
-<span class="nx">distributed</span> <span class="nx">under</span> <span class="nx">the</span> <span class="nx">License</span> <span class="nx">is</span> <span class="nx">distributed</span> <span class="nx">on</span> <span class="nx">an</span> <span class="s2">&quot;AS IS&quot;</span> <span class="nx">BASIS</span><span class="p">,</span>
-<span class="nx">WITHOUT</span> <span class="nx">WARRANTIES</span> <span class="nx">OR</span> <span class="nx">CONDITIONS</span> <span class="nx">OF</span> <span class="nx">ANY</span> <span class="nx">KIND</span><span class="p">,</span> <span class="nx">either</span> <span class="nx">express</span> <span class="nx">or</span> <span class="nx">implied</span><span class="p">.</span>
-<span class="nx">See</span> <span class="nx">the</span> <span class="nx">License</span> <span class="k">for</span> <span class="nx">the</span> <span class="nx">specific</span> <span class="nx">language</span> <span class="nx">governing</span> <span class="nx">permissions</span> <span class="nx">and</span>
-<span class="nx">limitations</span> <span class="nx">under</span> <span class="nx">the</span> <span class="nx">License</span><span class="p">.</span>
+<div class="codehilite"><pre>                             Apache License
+                       Version 2.0, January 2004
+                    http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   &quot;License&quot; shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   &quot;Licensor&quot; shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   &quot;Legal Entity&quot; 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,
+   &quot;control&quot; 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.
+
+   &quot;You&quot; (or &quot;Your&quot;) shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   &quot;Source&quot; form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   &quot;Object&quot; 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.
+
+   &quot;Work&quot; 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).
+
+   &quot;Derivative Works&quot; 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.
+
+   &quot;Contribution&quot; 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, &quot;submitted&quot;
+   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 &quot;Not a Contribution.&quot;
+
+   &quot;Contributor&quot; 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.
+
+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,
+   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.
+
+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:
+
+   (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 &quot;NOTICE&quot; 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.
+
+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.
+
+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 &quot;AS IS&quot; 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.
+
+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
+   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.
+
+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
+   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.
+
+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 &quot;[]&quot;
+   replaced with your own identifying information. (Don&#39;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 &quot;printed page&quot; as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
+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 &quot;AS IS&quot; 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></div></div>
         <hr/>
         <div id="copyright">

Modified: velocity/site/production/engine/devel/source-repository.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/devel/source-repository.html?rev=1760548&r1=1760547&r2=1760548&view=diff
==============================================================================
--- velocity/site/production/engine/devel/source-repository.html (original)
+++ velocity/site/production/engine/devel/source-repository.html Tue Sep 13 13:55:58 2016
@@ -227,27 +227,28 @@ h2:hover > .headerlink, h3:hover > .head
 <p>This project uses <a href="http://subversion.tigris.org">Subversion</a> to manage its source code. Instructions on Subversion use can be found at <a href="http://svnbook.red-bean.com/">http://svnbook.red-bean.com/</a>.</p>
 <h2 id="web-access">Web Access<a class="headerlink" href="#web-access" title="Permanent link">&para;</a></h2>
 <p>The following is a link to the online source repository.</p>
-<p class="frame"><a href="http://svn.apache.org/viewvc/velocity/engine/trunk">http://svn.apache.org/viewvc/velocity/engine/trunk</a></p>
+<p class="frame"><a href="http://svn.apache.org/viewvc/velocity/engine/trunk">http://svn.apache.org/viewvc/velocity/engine/trunk</a>
+</p>
 <h2 id="anonymous-access">Anonymous access<a class="headerlink" href="#anonymous-access" title="Permanent link">&para;</a></h2>
 <p>The source can be checked out anonymously from SVN with this command:</p>
-<div class="codehilite"><pre><span class="nv">$ </span>svn checkout http://svn.apache.org/repos/asf/velocity/engine/trunk velocity
+<div class="codehilite"><pre>$ svn checkout http://svn.apache.org/repos/asf/velocity/engine/trunk velocity
 </pre></div>
 
 
 <h2 id="developer-access">Developer access<a class="headerlink" href="#developer-access" title="Permanent link">&para;</a></h2>
 <p>Everyone can access the Subversion repository via HTTP, but Committers must checkout the Subversion repository via HTTPS.</p>
-<div class="codehilite"><pre><span class="nv">$ </span>svn checkout https://svn.apache.org/repos/asf/velocity/engine/trunk velocity
+<div class="codehilite"><pre>$ svn checkout https://svn.apache.org/repos/asf/velocity/engine/trunk velocity
 </pre></div>
 
 
 <p>To commit changes to the repository, execute the following command to commit your changes (svn will prompt you for your password)</p>
-<div class="codehilite"><pre><span class="nv">$ </span>svn commit --username your-username -m <span class="s2">&quot;A message&quot;</span>
+<div class="codehilite"><pre>$ svn commit --username your-username -m <span class="s2">&quot;A message&quot;</span>
 </pre></div>
 
 
 <h2 id="access-from-behind-a-firewall">Access from behind a firewall<a class="headerlink" href="#access-from-behind-a-firewall" title="Permanent link">&para;</a></h2>
 <p>For those users who are stuck behind a corporate firewall which is blocking HTTP access to the Subversion repository, you can try to access it via the developer connection:</p>
-<div class="codehilite"><pre><span class="nv">$ </span>svn checkout https://svn.apache.org/repos/asf/velocity/engine/trunk velocity
+<div class="codehilite"><pre>$ svn checkout https://svn.apache.org/repos/asf/velocity/engine/trunk velocity
 </pre></div>
 
 

Modified: velocity/site/production/engine/devel/user-guide.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/devel/user-guide.html?rev=1760548&r1=1760547&r2=1760548&view=diff
==============================================================================
--- velocity/site/production/engine/devel/user-guide.html (original)
+++ velocity/site/production/engine/devel/user-guide.html Tue Sep 13 13:55:58 2016
@@ -1082,6 +1082,7 @@ directive.foreach.maxloops = -1
 <p><code>velocimacro.permissions.allow.inline.to.replace.global</code> - With possible values of true or false, this property allows the user to specify if a  Velocimacro defined inline in a template can replace a globally defined template, one that was loaded on startup via the <code>velocimacro.library</code> property. The default, <code>false</code>, prevents Velocimacros defined inline in a template from replacing those defined in the template libraries loaded at startup.</p>
 <p><code>velocimacro.permissions.allow.inline.local.scope</code> - This property, with possible values of true or false, defaulting to false, controls if Velocimacros defined inline are 'visible' only to the defining template.  In other words, with this property set to true, a template can define inline VMs that are usable only by the defining template.  You can use this for fancy VM tricks - if a global VM calls another global VM, with inline scope, a template can define a private implementation of the second VM that will be called by the first VM when invoked by that template.  All other templates are unaffected.</p>
 <p><code>velocimacro.library.autoreload</code> - This property controls Velocimacro library autoloading. The default value is <code>false</code>.  When set to <code>true</code> the source Velocimacro library for an invoked Velocimacro will be checked for changes, and reloaded if necessary.  This allows you to change and test Velocimacro libraries without having to restart your application or servlet container, just like you can with regular templates. This mode only works when caching is <i>off</i> in the resource loaders (e.g. <code>file.resource.loader.cache = false</code> ). This feature is intended for development, not for production.</p>
+<p>Please note than when two templates each define a macro with the same name, you either need <code>velocimacro.permissions.allow.inline.local.scope</code> or <code>velocimacro.permissions.allow.inline.to.replace.global</code> to be set to true for each template to use its own macro version.</p>
 <h2 id="getting-literal">Getting Literal<a class="headerlink" href="#getting-literal" title="Permanent link">&para;</a></h2>
 <p>VTL uses special characters, such as <em>$</em> and <em>#</em>, to do its work, so some added care should be taken where using these characters in your templates. This section deals with escaping these characters.</p>
 <h3 id="currency">Currency<a class="headerlink" href="#currency" title="Permanent link">&para;</a></h3>
@@ -1243,7 +1244,7 @@ directive.foreach.maxloops = -1
 </pre></div>
 
 
-<p>Velocity's behaviour is to gobble up excess whitespace. The preceding directive can be written as:</p>
+<p>Velocity's default behaviour is to gobble up excess whitespace. The preceding directive can be written as:</p>
 <div class="codehilite"><pre><span class="x">Send me</span>
 <span class="cp">#</span><span class="nf">set</span><span class="p">(</span> <span class="p">$</span><span class="nv">foo</span> <span class="o">=</span> <span class="o">[</span><span class="s2">&quot;$10 and &quot;</span><span class="p">,</span><span class="s2">&quot;a pie&quot;</span><span class="p">]</span> <span class="p">)</span><span class="x"></span>
 <span class="cp">#</span><span class="nf">foreach</span><span class="p">(</span> <span class="p">$</span><span class="nv">a</span> <span class="o">in</span> <span class="p">$</span><span class="nv">foo</span> <span class="p">)</span><span class="x"></span>
@@ -1261,7 +1262,7 @@ directive.foreach.maxloops = -1
 </pre></div>
 
 
-<p>In each case the output will be the same.</p>
+<p>In each case the output will be the same. Please note that it's possible to configure Velocity with other space gobbling behaviors.</p>
 <h2 id="other-features-and-miscellany">Other Features and Miscellany<a class="headerlink" href="#other-features-and-miscellany" title="Permanent link">&para;</a></h2>
 <h3 id="math">Math<a class="headerlink" href="#math" title="Permanent link">&para;</a></h3>
 <p>Velocity has a handful of built-in mathematical functions that can be used in templates with the <em>set</em> directive. The following equations are examples of addition, subtraction, multiplication and division, respectively:</p>

Modified: velocity/site/production/engine/index.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/index.html?rev=1760548&r1=1760547&r2=1760548&view=diff
==============================================================================
--- velocity/site/production/engine/index.html (original)
+++ velocity/site/production/engine/index.html Tue Sep 13 13:55:58 2016
@@ -183,6 +183,7 @@ h2:hover > .headerlink, h3:hover > .head
 </ul>
 <h2 id="developer-resources">Developer Resources<a class="headerlink" href="#developer-resources" title="Permanent link">&para;</a></h2>
 <ul>
+<li><a href="https://issues.apache.org/jira/secure/BrowseProjects.jspa#10200">Issues</a></li>
 <li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding standards</a></li>
 <li><a href="/how-it-works.html#Project%20Guidelines">Project guidelines</a></li>
 <li><a href="/site-building.html">Site building</a></li>

Modified: velocity/site/production/get-involved.html
URL: http://svn.apache.org/viewvc/velocity/site/production/get-involved.html?rev=1760548&r1=1760547&r2=1760548&view=diff
==============================================================================
--- velocity/site/production/get-involved.html (original)
+++ velocity/site/production/get-involved.html Tue Sep 13 13:55:58 2016
@@ -181,6 +181,7 @@ h2:hover > .headerlink, h3:hover > .head
 </ul>
 <h2 id="developer-resources">Developer Resources<a class="headerlink" href="#developer-resources" title="Permanent link">&para;</a></h2>
 <ul>
+<li><a href="https://issues.apache.org/jira/secure/BrowseProjects.jspa#10200">Issues</a></li>
 <li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding standards</a></li>
 <li><a href="/how-it-works.html#Project%20Guidelines">Project guidelines</a></li>
 <li><a href="/site-building.html">Site building</a></li>

Modified: velocity/site/production/how-it-works.html
URL: http://svn.apache.org/viewvc/velocity/site/production/how-it-works.html?rev=1760548&r1=1760547&r2=1760548&view=diff
==============================================================================
--- velocity/site/production/how-it-works.html (original)
+++ velocity/site/production/how-it-works.html Tue Sep 13 13:55:58 2016
@@ -181,6 +181,7 @@ h2:hover > .headerlink, h3:hover > .head
 </ul>
 <h2 id="developer-resources">Developer Resources<a class="headerlink" href="#developer-resources" title="Permanent link">&para;</a></h2>
 <ul>
+<li><a href="https://issues.apache.org/jira/secure/BrowseProjects.jspa#10200">Issues</a></li>
 <li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding standards</a></li>
 <li><a href="/how-it-works.html#Project%20Guidelines">Project guidelines</a></li>
 <li><a href="/site-building.html">Site building</a></li>

Modified: velocity/site/production/index.html
URL: http://svn.apache.org/viewvc/velocity/site/production/index.html?rev=1760548&r1=1760547&r2=1760548&view=diff
==============================================================================
--- velocity/site/production/index.html (original)
+++ velocity/site/production/index.html Tue Sep 13 13:55:58 2016
@@ -181,6 +181,7 @@ h2:hover > .headerlink, h3:hover > .head
 </ul>
 <h2 id="developer-resources">Developer Resources<a class="headerlink" href="#developer-resources" title="Permanent link">&para;</a></h2>
 <ul>
+<li><a href="https://issues.apache.org/jira/secure/BrowseProjects.jspa#10200">Issues</a></li>
 <li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding standards</a></li>
 <li><a href="/how-it-works.html#Project%20Guidelines">Project guidelines</a></li>
 <li><a href="/site-building.html">Site building</a></li>
@@ -242,13 +243,16 @@ h2:hover > .headerlink, h3:hover > .head
   </li>
 </ul>
 </p>
-<p class="right"><a href="/news.html">See all news...</a></p>
+<p class="right"><a href="/news.html">See all news...</a>
+</p>
 <h2 id="apache-software-foundation">Apache Software Foundation<a class="headerlink" href="#apache-software-foundation" title="Permanent link">&para;</a></h2>
 <p>The Apache Software Foundation provides support for the Apache community of open-source software projects. The <a href="http://projects.apache.org">Apache projects</a> are characterized by a collaborative, consensus based development process, an open and pragmatic software license, and a desire to create high quality software that leads the way in its field.</p>
 <h2 id="apache-velocity-projects">Apache Velocity Projects<a class="headerlink" href="#apache-velocity-projects" title="Permanent link">&para;</a></h2>
 <p>Apache Velocity offers the following projects:</p>
-<p class="frame"><a href="/engine/index.html">Velocity Engine</a> &dash; This is the actual templating engine which does all the work. If you came here because you heard about Velocity somewhere on the web, this is probably the right place to start.</p>
-<p class="frame"><a href="/tools/index.html">Velocity Tools</a> &dash; This project contains tools and other useful infrastructure to build web and non-web application using the Velocity engine. You will find e.g. code for <a href="http://struts.apache.org">Struts</a> integration or the standalone VelocityViewServlet here.</p>
+<p class="frame"><a href="/engine/index.html">Velocity Engine</a> &dash; This is the actual templating engine which does all the work. If you came here because you heard about Velocity somewhere on the web, this is probably the right place to start.
+</p>
+<p class="frame"><a href="/tools/index.html">Velocity Tools</a> &dash; This project contains tools and other useful infrastructure to build web and non-web application using the Velocity engine. You will find e.g. code for <a href="http://struts.apache.org">Struts</a> integration or the standalone VelocityViewServlet here.
+</p>
 <h2 id="release-status">Release Status<a class="headerlink" href="#release-status" title="Permanent link">&para;</a></h2>
 <table class="table">
 <thead>

Modified: velocity/site/production/left.nav
URL: http://svn.apache.org/viewvc/velocity/site/production/left.nav?rev=1760548&r1=1760547&r2=1760548&view=diff
==============================================================================
--- velocity/site/production/left.nav (original)
+++ velocity/site/production/left.nav Tue Sep 13 13:55:58 2016
@@ -16,6 +16,7 @@
 * [How it works](/how-it-works.html)
 * [Board Reports](https://whimsy.apache.org/board/minutes/Velocity.html)
 ## Developer Resources
+* [Issues](https://issues.apache.org/jira/secure/BrowseProjects.jspa#10200)
 * [Coding standards](http://wiki.apache.org/velocity/CodeStandards)
 * [Project guidelines](/how-it-works.html#Project%20Guidelines)
 * [Site building](/site-building.html)

Modified: velocity/site/production/news.html
URL: http://svn.apache.org/viewvc/velocity/site/production/news.html?rev=1760548&r1=1760547&r2=1760548&view=diff
==============================================================================
--- velocity/site/production/news.html (original)
+++ velocity/site/production/news.html Tue Sep 13 13:55:58 2016
@@ -181,6 +181,7 @@ h2:hover > .headerlink, h3:hover > .head
 </ul>
 <h2 id="developer-resources">Developer Resources<a class="headerlink" href="#developer-resources" title="Permanent link">&para;</a></h2>
 <ul>
+<li><a href="https://issues.apache.org/jira/secure/BrowseProjects.jspa#10200">Issues</a></li>
 <li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding standards</a></li>
 <li><a href="/how-it-works.html#Project%20Guidelines">Project guidelines</a></li>
 <li><a href="/site-building.html">Site building</a></li>

Modified: velocity/site/production/release-process.html
URL: http://svn.apache.org/viewvc/velocity/site/production/release-process.html?rev=1760548&r1=1760547&r2=1760548&view=diff
==============================================================================
--- velocity/site/production/release-process.html (original)
+++ velocity/site/production/release-process.html Tue Sep 13 13:55:58 2016
@@ -181,6 +181,7 @@ h2:hover > .headerlink, h3:hover > .head
 </ul>
 <h2 id="developer-resources">Developer Resources<a class="headerlink" href="#developer-resources" title="Permanent link">&para;</a></h2>
 <ul>
+<li><a href="https://issues.apache.org/jira/secure/BrowseProjects.jspa#10200">Issues</a></li>
 <li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding standards</a></li>
 <li><a href="/how-it-works.html#Project%20Guidelines">Project guidelines</a></li>
 <li><a href="/site-building.html">Site building</a></li>
@@ -371,12 +372,12 @@ you are preparing the release and type:<
 4
 5
 6
-7</pre></div></td><td class="code"><div class="codehilite"><pre><span class="c">#!/bin/sh</span>
+7</pre></div></td><td class="code"><div class="codehilite"><pre><span class="ch">#!/bin/sh</span>
 
 <span class="k">for</span> fileitem in *
 <span class="k">do</span>
-  openssl md5 &lt; <span class="nv">$fileitem</span> &gt; <span class="nv">$fileitem</span>.md5
-  openssl sha1 &lt; <span class="nv">$fileitem</span> &gt; <span class="nv">$fileitem</span>.sha1
+  openssl md5 &lt; <span class="nv">$f</span>ileitem &gt; <span class="nv">$f</span>ileitem.md5
+  openssl sha1 &lt; <span class="nv">$f</span>ileitem &gt; <span class="nv">$f</span>ileitem.sha1
 <span class="k">done</span>
 </pre></div>
 </td></tr></table>

Modified: velocity/site/production/site-building.html
URL: http://svn.apache.org/viewvc/velocity/site/production/site-building.html?rev=1760548&r1=1760547&r2=1760548&view=diff
==============================================================================
--- velocity/site/production/site-building.html (original)
+++ velocity/site/production/site-building.html Tue Sep 13 13:55:58 2016
@@ -181,6 +181,7 @@ h2:hover > .headerlink, h3:hover > .head
 </ul>
 <h2 id="developer-resources">Developer Resources<a class="headerlink" href="#developer-resources" title="Permanent link">&para;</a></h2>
 <ul>
+<li><a href="https://issues.apache.org/jira/secure/BrowseProjects.jspa#10200">Issues</a></li>
 <li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding standards</a></li>
 <li><a href="/how-it-works.html#Project%20Guidelines">Project guidelines</a></li>
 <li><a href="/site-building.html">Site building</a></li>
@@ -266,24 +267,24 @@ h2:hover > .headerlink, h3:hover > .head
 15
 16
 17
-18</pre></div></td><td class="code"><div class="codehilite"><pre><span class="c">#!/bin/bash</span>
+18</pre></div></td><td class="code"><div class="codehilite"><pre><span class="ch">#!/bin/bash</span>
 
-<span class="nb">export </span><span class="nv">MARKDOWN_SOCKET</span><span class="o">=</span>/tmp/markdown
+<span class="nb">export</span> <span class="nv">MARKDOWN_SOCKET</span><span class="o">=</span>/tmp/markdown
 <span class="nv">CMS</span><span class="o">=</span>~/projects/velocity/apache_cms
 <span class="nv">VELOCITY</span><span class="o">=</span>~/projects/velocity
 
 <span class="k">if</span> <span class="o">[[</span> <span class="sb">`</span>pidof markdownd.py<span class="sb">`</span> <span class="o">==</span> <span class="s2">&quot;&quot;</span> <span class="o">]]</span><span class="p">;</span> <span class="k">then</span>
-   <span class="nv">$CMS</span>/build/markdownd.py
+   <span class="nv">$C</span>MS/build/markdownd.py
 <span class="k">fi</span>
 
-find <span class="nv">$VELOCITY</span>/site/cms/trunk/ -name <span class="s2">&quot;*~&quot;</span> <span class="p">|</span> xargs rm -v
-rm -rf <span class="nv">$VELOCITY</span>/site/target
+find $VELOCITY/site/cms/trunk/ -name <span class="s2">&quot;*~&quot;</span> <span class="p">|</span> xargs rm -v
+rm -rf $VELOCITY/site/target
 
-<span class="nv">$CMS</span>/build/build_site.pl --source-base <span class="nv">$VELOCITY</span>/site/cms/trunk --target-base <span class="nv">$VELOCITY</span>/site/target
-cp -r <span class="nv">$VELOCITY</span>/site/target/content/* <span class="nv">$VELOCITY</span>/site/production/
-cp <span class="nv">$VELOCITY</span>/site/target/content/.htaccess <span class="nv">$VELOCITY</span>/site/production/
+<span class="nv">$C</span>MS/build/build_site.pl --source-base $VELOCITY/site/cms/trunk --target-base $VELOCITY/site/target
+cp -r $VELOCITY/site/target/content/* $VELOCITY/site/production/
+cp $VELOCITY/site/target/content/.htaccess $VELOCITY/site/production/
 
-svn status <span class="nv">$VELOCITY</span>/site/production/
+svn status $VELOCITY/site/production/
 </pre></div>
 </td></tr></table>
 

Modified: velocity/site/production/texen/index.html
URL: http://svn.apache.org/viewvc/velocity/site/production/texen/index.html?rev=1760548&r1=1760547&r2=1760548&view=diff
==============================================================================
--- velocity/site/production/texen/index.html (original)
+++ velocity/site/production/texen/index.html Tue Sep 13 13:55:58 2016
@@ -181,6 +181,7 @@ h2:hover > .headerlink, h3:hover > .head
 </ul>
 <h2 id="developer-resources">Developer Resources<a class="headerlink" href="#developer-resources" title="Permanent link">&para;</a></h2>
 <ul>
+<li><a href="https://issues.apache.org/jira/secure/BrowseProjects.jspa#10200">Issues</a></li>
 <li><a href="http://wiki.apache.org/velocity/CodeStandards">Coding standards</a></li>
 <li><a href="/how-it-works.html#Project%20Guidelines">Project guidelines</a></li>
 <li><a href="/site-building.html">Site building</a></li>




Mime
View raw message