incubator-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bay...@apache.org
Subject svn commit: r395958 - in /incubator/public/trunk: site-author/ip-clearance/index.xml site-publish/ip-clearance/index.html
Date Fri, 21 Apr 2006 17:38:57 GMT
Author: bayard
Date: Fri Apr 21 10:38:56 2006
New Revision: 395958

URL: http://svn.apache.org/viewcvs?rev=395958&view=rev
Log:
Added a link to the apache license page

Modified:
    incubator/public/trunk/site-author/ip-clearance/index.xml
    incubator/public/trunk/site-publish/ip-clearance/index.html

Modified: incubator/public/trunk/site-author/ip-clearance/index.xml
URL: http://svn.apache.org/viewcvs/incubator/public/trunk/site-author/ip-clearance/index.xml?rev=395958&r1=395957&r2=395958&view=diff
==============================================================================
--- incubator/public/trunk/site-author/ip-clearance/index.xml (original)
+++ incubator/public/trunk/site-author/ip-clearance/index.xml Fri Apr 21 10:38:56 2006
@@ -23,7 +23,8 @@
       <p>The intent is to simply help to ensure, and record, that due
          diligence (Software Grant, CLA, Corp CLA, license and dependencies)
          has been paid to the incoming code, so that it can be merged into an
-         existing project/module.</p>
+         existing project/module. These legal documents are available on the 
+         <a href="http://www.apache.org/licenses/">ASF Licenses</a> page. </p>
       <p>The receiving PMC is responsible for doing the work. The Incubator is
          simply the repository of the needed information. Once a PMC directly
          checks-in a filled-out short form, the Incubator PMC will need to 

Modified: incubator/public/trunk/site-publish/ip-clearance/index.html
URL: http://svn.apache.org/viewcvs/incubator/public/trunk/site-publish/ip-clearance/index.html?rev=395958&r1=395957&r2=395958&view=diff
==============================================================================
--- incubator/public/trunk/site-publish/ip-clearance/index.html (original)
+++ incubator/public/trunk/site-publish/ip-clearance/index.html Fri Apr 21 10:38:56 2006
@@ -1,103 +1,104 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-               "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
-Copyright 1999-2006 The Apache Software Foundation
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<html>
- <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <link rel="stylesheet" href="/style/style.css" type="text/css" />
-      <title>Intellectual property clearance - Apache Incubator</title>
- </head>
- <body>        
-  <table border="0" width="100%" cellspacing="0">
-   <tr><!-- SITE BANNER AND PROJECT IMAGE -->
-    <td align="left" valign="top">
-<a href="http://www.apache.org/"><img src="/images/asf_logo_wide.gif" alt="The Apache
Software Foundation" border="0"/></a>
-</td>
-<td align="right">
-<a href="http://incubator.apache.org/"><img src="../images/apache-incubator-logo.png"
alt="Apache Incubator" border="0"/></a>
-</td>
-   </tr>
-  </table>
-  <table border="0" width="100%" cellspacing="4">
-   <tr><td colspan="3"><hr noshade="noshade" size="1"/></td></tr>
-   <tr>
-    <!-- LEFT SIDE NAVIGATION -->
-    <td valign="top" nowrap="nowrap" class="navleft">
-           <div class="menuheader">General</div>
-    <menu compact="compact">
-          <li><a href="/index.html">Home</a></li> 
-          <li><a href="/resolution.html">What We Do</a></li> 
-          <li><a href="/howwework.html">How We Work</a></li> 
-          <li><a href="/whoweare.html">Who We Are</a></li> 
-          <li><a href="/howtoparticipate.html">How To Participate</a></li>

-          <li><a href="/faq.html">FAQ</a></li> 
-          <li><a href="http://wiki.apache.org/incubator">Wiki</a></li>

-        </menu>
-      <div class="menuheader">Incubation</div>
-    <menu compact="compact">
-          <li><a href="/projects/index.html">Projects</a></li> 
-          <li><a href="/ip-clearance/index.html">IP Clearance</a></li>

-          <li><a href="/incubation/Incubation_Policy.html">Incubation Policy</a></li>

-          <li><a href="/incubation/Process_Description.html">Process Description</a></li>

-          <li><a href="/incubation/Roles_and_Responsibilities.html">Roles/Responsibilies</a></li>

-        </menu>
-      <div class="menuheader">Guides</div>
-    <menu compact="compact">
-          <li><a href="/guides/general.html">General</a></li> 
-          <li><a href="/guides/committer.html">Committers</a></li>

