You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by jt...@apache.org on 2005/06/08 22:24:32 UTC
svn commit: r189632 - in /incubator/derby/site/trunk:
build/site/logo_contest.html src/documentation/content/xdocs/logo_contest.xml
Author: jta
Date: Wed Jun 8 13:24:32 2005
New Revision: 189632
URL: http://svn.apache.org/viewcvs?rev=189632&view=rev
Log:
Added wording to logo contest page about granting license to the ASF.
Modified:
incubator/derby/site/trunk/build/site/logo_contest.html
incubator/derby/site/trunk/src/documentation/content/xdocs/logo_contest.xml
Modified: incubator/derby/site/trunk/build/site/logo_contest.html
URL: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/logo_contest.html?rev=189632&r1=189631&r2=189632&view=diff
==============================================================================
--- incubator/derby/site/trunk/build/site/logo_contest.html (original)
+++ incubator/derby/site/trunk/build/site/logo_contest.html Wed Jun 8 13:24:32 2005
@@ -188,12 +188,31 @@
You do need a Jira id, which you can sign up for at
<a class="external" href="http://issues.apache.org/jira/">http://issues.apache.org/jira/</a>.
</p>
+<p>
+When you upload attachments to Jira,
+you have two options:
+</p>
+<ul>
+
+<li>Grant license to ASF for inclusion in ASF works (as per the
+ <a class="external" href="http://www.apache.org/licenses/LICENSE-2.0">Apache
+ Software License</a>)</li>
+
+<li> Attachment not intended for inclusion</li>
+
+</ul>
+<p>
+The only logos that will be considered are those for which the
+license has been granted to the ASF.
+But only grant the license to the ASF if you are entitled to do so.
+Don't include any elements to which you don't have rights or permission.
+</p>
</div>
<p>
-<em>Last updated: May 22, 2005</em>
+<em>Last updated: June 8, 2005</em>
</p>
Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/logo_contest.xml
URL: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/src/documentation/content/xdocs/logo_contest.xml?rev=189632&r1=189631&r2=189632&view=diff
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/logo_contest.xml (original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/logo_contest.xml Wed Jun 8 13:24:32 2005
@@ -32,10 +32,30 @@
You do need a Jira id, which you can sign up for at
<a href="http://issues.apache.org/jira/">http://issues.apache.org/jira/</a>.
</p>
+
+<p>
+When you upload attachments to Jira,
+you have two options:
+</p>
+
+<ul>
+ <li>Grant license to ASF for inclusion in ASF works (as per the
+ <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
+ Software License</a>)</li>
+ <li> Attachment not intended for inclusion</li>
+</ul>
+
+<p>
+The only logos that will be considered are those for which the
+license has been granted to the ASF.
+But only grant the license to the ASF if you are entitled to do so.
+Don't include any elements to which you don't have rights or permission.
+</p>
+
</section>
<p>
-<em>Last updated: May 22, 2005</em>
+<em>Last updated: June 8, 2005</em>
</p>
</body>
</document>