Modified: websites/staging/sling/trunk/content/project-information.html
==============================================================================
--- websites/staging/sling/trunk/content/project-information.html (original)
+++ websites/staging/sling/trunk/content/project-information.html Tue May 22
08:25:32 2012
@@ -82,108 +82,64 @@
<a href="/">Home</a>
</div>
<h1>Project Information</h1>
- <p><a name="ProjectInformation-Slingprojectinformation"></a></p>
-<h1 id="sling-project-information">Sling project information</h1>
-<p>This document provides an overview of the various documents and links that
-are part of this project's general information:</p>
+ <h1 id="sling-project-information">Sling project information</h1>
+<p>This document provides an overview of the various documents and links that
are part of this project's general information:</p>
<ul>
-<li><a href="apache-sling-community-roles-and-processes.html">Community Roles
and Processes</a></li>
-<li><a href="project-team.html">Project Team</a></li>
-<li><a href="#lists.html">Mailing Lists</a></li>
-<li><a href="#issues.html">Issue Tracking</a></li>
-<li><a href="#source.html">Source Repository</a></li>
-<li><a href="#ci.html">Continuous Integration</a></li>
-<li><a href="project-license.html">Project License</a></li>
+<li><a href="/apache-sling-community-roles-and-processes.html">Community Roles
and Processes</a></li>
+<li><a href="/project-team.html">Project Team</a></li>
+<li><a href="">Mailing Lists</a></li>
+<li><a href="">Issue Tracking</a></li>
+<li><a href="">Source Repository</a></li>
+<li><a href="">Continuous Integration</a></li>
+<li><a href="/project-license.html">Project License</a></li>
</ul>
-<p>{anchor:lists}
-<a name="ProjectInformation-MailingLists"></a></p>
+<p>{anchor:lists}</p>
<h2 id="mailing-lists">Mailing Lists</h2>
-<p>These are the mailing lists that have been established for this project.
-For each list, there is a subscribe, unsubscribe, and an archive link.
-<table>
-<tr><th> Name </th><th> Subscribe </th><th> Unsubscribe </th><th> Post
</th><th> Archive </th><th> Other Archives </th></tr>
-<tr><td> Sling Users List </td><td> <a
href="mailto:users-subscr...@sling.apache.org.html";>Subscribe</a>
- </td><td> [Unsubscribe</td><td>mailto:users-unsubscr...@sling.apache.org]
- </td><td> users at sling.apache.org </td><td>
[mail-archives.apache.org</td><td>http://mail-archives.apache.org/mod_mbox/sling-users/]
- </td><td>
[www.mail-archive.com</td><td>http://www.mail-archive.com/users@sling.apache.org/]
- [MarkMail</td><td>http://sling.markmail.org]
- [Nabble</td><td>http://n3.nabble.com/Sling-Users-f73968.html]
- </td></tr>
-<tr><td> Sling Developers List </td><td> <a
href="mailto:dev-subscr...@sling.apache.org.html";>Subscribe</a>
- </td><td> [Unsubscribe</td><td>mailto:dev-unsubscr...@sling.apache.org]
- </td><td> dev at sling.apache.org </td><td>
[mail-archives.apache.org</td><td>http://mail-archives.apache.org/mod_mbox/sling-dev/]
- </td><td>
[www.mail-archive.com</td><td>http://www.mail-archive.com/dev@sling.apache.org/]
- [MarkMail</td><td>http://sling.markmail.org]
- [Nabble</td><td>http://n3.nabble.com/Sling-Dev-f73966.html]
- </td></tr>
-<tr><td> Sling Source Control List </td><td> <a
href="mailto:commits-subscr...@sling.apache.org.html";>Subscribe</a>
- </td><td> [Unsubscribe</td><td>mailto:commits-unsubscr...@sling.apache.org]
- </td><td> </td><td>
[mail-archives.apache.org</td><td>http://mail-archives.apache.org/mod_mbox/incubator-sling-commits/]
- </td><td>
[www.mail-archive.com</td><td>http://www.mail-archive.com/commits@sling.apache.org/]
- [MarkMail</td><td>http://sling.markmail.org]
- </td></tr>
-</table></p>
-<p>{anchor:issues}
-<a name="ProjectInformation-IssueTracking"></a></p>
+<p>These are the mailing lists that have been established for this project.
For each list, there is a subscribe, unsubscribe, and an archive link.
+| Name | Subscribe | Unsubscribe | Post | Archive | Other Archives |
+|--|--|--|--|--|--|
+| Sling Users List | <a href="">Subscribe</a> |
[Unsubscribe|mailto:users-unsubscr...@sling.apache.org] | users at
sling.apache.org |
[mail-archives.apache.org|http://mail-archives.apache.org/mod_mbox/sling-users/]
| [www.mail-archive.com|http://www.mail-archive.com/users@sling.apache.org/]
[MarkMail|http://sling.markmail.org]
[Nabble|http://n3.nabble.com/Sling-Users-f73968.html] |
+| Sling Developers List | <a href="">Subscribe</a> |
[Unsubscribe|mailto:dev-unsubscr...@sling.apache.org] | dev at sling.apache.org
|
[mail-archives.apache.org|http://mail-archives.apache.org/mod_mbox/sling-dev/]
| [www.mail-archive.com|http://www.mail-archive.com/dev@sling.apache.org/]
[MarkMail|http://sling.markmail.org]
[Nabble|http://n3.nabble.com/Sling-Dev-f73966.html] |
+| Sling Source Control List | <a href="">Subscribe</a> |
[Unsubscribe|mailto:commits-unsubscr...@sling.apache.org] | |
[mail-archives.apache.org|http://mail-archives.apache.org/mod_mbox/incubator-sling-commits/]
| [www.mail-archive.com|http://www.mail-archive.com/commits@sling.apache.org/]
[MarkMail|http://sling.markmail.org] |</p>
+<p>{anchor:issues}</p>
<h2 id="issue-tracking">Issue Tracking</h2>
-<p>This project uses JIRA a J2EE-based, issue tracking and project management
-application. Issues, bugs, and feature requests should be submitted to the
-following issue tracking system for this project.</p>
-<p>The issue tracker can be found at <a
href="http://issues.apache.org/jira/browse/SLING";>http://issues.apache.org/jira/browse/SLING</a></p>
-<p>{anchor:source}
-<a name="ProjectInformation-SourceRepository"></a></p>
+<p>This project uses JIRA a J2EE-based, issue tracking and project management
application. Issues, bugs, and feature requests should be submitted to the
following issue tracking system for this project.</p>
+<p>The issue tracker can be found at <a
href="">http://issues.apache.org/jira/browse/SLING</a></p>
+<p>{anchor:source}</p>
<h2 id="source-repository">Source Repository</h2>
-<p>This project uses Subversion 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>
-<p><a name="ProjectInformation-WebAccess"></a></p>
+<p>This project uses Subversion to manage its source code. Instructions on
Subversion use can be found at <a href="">http://svnbook.red-bean.com/</a>.</p>
<h3 id="web-access">Web Access</h3>
<p>The following is a link to the online source repository.</p>
<div class="codehilite"><pre><span class="n">http:</span><span
class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span
class="n">apache</span><span class="o">.</span><span class="n">org</span><span
class="sr">/viewvc/s</span><span class="n">ling</span><span
class="o">/</span><span class="n">trunk</span>
</pre></div>
-<p><a name="ProjectInformation-Anonymousaccess"></a></p>
<h3 id="anonymous-access">Anonymous access</h3>
<p>The source can be checked out anonymously from SVN with this command:</p>
<div class="codehilite"><pre><span class="nv">$</span> <span
class="nv">svn</span> <span class="n">checkout</span> <span
class="n">http:</span><span class="sr">//s</span><span class="n">vn</span><span
class="o">.</span><span class="n">apache</span><span class="o">.</span><span
class="n">org</span><span class="sr">/repos/</span><span
class="n">asf</span><span class="sr">/sling/</span><span class="n">trunk</span>
<span class="n">sling</span>
</pre></div>
-<p><a name="ProjectInformation-Developeraccess"></a></p>
<h3 id="developer-access">Developer access</h3>
-<p>Everyone can access the Subversion repository via HTTPS, but Committers
-must checkout the Subversion repository via HTTPS.</p>
+<p>Everyone can access the Subversion repository via HTTPS, but Committers
must checkout the Subversion repository via HTTPS.</p>
<div class="codehilite"><pre><span class="nv">$</span> <span
class="nv">svn</span> <span class="n">checkout</span> <span
class="n">https:</span><span class="sr">//s</span><span
class="n">vn</span><span class="o">.</span><span class="n">apache</span><span
class="o">.</span><span class="n">org</span><span
class="sr">/repos/</span><span class="n">asf</span><span
class="sr">/sling/</span><span class="n">trunk</span> <span
class="n">sling</span>
</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>
+<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> <span
class="nv">svn</span> <span class="n">commit</span> <span
class="o">--</span><span class="n">username</span> <span
class="n">your</span><span class="o">-</span><span class="n">username</span>
<span class="o">-</span><span class="n">m</span> <span class="s">"A
message"</span>
</pre></div>
-<p><a name="ProjectInformation-Accessfrombehindafirewall"></a></p>
<h3 id="access-from-behind-a-firewall">Access from behind a firewall</h3>
-<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>
+<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> <span
class="nv">svn</span> <span class="n">checkout</span> <span
class="n">https:</span><span class="sr">//s</span><span
class="n">vn</span><span class="o">.</span><span class="n">apache</span><span
class="o">.</span><span class="n">org</span><span
class="sr">/repos/</span><span class="n">asf</span><span
class="sr">/sling/</span><span class="n">trunk</span> <span
class="n">sling</span>
</pre></div>
-<p><a name="ProjectInformation-Accessthroughaproxy"></a></p>
<h3 id="access-through-a-proxy">Access through a proxy</h3>
-<p>The Subversion client can go through a proxy, if you configure it to do so.
-First, edit your "servers" configuration file to indicate which proxy to
-use. The files location depends on your operating system. On Linux or Unix
-it is located in the directory "~/.subversion". On Windows it is in
-"%APPDATA%\Subversion". (Try "echo %APPDATA%", note this is a hidden
-directory.)</p>
-<p>There are comments in the file explaining what to do. If you don't have
-that file, get the latest Subversion client and run any command; this will
-cause the configuration directory and template files to be created.</p>
+<p>The Subversion client can go through a proxy, if you configure it to do so.
First, edit your "servers" configuration file to indicate which proxy to use.
The files location depends on your operating system. On Linux or Unix it is
located in the directory "~/.subversion". On Windows it is in
"%APPDATA%\Subversion". (Try "echo %APPDATA%", note this is a hidden
directory.)</p>
+<p>There are comments in the file explaining what to do. If you don't have
that file, get the latest Subversion client and run any command; this will
cause the configuration directory and template files to be created.</p>
<p>Example : Edit the 'servers' file and add something like :</p>
<div class="codehilite"><pre><span class="k">[global]</span>
<span class="na">http-proxy-host</span> <span class="o">=</span> <span
class="s">your.proxy.name</span>
@@ -191,15 +147,12 @@ cause the configuration directory and te
</pre></div>
-<p>{anchor:ci}
-<a name="ProjectInformation-ContinuousIntegration"></a></p>
+<p>{anchor:ci}</p>
<h2 id="continuous-integration">Continuous Integration</h2>
-<p>Sling builds run automatically on the ASF's <a
href="https://builds.apache.org/view/S-Z/view/Sling/";>Jenkins build server</a>
-, triggered by SVN changes and daily.</p>
-<p>See <a href="https://issues.apache.org/jira/browse/SLING-920";>SLING-920</a>
- for Hudson configuration information.</p>
+<p>Sling builds run automatically on the ASF's <a href="">Jenkins build
server</a>, triggered by SVN changes and daily.</p>
+<p>See <a href="">SLING-920</a> for Hudson configuration information.</p>
<div class="timestamp" style="margin-top: 30px; font-size: 80%;
text-align: right;">
- Rev. 1328899 by fmeschbe on Sun, 22 Apr 2012 16:52:13 +0000
+ Rev. 1341347 by fmeschbe on Tue, 22 May 2012 08:25:18 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache
Sling project
Modified: websites/staging/sling/trunk/content/project-license.html
==============================================================================
--- websites/staging/sling/trunk/content/project-license.html (original)
+++ websites/staging/sling/trunk/content/project-license.html Tue May 22
08:25:32 2012
@@ -82,9 +82,9 @@
<a href="/">Home</a>
</div>
<h1>Project License</h1>
- <div class="codehilite"><pre> <span
class="n">Apache</span> <span class="n">License</span>
- <span class="n">Version</span> <span class="mf">2.0</span><span
class="p">,</span> <span class="n">January</span> <span class="mi">2004</span>
- <span class="n">http:</span><span class="sr">//</span><span
class="n">www</span><span class="o">.</span><span class="n">apache</span><span
class="o">.</span><span class="n">org</span><span class="sr">/licenses/</span>
+ <div class="codehilite"><pre> <span
class="n">Apache</span> <span class="n">License</span>
+ <span class="n">Version</span> <span
class="mf">2.0</span><span class="p">,</span> <span class="n">January</span>
<span class="mi">2004</span>
+ <span class="n">http:</span><span
class="sr">//</span><span class="n">www</span><span class="o">.</span><span
class="n">apache</span><span class="o">.</span><span class="n">org</span><span
class="sr">/licenses/</span>
<span class="n">TERMS</span> <span class="n">AND</span> <span
class="n">CONDITIONS</span> <span class="n">FOR</span> <span
class="n">USE</span><span class="p">,</span> <span
class="n">REPRODUCTION</span><span class="p">,</span> <span
class="n">AND</span> <span class="n">DISTRIBUTION</span>
@@ -123,36 +123,27 @@
<span class="s">"Derivative Works"</span> <span
class="n">shall</span> <span class="n">mean</span> <span class="n">any</span>
<span class="n">work</span><span class="p">,</span> <span
class="n">whether</span> <span class="n">in</span> <span
class="n">Source</span> <span class="ow">or</span> <span class="n">Object</span>
<span class="n">form</span><span class="p">,</span> <span
class="n">that</span> <span class="n">is</span> <span class="n">based</span>
<span class="n">on</span> <span class="p">(</span><span class="ow">or</span>
<span class="n">derived</span> <span class="n">from</span><span
class="p">)</span> <span class="n">the</span> <span class="n">Work</span> <span
class="ow">and</span> <span class="k">for</span> <span class="n">which</span>
<span class="n">the</span>
- <span class="n">editorial</span> <span class="n">revisions</span><span
class="p">,</span> <span class="n">annotations</span><span class="p">,</span>
<span class="n">elaborations</span><span class="p">,</span> <span
class="ow">or</span> <span class="n">other</span>
-</pre></div>
-
+ <span class="n">editorial</span> <span class="n">revisions</span><span
class="p">,</span> <span class="n">annotations</span><span class="p">,</span>
<span class="n">elaborations</span><span class="p">,</span> <span
class="ow">or</span> <span class="n">other</span> <span
class="n">modifications</span>
+ <span class="n">represent</span><span class="p">,</span> <span
class="n">as</span> <span class="n">a</span> <span class="n">whole</span><span
class="p">,</span> <span class="n">an</span> <span class="n">original</span>
<span class="n">work</span> <span class="n">of</span> <span
class="n">authorship</span><span class="o">.</span> <span class="n">For</span>
<span class="n">the</span> <span class="n">purposes</span>
+ <span class="n">of</span> <span class="n">this</span> <span
class="n">License</span><span class="p">,</span> <span
class="n">Derivative</span> <span class="n">Works</span> <span
class="n">shall</span> <span class="ow">not</span> <span
class="n">include</span> <span class="n">works</span> <span
class="n">that</span> <span class="n">remain</span>
+ <span class="n">separable</span> <span class="n">from</span><span
class="p">,</span> <span class="ow">or</span> <span class="n">merely</span>
<span class="nb">link</span> <span class="p">(</span><span class="ow">or</span>
<span class="nb">bind</span> <span class="n">by</span> <span
class="n">name</span><span class="p">)</span> <span class="n">to</span> <span
class="n">the</span> <span class="n">interfaces</span> <span
class="n">of</span><span class="p">,</span>
+ <span class="n">the</span> <span class="n">Work</span> <span
class="ow">and</span> <span class="n">Derivative</span> <span
class="n">Works</span> <span class="n">thereof</span><span class="o">.</span>
-<p>modifications
- represent, as a whole, an original work of authorship. For the
-purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces
-of,
- the Work and Derivative Works thereof.</p>
-<div class="codehilite"><pre> <span
class="s">"Contribution"</span> <span class="n">shall</span> <span
class="n">mean</span> <span class="n">any</span> <span class="n">work</span>
<span class="n">of</span> <span class="n">authorship</span><span
class="p">,</span> <span class="n">including</span>
+ <span class="s">"Contribution"</span> <span
class="n">shall</span> <span class="n">mean</span> <span class="n">any</span>
<span class="n">work</span> <span class="n">of</span> <span
class="n">authorship</span><span class="p">,</span> <span
class="n">including</span>
<span class="n">the</span> <span class="n">original</span> <span
class="n">version</span> <span class="n">of</span> <span class="n">the</span>
<span class="n">Work</span> <span class="ow">and</span> <span
class="n">any</span> <span class="n">modifications</span> <span
class="ow">or</span> <span class="n">additions</span>
<span class="n">to</span> <span class="n">that</span> <span
class="n">Work</span> <span class="ow">or</span> <span
class="n">Derivative</span> <span class="n">Works</span> <span
class="n">thereof</span><span class="p">,</span> <span class="n">that</span>
<span class="n">is</span> <span class="n">intentionally</span>
- <span class="n">submitted</span> <span class="n">to</span> <span
class="n">Licensor</span> <span class="k">for</span> <span
class="n">inclusion</span> <span class="n">in</span> <span class="n">the</span>
<span class="n">Work</span> <span class="n">by</span> <span
class="n">the</span> <span class="n">copyright</span>
-</pre></div>
+ <span class="n">submitted</span> <span class="n">to</span> <span
class="n">Licensor</span> <span class="k">for</span> <span
class="n">inclusion</span> <span class="n">in</span> <span class="n">the</span>
<span class="n">Work</span> <span class="n">by</span> <span
class="n">the</span> <span class="n">copyright</span> <span
class="n">owner</span>
+ <span class="ow">or</span> <span class="n">by</span> <span
class="n">an</span> <span class="n">individual</span> <span
class="ow">or</span> <span class="n">Legal</span> <span class="n">Entity</span>
<span class="n">authorized</span> <span class="n">to</span> <span
class="n">submit</span> <span class="n">on</span> <span class="n">behalf</span>
<span class="n">of</span>
+ <span class="n">the</span> <span class="n">copyright</span> <span
class="n">owner</span><span class="o">.</span> <span class="n">For</span> <span
class="n">the</span> <span class="n">purposes</span> <span class="n">of</span>
<span class="n">this</span> <span class="n">definition</span><span
class="p">,</span> <span class="s">"submitted"</span>
+ <span class="n">means</span> <span class="n">any</span> <span
class="n">form</span> <span class="n">of</span> <span
class="n">electronic</span><span class="p">,</span> <span
class="n">verbal</span><span class="p">,</span> <span class="ow">or</span>
<span class="n">written</span> <span class="n">communication</span> <span
class="n">sent</span>
+ <span class="n">to</span> <span class="n">the</span> <span
class="n">Licensor</span> <span class="ow">or</span> <span class="n">its</span>
<span class="n">representatives</span><span class="p">,</span> <span
class="n">including</span> <span class="n">but</span> <span
class="ow">not</span> <span class="n">limited</span> <span class="n">to</span>
+ <span class="n">communication</span> <span class="n">on</span> <span
class="n">electronic</span> <span class="n">mailing</span> <span
class="n">lists</span><span class="p">,</span> <span class="n">source</span>
<span class="n">code</span> <span class="n">control</span> <span
class="n">systems</span><span class="p">,</span>
+ <span class="ow">and</span> <span class="n">issue</span> <span
class="n">tracking</span> <span class="n">systems</span> <span
class="n">that</span> <span class="n">are</span> <span class="n">managed</span>
<span class="n">by</span><span class="p">,</span> <span class="ow">or</span>
<span class="n">on</span> <span class="n">behalf</span> <span
class="n">of</span><span class="p">,</span> <span class="n">the</span>
+ <span class="n">Licensor</span> <span class="k">for</span> <span
class="n">the</span> <span class="n">purpose</span> <span class="n">of</span>
<span class="n">discussing</span> <span class="ow">and</span> <span
class="n">improving</span> <span class="n">the</span> <span
class="n">Work</span><span class="p">,</span> <span class="n">but</span>
+ <span class="n">excluding</span> <span class="n">communication</span>
<span class="n">that</span> <span class="n">is</span> <span
class="n">conspicuously</span> <span class="n">marked</span> <span
class="ow">or</span> <span class="n">otherwise</span>
+ <span class="n">designated</span> <span class="n">in</span> <span
class="n">writing</span> <span class="n">by</span> <span class="n">the</span>
<span class="n">copyright</span> <span class="n">owner</span> <span
class="n">as</span> <span class="s">"Not a Contribution."</span>
-
-<p>owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control
-systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a
Contribution."</p>
-<div class="codehilite"><pre> <span
class="s">"Contributor"</span> <span class="n">shall</span> <span
class="n">mean</span> <span class="n">Licensor</span> <span
class="ow">and</span> <span class="n">any</span> <span
class="n">individual</span> <span class="ow">or</span> <span
class="n">Legal</span> <span class="n">Entity</span>
+ <span class="s">"Contributor"</span> <span
class="n">shall</span> <span class="n">mean</span> <span
class="n">Licensor</span> <span class="ow">and</span> <span
class="n">any</span> <span class="n">individual</span> <span
class="ow">or</span> <span class="n">Legal</span> <span class="n">Entity</span>
<span class="n">on</span> <span class="n">behalf</span> <span
class="n">of</span> <span class="n">whom</span> <span class="n">a</span> <span
class="n">Contribution</span> <span class="n">has</span> <span
class="n">been</span> <span class="n">received</span> <span class="n">by</span>
<span class="n">Licensor</span> <span class="ow">and</span>
<span class="n">subsequently</span> <span class="n">incorporated</span>
<span class="n">within</span> <span class="n">the</span> <span
class="n">Work</span><span class="o">.</span>
@@ -185,33 +176,33 @@ systems,
<span class="n">meet</span> <span class="n">the</span> <span
class="n">following</span> <span class="n">conditions:</span>
<span class="p">(</span><span class="n">a</span><span class="p">)</span>
<span class="n">You</span> <span class="n">must</span> <span
class="n">give</span> <span class="n">any</span> <span class="n">other</span>
<span class="n">recipients</span> <span class="n">of</span> <span
class="n">the</span> <span class="n">Work</span> <span class="ow">or</span>
- <span class="n">Derivative</span> <span class="n">Works</span> <span
class="n">a</span> <span class="n">copy</span> <span class="n">of</span> <span
class="n">this</span> <span class="n">License</span><span class="p">;</span>
<span class="ow">and</span>
+ <span class="n">Derivative</span> <span class="n">Works</span> <span
class="n">a</span> <span class="n">copy</span> <span class="n">of</span> <span
class="n">this</span> <span class="n">License</span><span class="p">;</span>
<span class="ow">and</span>
<span class="p">(</span><span class="n">b</span><span class="p">)</span>
<span class="n">You</span> <span class="n">must</span> <span
class="n">cause</span> <span class="n">any</span> <span
class="n">modified</span> <span class="n">files</span> <span
class="n">to</span> <span class="n">carry</span> <span
class="n">prominent</span> <span class="n">notices</span>
- <span class="n">stating</span> <span class="n">that</span> <span
class="n">You</span> <span class="n">changed</span> <span class="n">the</span>
<span class="n">files</span><span class="p">;</span> <span class="ow">and</span>
+ <span class="n">stating</span> <span class="n">that</span> <span
class="n">You</span> <span class="n">changed</span> <span class="n">the</span>
<span class="n">files</span><span class="p">;</span> <span class="ow">and</span>
<span class="p">(</span><span class="n">c</span><span class="p">)</span>
<span class="n">You</span> <span class="n">must</span> <span
class="n">retain</span><span class="p">,</span> <span class="n">in</span> <span
class="n">the</span> <span class="n">Source</span> <span class="n">form</span>
<span class="n">of</span> <span class="n">any</span> <span
class="n">Derivative</span> <span class="n">Works</span>
- <span class="n">that</span> <span class="n">You</span> <span
class="n">distribute</span><span class="p">,</span> <span class="n">all</span>
<span class="n">copyright</span><span class="p">,</span> <span
class="n">patent</span><span class="p">,</span> <span
class="n">trademark</span><span class="p">,</span> <span class="ow">and</span>
- <span class="n">attribution</span> <span class="n">notices</span> <span
class="n">from</span> <span class="n">the</span> <span class="n">Source</span>
<span class="n">form</span> <span class="n">of</span> <span
class="n">the</span> <span class="n">Work</span><span class="p">,</span>
- <span class="n">excluding</span> <span class="n">those</span> <span
class="n">notices</span> <span class="n">that</span> <span class="k">do</span>
<span class="ow">not</span> <span class="n">pertain</span> <span
class="n">to</span> <span class="n">any</span> <span class="n">part</span>
<span class="n">of</span>
- <span class="n">the</span> <span class="n">Derivative</span> <span
class="n">Works</span><span class="p">;</span> <span class="ow">and</span>
+ <span class="n">that</span> <span class="n">You</span> <span
class="n">distribute</span><span class="p">,</span> <span class="n">all</span>
<span class="n">copyright</span><span class="p">,</span> <span
class="n">patent</span><span class="p">,</span> <span
class="n">trademark</span><span class="p">,</span> <span class="ow">and</span>
+ <span class="n">attribution</span> <span class="n">notices</span>
<span class="n">from</span> <span class="n">the</span> <span
class="n">Source</span> <span class="n">form</span> <span class="n">of</span>
<span class="n">the</span> <span class="n">Work</span><span class="p">,</span>
+ <span class="n">excluding</span> <span class="n">those</span> <span
class="n">notices</span> <span class="n">that</span> <span class="k">do</span>
<span class="ow">not</span> <span class="n">pertain</span> <span
class="n">to</span> <span class="n">any</span> <span class="n">part</span>
<span class="n">of</span>
+ <span class="n">the</span> <span class="n">Derivative</span> <span
class="n">Works</span><span class="p">;</span> <span class="ow">and</span>
<span class="p">(</span><span class="n">d</span><span class="p">)</span>
<span class="n">If</span> <span class="n">the</span> <span
class="n">Work</span> <span class="n">includes</span> <span class="n">a</span>
<span class="s">"NOTICE"</span> <span class="n">text</span> <span
class="n">file</span> <span class="n">as</span> <span class="n">part</span>
<span class="n">of</span> <span class="n">its</span>
- <span class="n">distribution</span><span class="p">,</span> <span
class="k">then</span> <span class="n">any</span> <span
class="n">Derivative</span> <span class="n">Works</span> <span
class="n">that</span> <span class="n">You</span> <span
class="n">distribute</span> <span class="n">must</span>
- <span class="n">include</span> <span class="n">a</span> <span
class="n">readable</span> <span class="n">copy</span> <span class="n">of</span>
<span class="n">the</span> <span class="n">attribution</span> <span
class="n">notices</span> <span class="n">contained</span>
- <span class="n">within</span> <span class="n">such</span> <span
class="n">NOTICE</span> <span class="n">file</span><span class="p">,</span>
<span class="n">excluding</span> <span class="n">those</span> <span
class="n">notices</span> <span class="n">that</span> <span class="k">do</span>
<span class="ow">not</span>
- <span class="n">pertain</span> <span class="n">to</span> <span
class="n">any</span> <span class="n">part</span> <span class="n">of</span>
<span class="n">the</span> <span class="n">Derivative</span> <span
class="n">Works</span><span class="p">,</span> <span class="n">in</span> <span
class="n">at</span> <span class="n">least</span> <span class="n">one</span>
- <span class="n">of</span> <span class="n">the</span> <span
class="n">following</span> <span class="n">places:</span> <span
class="n">within</span> <span class="n">a</span> <span class="n">NOTICE</span>
<span class="n">text</span> <span class="n">file</span> <span
class="n">distributed</span>
- <span class="n">as</span> <span class="n">part</span> <span
class="n">of</span> <span class="n">the</span> <span
class="n">Derivative</span> <span class="n">Works</span><span
class="p">;</span> <span class="n">within</span> <span class="n">the</span>
<span class="n">Source</span> <span class="n">form</span> <span
class="ow">or</span>
- <span class="n">documentation</span><span class="p">,</span> <span
class="k">if</span> <span class="n">provided</span> <span
class="n">along</span> <span class="n">with</span> <span class="n">the</span>
<span class="n">Derivative</span> <span class="n">Works</span><span
class="p">;</span> <span class="ow">or</span><span class="p">,</span>
- <span class="n">within</span> <span class="n">a</span> <span
class="n">display</span> <span class="n">generated</span> <span
class="n">by</span> <span class="n">the</span> <span
class="n">Derivative</span> <span class="n">Works</span><span
class="p">,</span> <span class="k">if</span> <span class="ow">and</span>
- <span class="n">wherever</span> <span class="n">such</span> <span
class="n">third</span><span class="o">-</span><span class="n">party</span>
<span class="n">notices</span> <span class="n">normally</span> <span
class="n">appear</span><span class="o">.</span> <span class="n">The</span>
<span class="n">contents</span>
- <span class="n">of</span> <span class="n">the</span> <span
class="n">NOTICE</span> <span class="n">file</span> <span class="n">are</span>
<span class="k">for</span> <span class="n">informational</span> <span
class="n">purposes</span> <span class="n">only</span> <span
class="ow">and</span>
- <span class="k">do</span> <span class="ow">not</span> <span
class="n">modify</span> <span class="n">the</span> <span
class="n">License</span><span class="o">.</span> <span class="n">You</span>
<span class="n">may</span> <span class="n">add</span> <span
class="n">Your</span> <span class="n">own</span> <span
class="n">attribution</span>
- <span class="n">notices</span> <span class="n">within</span> <span
class="n">Derivative</span> <span class="n">Works</span> <span
class="n">that</span> <span class="n">You</span> <span
class="n">distribute</span><span class="p">,</span> <span
class="n">alongside</span>
- <span class="ow">or</span> <span class="n">as</span> <span
class="n">an</span> <span class="n">addendum</span> <span class="n">to</span>
<span class="n">the</span> <span class="n">NOTICE</span> <span
class="n">text</span> <span class="n">from</span> <span class="n">the</span>
<span class="n">Work</span><span class="p">,</span> <span
class="n">provided</span>
- <span class="n">that</span> <span class="n">such</span> <span
class="n">additional</span> <span class="n">attribution</span> <span
class="n">notices</span> <span class="n">cannot</span> <span
class="n">be</span> <span class="n">construed</span>
- <span class="n">as</span> <span class="n">modifying</span> <span
class="n">the</span> <span class="n">License</span><span class="o">.</span>
+ <span class="n">distribution</span><span class="p">,</span> <span
class="k">then</span> <span class="n">any</span> <span
class="n">Derivative</span> <span class="n">Works</span> <span
class="n">that</span> <span class="n">You</span> <span
class="n">distribute</span> <span class="n">must</span>
+ <span class="n">include</span> <span class="n">a</span> <span
class="n">readable</span> <span class="n">copy</span> <span class="n">of</span>
<span class="n">the</span> <span class="n">attribution</span> <span
class="n">notices</span> <span class="n">contained</span>
+ <span class="n">within</span> <span class="n">such</span> <span
class="n">NOTICE</span> <span class="n">file</span><span class="p">,</span>
<span class="n">excluding</span> <span class="n">those</span> <span
class="n">notices</span> <span class="n">that</span> <span class="k">do</span>
<span class="ow">not</span>
+ <span class="n">pertain</span> <span class="n">to</span> <span
class="n">any</span> <span class="n">part</span> <span class="n">of</span>
<span class="n">the</span> <span class="n">Derivative</span> <span
class="n">Works</span><span class="p">,</span> <span class="n">in</span> <span
class="n">at</span> <span class="n">least</span> <span class="n">one</span>
+ <span class="n">of</span> <span class="n">the</span> <span
class="n">following</span> <span class="n">places:</span> <span
class="n">within</span> <span class="n">a</span> <span class="n">NOTICE</span>
<span class="n">text</span> <span class="n">file</span> <span
class="n">distributed</span>
+ <span class="n">as</span> <span class="n">part</span> <span
class="n">of</span> <span class="n">the</span> <span
class="n">Derivative</span> <span class="n">Works</span><span
class="p">;</span> <span class="n">within</span> <span class="n">the</span>
<span class="n">Source</span> <span class="n">form</span> <span
class="ow">or</span>
+ <span class="n">documentation</span><span class="p">,</span> <span
class="k">if</span> <span class="n">provided</span> <span
class="n">along</span> <span class="n">with</span> <span class="n">the</span>
<span class="n">Derivative</span> <span class="n">Works</span><span
class="p">;</span> <span class="ow">or</span><span class="p">,</span>
+ <span class="n">within</span> <span class="n">a</span> <span
class="n">display</span> <span class="n">generated</span> <span
class="n">by</span> <span class="n">the</span> <span
class="n">Derivative</span> <span class="n">Works</span><span
class="p">,</span> <span class="k">if</span> <span class="ow">and</span>
+ <span class="n">wherever</span> <span class="n">such</span> <span
class="n">third</span><span class="o">-</span><span class="n">party</span>
<span class="n">notices</span> <span class="n">normally</span> <span
class="n">appear</span><span class="o">.</span> <span class="n">The</span>
<span class="n">contents</span>
+ <span class="n">of</span> <span class="n">the</span> <span
class="n">NOTICE</span> <span class="n">file</span> <span class="n">are</span>
<span class="k">for</span> <span class="n">informational</span> <span
class="n">purposes</span> <span class="n">only</span> <span
class="ow">and</span>
+ <span class="k">do</span> <span class="ow">not</span> <span
class="n">modify</span> <span class="n">the</span> <span
class="n">License</span><span class="o">.</span> <span class="n">You</span>
<span class="n">may</span> <span class="n">add</span> <span
class="n">Your</span> <span class="n">own</span> <span
class="n">attribution</span>
+ <span class="n">notices</span> <span class="n">within</span> <span
class="n">Derivative</span> <span class="n">Works</span> <span
class="n">that</span> <span class="n">You</span> <span
class="n">distribute</span><span class="p">,</span> <span
class="n">alongside</span>
+ <span class="ow">or</span> <span class="n">as</span> <span
class="n">an</span> <span class="n">addendum</span> <span class="n">to</span>
<span class="n">the</span> <span class="n">NOTICE</span> <span
class="n">text</span> <span class="n">from</span> <span class="n">the</span>
<span class="n">Work</span><span class="p">,</span> <span
class="n">provided</span>
+ <span class="n">that</span> <span class="n">such</span> <span
class="n">additional</span> <span class="n">attribution</span> <span
class="n">notices</span> <span class="n">cannot</span> <span
class="n">be</span> <span class="n">construed</span>
+ <span class="n">as</span> <span class="n">modifying</span> <span
class="n">the</span> <span class="n">License</span><span class="o">.</span>
<span class="n">You</span> <span class="n">may</span> <span
class="n">add</span> <span class="n">Your</span> <span class="n">own</span>
<span class="n">copyright</span> <span class="n">statement</span> <span
class="n">to</span> <span class="n">Your</span> <span
class="n">modifications</span> <span class="ow">and</span>
<span class="n">may</span> <span class="n">provide</span> <span
class="n">additional</span> <span class="ow">or</span> <span
class="n">different</span> <span class="n">license</span> <span
class="n">terms</span> <span class="ow">and</span> <span
class="n">conditions</span>
@@ -241,12 +232,9 @@ systems,
<span class="n">of</span> <span class="n">TITLE</span><span
class="p">,</span> <span class="n">NON</span><span class="o">-</span><span
class="n">INFRINGEMENT</span><span class="p">,</span> <span
class="n">MERCHANTABILITY</span><span class="p">,</span> <span
class="ow">or</span> <span class="n">FITNESS</span> <span class="n">FOR</span>
<span class="n">A</span>
<span class="n">PARTICULAR</span> <span class="n">PURPOSE</span><span
class="o">.</span> <span class="n">You</span> <span class="n">are</span> <span
class="n">solely</span> <span class="n">responsible</span> <span
class="k">for</span> <span class="n">determining</span> <span
class="n">the</span>
<span class="n">appropriateness</span> <span class="n">of</span> <span
class="n">using</span> <span class="ow">or</span> <span
class="n">redistributing</span> <span class="n">the</span> <span
class="n">Work</span> <span class="ow">and</span> <span class="n">assume</span>
<span class="n">any</span>
- <span class="n">risks</span> <span class="n">associated</span> <span
class="n">with</span> <span class="n">Your</span> <span
class="n">exercise</span> <span class="n">of</span> <span
class="n">permissions</span> <span class="n">under</span> <span
class="n">this</span>
-</pre></div>
+ <span class="n">risks</span> <span class="n">associated</span> <span
class="n">with</span> <span class="n">Your</span> <span
class="n">exercise</span> <span class="n">of</span> <span
class="n">permissions</span> <span class="n">under</span> <span
class="n">this</span> <span class="n">License</span><span class="o">.</span>
-
-<p>License.</p>
-<div class="codehilite"><pre> <span class="mi">8</span><span
class="o">.</span> <span class="n">Limitation</span> <span class="n">of</span>
<span class="n">Liability</span><span class="o">.</span> <span
class="n">In</span> <span class="nb">no</span> <span class="n">event</span>
<span class="ow">and</span> <span class="n">under</span> <span
class="nb">no</span> <span class="n">legal</span> <span
class="n">theory</span><span class="p">,</span>
+ <span class="mi">8</span><span class="o">.</span> <span
class="n">Limitation</span> <span class="n">of</span> <span
class="n">Liability</span><span class="o">.</span> <span class="n">In</span>
<span class="nb">no</span> <span class="n">event</span> <span
class="ow">and</span> <span class="n">under</span> <span class="nb">no</span>
<span class="n">legal</span> <span class="n">theory</span><span
class="p">,</span>
<span class="n">whether</span> <span class="n">in</span> <span
class="n">tort</span> <span class="p">(</span><span class="n">including</span>
<span class="n">negligence</span><span class="p">),</span> <span
class="n">contract</span><span class="p">,</span> <span class="ow">or</span>
<span class="n">otherwise</span><span class="p">,</span>
<span class="k">unless</span> <span class="n">required</span> <span
class="n">by</span> <span class="n">applicable</span> <span
class="n">law</span> <span class="p">(</span><span class="n">such</span> <span
class="n">as</span> <span class="n">deliberate</span> <span
class="ow">and</span> <span class="n">grossly</span>
<span class="n">negligent</span> <span class="n">acts</span><span
class="p">)</span> <span class="ow">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">shall</span>
<span class="n">any</span> <span class="n">Contributor</span> <span
class="n">be</span>
@@ -274,23 +262,17 @@ systems,
<span class="n">APPENDIX:</span> <span class="n">How</span> <span
class="n">to</span> <span class="n">apply</span> <span class="n">the</span>
<span class="n">Apache</span> <span class="n">License</span> <span
class="n">to</span> <span class="n">your</span> <span
class="n">work</span><span class="o">.</span>
<span class="n">To</span> <span class="n">apply</span> <span
class="n">the</span> <span class="n">Apache</span> <span
class="n">License</span> <span class="n">to</span> <span class="n">your</span>
<span class="n">work</span><span class="p">,</span> <span
class="n">attach</span> <span class="n">the</span> <span
class="n">following</span>
- <span class="n">boilerplate</span> <span class="n">notice</span><span
class="p">,</span> <span class="n">with</span> <span class="n">the</span> <span
class="n">fields</span> <span class="n">enclosed</span> <span
class="n">by</span> <span class="n">brackets</span> <span
class="err">"</span><span class="o">[]</span>
-</pre></div>
-
-
-<p>"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.</p>
-<div class="codehilite"><pre> <span class="n">Copyright</span> <span
class="p">[</span><span class="n">yyyy</span><span class="p">]</span>
-</pre></div>
+ <span class="n">boilerplate</span> <span class="n">notice</span><span
class="p">,</span> <span class="n">with</span> <span class="n">the</span> <span
class="n">fields</span> <span class="n">enclosed</span> <span
class="n">by</span> <span class="n">brackets</span> <span
class="s">"[]"</span>
+ <span class="n">replaced</span> <span class="n">with</span> <span
class="n">your</span> <span class="n">own</span> <span
class="n">identifying</span> <span class="n">information</span><span
class="o">.</span> <span class="p">(</span><span class="n">Don</span><span
class="err">'</span><span class="n">t</span> <span class="n">include</span>
+ <span class="n">the</span> <span class="n">brackets</span><span
class="o">!</span><span class="p">)</span> <span class="n">The</span> <span
class="n">text</span> <span class="n">should</span> <span class="n">be</span>
<span class="n">enclosed</span> <span class="n">in</span> <span
class="n">the</span> <span class="n">appropriate</span>
+ <span class="n">comment</span> <span class="n">syntax</span> <span
class="k">for</span> <span class="n">the</span> <span class="n">file</span>
<span class="nb">format</span><span class="o">.</span> <span
class="n">We</span> <span class="n">also</span> <span
class="n">recommend</span> <span class="n">that</span> <span class="n">a</span>
+ <span class="n">file</span> <span class="ow">or</span> <span
class="n">class</span> <span class="n">name</span> <span class="ow">and</span>
<span class="n">description</span> <span class="n">of</span> <span
class="n">purpose</span> <span class="n">be</span> <span
class="n">included</span> <span class="n">on</span> <span class="n">the</span>
+ <span class="n">same</span> <span class="s">"printed
page"</span> <span class="n">as</span> <span class="n">the</span> <span
class="n">copyright</span> <span class="n">notice</span> <span
class="k">for</span> <span class="n">easier</span>
+ <span class="n">identification</span> <span class="n">within</span>
<span class="n">third</span><span class="o">-</span><span
class="n">party</span> <span class="n">archives</span><span class="o">.</span>
+ <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>
-<p>[name of copyright owner]</p>
-<div class="codehilite"><pre> <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> <span class="mf">2.0</span> <span
class="p">(</span><span class="n">the</span> <span
class="s">"License"</span><span class="p">);</span>
+ <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>
<span class="mf">2.0</span> <span class="p">(</span><span class="n">the</span>
<span class="s">"License"</span><span class="p">);</span>
<span class="n">you</span> <span class="n">may</span> <span
class="ow">not</span> <span class="k">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="o">.</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>
@@ -303,7 +285,7 @@ systems,
<span class="n">limitations</span> <span class="n">under</span> <span
class="n">the</span> <span class="n">License</span><span class="o">.</span>
</pre></div>
<div class="timestamp" style="margin-top: 30px; font-size: 80%;
text-align: right;">
- Rev. 1328899 by fmeschbe on Sun, 22 Apr 2012 16:52:13 +0000
+ Rev. 1341347 by fmeschbe on Tue, 22 May 2012 08:25:18 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache
Sling project
Modified: websites/staging/sling/trunk/content/project-team.html
==============================================================================
--- websites/staging/sling/trunk/content/project-team.html (original)
+++ websites/staging/sling/trunk/content/project-team.html Tue May 22 08:25:32
2012
@@ -84,7 +84,7 @@
<h1>Project Team</h1>
<div class="timestamp" style="margin-top: 30px; font-size: 80%;
text-align: right;">
- Rev. 1328899 by fmeschbe on Sun, 22 Apr 2012 16:52:13 +0000
+ Rev. 1341347 by fmeschbe on Tue, 22 May 2012 08:25:18 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache
Sling project