-          <li><a href="/guides/chair.html">Chair</a></li> 
-          <li><a href="/guides/pmc.html">PMC</a></li> 
-          <li><a href="/guides/projects.html">Projects and Mentors</a></li>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+               "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+Copyright 1999-2006 The Apache Software Foundation
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<html>
+ <head>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <link rel="stylesheet" href="/style/style.css" type="text/css" />
+      <title>Intellectual property clearance - Apache Incubator</title>
+ </head>
+ <body>        
+  <table border="0" width="100%" cellspacing="0">
+   <tr><!-- SITE BANNER AND PROJECT IMAGE -->
+    <td align="left" valign="top">
+<a href="http://www.apache.org/"><img src="/images/asf_logo_wide.gif" alt="The Apache
Software Foundation" border="0"/></a>
+</td>
+<td align="right">
+<a href="http://incubator.apache.org/"><img src="../images/apache-incubator-logo.png"
alt="Apache Incubator" border="0"/></a>
+</td>
+   </tr>
+  </table>
+  <table border="0" width="100%" cellspacing="4">
+   <tr><td colspan="3"><hr noshade="noshade" size="1"/></td></tr>
+   <tr>
+    <!-- LEFT SIDE NAVIGATION -->
+    <td valign="top" nowrap="nowrap" class="navleft">
+           <div class="menuheader">General</div>
+    <menu compact="compact">
+          <li><a href="/index.html">Home</a></li> 
+          <li><a href="/resolution.html">What We Do</a></li> 
+          <li><a href="/howwework.html">How We Work</a></li> 
+          <li><a href="/whoweare.html">Who We Are</a></li> 
+          <li><a href="/howtoparticipate.html">How To Participate</a></li>

+          <li><a href="/faq.html">FAQ</a></li> 
+          <li><a href="http://wiki.apache.org/incubator">Wiki</a></li>

+        </menu>
+      <div class="menuheader">Incubation</div>
+    <menu compact="compact">
+          <li><a href="/projects/index.html">Projects</a></li> 
+          <li><a href="/ip-clearance/index.html">IP Clearance</a></li>

+          <li><a href="/incubation/Incubation_Policy.html">Incubation Policy</a></li>

+          <li><a href="/incubation/Process_Description.html">Process Description</a></li>

+          <li><a href="/incubation/Roles_and_Responsibilities.html">Roles/Responsibilies</a></li>

+        </menu>
+      <div class="menuheader">Guides</div>
+    <menu compact="compact">
+          <li><a href="/guides/general.html">General</a></li> 
+          <li><a href="/guides/committer.html">Committers</a></li>

+          <li><a href="/guides/chair.html">Chair</a></li> 
+          <li><a href="/guides/pmc.html">PMC</a></li> 
+          <li><a href="/guides/projects.html">Projects and Mentors</a></li>

           <li><a href="/guides/website.html">Updating the Website</a>
       <p><a href="http://www.eu.apachecon.com"><img src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif"
alt="ApacheCon Europe 2006" title="ApacheCon Europe 2006" width="120" height="50" /></a></p>
-      </li> 
-        </menu>
-    </td>
-    <!-- CONTENT -->
-    <td align="left" valign="top" class="content">
-                <h2><img src="/images/redarrow.gif" />
-   <a name="Intellectual+property+clearance">Intellectual property clearance</a>
-</h2>
-<div class="section-content">
+      </li> 
+        </menu>
+    </td>
+    <!-- CONTENT -->
+    <td align="left" valign="top" class="content">
+                <h2><img src="/images/redarrow.gif" />
+   <a name="Intellectual+property+clearance">Intellectual property clearance</a>
+</h2>
+<div class="section-content">
 <p>One of the Incubator's roles is to ensure that proper attention is
          paid to intellectual property. From time to time, an external
          codebase is brought into the ASF that is not a separate <a href="../projects/">incubating
project</a> but still represents a
          substantial contribution that was not developed within the ASF's
          source control system and on our public mailing lists.  This is a
          short form of the Incubation checklist, designed to allow code to be
-         imported with alacrity while still providing for oversight.</p>
-<div class="note">
+         imported with alacrity while still providing for oversight.</p>
+<div class="note">
 <note><strong>This form is not for new projects.</strong>  This is for
             projects and PMCs that have already been created and are receiving
             a code donation into an existing codebase.  Any code that was
             developed outside of the ASF SVN repository and our public mailing
             lists must be processed like this, even if the external developer
-            is already an ASF committer.</note>
-</div>
+            is already an ASF committer.</note>
+</div>
 <p>The intent is to simply help to ensure, and record, that due
          diligence (Software Grant, CLA, Corp CLA, license and dependencies)
          has been paid to the incoming code, so that it can be merged into an
-         existing project/module.</p>
+         existing project/module. These legal documents are available on the 
+         <a href="http://www.apache.org/licenses/">ASF Licenses</a> page. </p>
 <p>The receiving PMC is responsible for doing the work. The Incubator is
          simply the repository of the needed information. Once a PMC directly
          checks-in a filled-out short form, the Incubator PMC will need to 
          approve the paper work after which point the receiving PMC is free to
-         import the code.</p>
+         import the code.</p>
 <p>For new IP clearance forms, start with our XML <a href="http://svn.apache.org/repos/asf/incubator/public/trunk/site-author/ip-clearance/ip-clearance-template.xml">IP
clearance template</a> and
-         follow its instructions.</p>
+         follow its instructions.</p>
 <table class="colortable" width="100%">
         <tr>
           <th colspan="1" rowspan="1">Clearance document</th>
@@ -265,18 +266,18 @@
           <td colspan="1" rowspan="1">Apache Web Services</td>
           <td colspan="1" rowspan="1">2004-02-24</td>
         </tr>
-      </table>
-<h3>
-   <a name="notes">Additional notes</a>
-</h3>
-<div class="section-content">
+      </table>
+<h3>
+   <a name="notes">Additional notes</a>
+</h3>
+<div class="section-content">
 <p>
           The software grant requires that "Licensor owns or has sufficient 
           rights to contribute the software source code...". In the case where
           there are multiple entities involved that only together have sufficient
           rights (for example in the case of an existing external project with
           multiple contributors), there are basically two possibilities to continue:
-        </p>
+        </p>
 <ol>
           <li>
             All entities sign the same software grant together and submit one software 
@@ -290,36 +291,36 @@
             that the software grant form is modified in order to have a line for each
             party so the completeness of the paperwork can be verified upon receipt.
           </li>
-        </ol>
-</div>
-</div>
-         </td>
-    <!-- RIGHT SIDE NAVIGATION -->
-    <td valign="top" nowrap="nowrap" class="navright">
-           <div class="menuheader"><a 
-href="http://www.apache.org/foundation/">Foundation site</a></div>
-    <menu compact="compact">
-        </menu>
-      <div class="menuheader"><a 
-href="http://www.apache.org/licenses/">Licensing site</a></div>
-    <menu compact="compact">
-        </menu>
-
-<form action="http://www.google.com/search" method="get">
-    <input value="incubator.apache.org" name="sitesearch" type="hidden"/>
-    <input size="8" name="q" id="query" type="text" value="search..."
-        onclick="if(this.value == 'search...') {this.value = ''}"/>
-    <input name="Search" value="Go" type="submit"/>
-</form>
-    </td>     
-   </tr>
-   <!-- FOOTER -->
-   <tr><td colspan="3"><hr noshade="noshade" size="1"/></td></tr>
-   <tr><td colspan="3" class="footer">
-         Copyright &#169; 1999-2006, The Apache Software Foundation<br />
-Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License,
Version 2.0</a>.
-       </td>
-   </tr>
-  </table>
- </body>
-</html>
+        </ol>
+</div>
+</div>
+         </td>
+    <!-- RIGHT SIDE NAVIGATION -->
+    <td valign="top" nowrap="nowrap" class="navright">
+           <div class="menuheader"><a 
+href="http://www.apache.org/foundation/">Foundation site</a></div>
+    <menu compact="compact">
+        </menu>
+      <div class="menuheader"><a 
+href="http://www.apache.org/licenses/">Licensing site</a></div>
+    <menu compact="compact">
+        </menu>
+
+<form action="http://www.google.com/search" method="get">
+    <input value="incubator.apache.org" name="sitesearch" type="hidden"/>
+    <input size="8" name="q" id="query" type="text" value="search..."
+        onclick="if(this.value == 'search...') {this.value = ''}"/>
+    <input name="Search" value="Go" type="submit"/>
+</form>
+    </td>     
+   </tr>
+   <!-- FOOTER -->
+   <tr><td colspan="3"><hr noshade="noshade" size="1"/></td></tr>
+   <tr><td colspan="3" class="footer">
+         Copyright &#169; 1999-2006, The Apache Software Foundation<br />
+Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License,
Version 2.0</a>.
+       </td>
+   </tr>
+  </table>
+ </body>
+</html>



---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@incubator.apache.org
For additional commands, e-mail: cvs-help@incubator.apache.org


Mime
View raw message