www-legal-discuss mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bay...@apache.org
Subject svn commit: r661347 - in /infrastructure/site/trunk: docs/legal/drafts/process-draft.html xdocs/legal/drafts/process-draft.xml
Date Thu, 29 May 2008 15:13:21 GMT
Author: bayard
Date: Thu May 29 08:13:20 2008
New Revision: 661347

URL: http://svn.apache.org/viewvc?rev=661347&view=rev
Log:
Improving per Seb's comments and also making all www.apache.org links relative

Modified:
    infrastructure/site/trunk/docs/legal/drafts/process-draft.html
    infrastructure/site/trunk/xdocs/legal/drafts/process-draft.xml

Modified: infrastructure/site/trunk/docs/legal/drafts/process-draft.html
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/docs/legal/drafts/process-draft.html?rev=661347&r1=661346&r2=661347&view=diff
==============================================================================
--- infrastructure/site/trunk/docs/legal/drafts/process-draft.html (original)
+++ infrastructure/site/trunk/docs/legal/drafts/process-draft.html Thu May 29 08:13:20 2008
@@ -68,7 +68,7 @@
 		<div class="column span-15 colborder">
                             
 <div class="section-content">
-<p>DRAFTDRAFTDRAFT</p>
+<h1>DRAFTDRAFTDRAFT</h1>
 
 <h4>
    Purpose and Intended Audience
@@ -84,7 +84,7 @@
 <div class="section-content">
 <p>Source code enters the foundation in one of the following ways: </p>
 <ol type="i">
-<li>New project joining Apache</li>
+<li>An existing third party project joining Apache</li>
 <li>A large one off code contribution</li>
 <li>Repeated contributions applied directly to the source</li>
 <li>Patches applied to issue trackers</li>
@@ -92,13 +92,13 @@
 </ol>
 <p>Each of these methods has its own process:</p>
 <ol type="i">
-<li>New projects join through the Apache Incubator project. All copyright holders have
to sign <a href="http://www.apache.org/licenses/#clas">Contributor License Agreements</a>
or <a href="http://www.apache.org/licenses/#grants">Software Grants</a>, 
+<li>Existing third party projects join through the Apache Incubator project. All copyright
holders have to sign <a href="/licenses/#clas">Contributor License Agreements</a>
or <a href="/licenses/#grants">Software Grants</a>, 
 and names are checked for trademark issues. CLAs tend to be for individuals who will continue
to develop the software, while grants are for those who will 
 not commit or for companies. You can learn more about that process <a href="http://incubator.apache.org/">here</a>.
 </li>
-<li>One off code donations can come in through a <a href="http://www.apache.org/licenses/software-grant.txt">software
grant</a>. You can see list of such grants at the 
+<li>One off code donations can come in through a <a href="/licenses/software-grant.txt">software
grant</a>. You can see list of such grants at the 
 <a href="http://incubator.apache.org/ip-clearance/index.html">IP Clearance page</a>.
</li>
-<li>Individuals who want to directly contribute to the project sign a <a href="http://www.apache.org/licenses/icla.txt">Individual
Contributor License Agreement</a> (CLA). Sometimes they and their employer will also
want to sign a 
-separte <a href="http://www.apache.org/licenses/cla-corporate.txt">Corporate CLA</a>
with the ASF, depending on the situation. Usually these contributions take the effect of commits
to the source code repository, another example is for access to updating the website through
a content management system. </li>
+<li>Individuals who want to directly contribute to the project sign a <a href="/licenses/icla.txt">Individual
Contributor License Agreement</a> (CLA). Sometimes they and their employer will also
want to sign a 
+separte <a href="/licenses/cla-corporate.txt">Corporate CLA</a> with the ASF,
depending on the situation. Usually these contributions take the effect of commits to the
source code repository, another example is for access to updating the website through a content
management system. </li>
 <li>Patches to the JIRA issue trackers contain a checkbox that users must check to
'Grant license to ASF for inclusion in ASF works'. Developers using the Bugzilla issue tracker
have to check for this . </li>
 <li>Mailing list patches are applied and expected to be simple. The same applies for
inline comments in the issue trackers, or any other form of conversation. None of these tools
easily support complex patches. </li>
 </ol>
@@ -106,8 +106,8 @@
 <p>In addition to original code licensed to the Apache Software Foundation, Apache
products may include third party code. Whether or not to distribute, 
 or use, that third party code is discussed on the legal-discuss@ mailing list as to whether
the license is acceptable. The very general philosophy is to 
 avoid licenses adding terms beyond the ASF's AL 2.0 license, while also remaining pragmatic
towards the needs of the user. Prior decisions may be viewed at 
-<a href="http://www.apache.org/legal/resolved.html">here</a>. </p>
-<p>Finally, Apache projects record their export classifications <a href="http://www.apache.org/licenses/exports/">here</a>.
</p>
+<a href="/legal/resolved.html">here</a>. </p>
+<p>Finally, Apache projects record their export classifications <a href="/licenses/exports/">here</a>
and via a notice in a README file in the distribution as per the <a href="/dev/crypto.html">crypto
process</a>. </p>
 </div>
 
 <h4>

Modified: infrastructure/site/trunk/xdocs/legal/drafts/process-draft.xml
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/xdocs/legal/drafts/process-draft.xml?rev=661347&r1=661346&r2=661347&view=diff
==============================================================================
--- infrastructure/site/trunk/xdocs/legal/drafts/process-draft.xml (original)
+++ infrastructure/site/trunk/xdocs/legal/drafts/process-draft.xml Thu May 29 08:13:20 2008
@@ -8,7 +8,7 @@
   "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
+    /licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
@@ -25,7 +25,7 @@
 <body>
 <section>
 <title>ASF Development Process</title>
-<p>DRAFTDRAFTDRAFT</p>
+<h1>DRAFTDRAFTDRAFT</h1>
 <section><title>Purpose and Intended Audience</title>
 <p>Here we summarize the process of development at the Apache Software Foundation (ASF),
with a focus on the legal side of things. It's 
 intended for those who are interested as to what the ASF do to manage the ownership of their
products. </p>
@@ -34,7 +34,7 @@
 <section><title>Incoming code</title>
 <p>Source code enters the foundation in one of the following ways: </p>
 <ol type="i">
-<li>New project joining Apache</li>
+<li>An existing third party project joining Apache</li>
 <li>A large one off code contribution</li>
 <li>Repeated contributions applied directly to the source</li>
 <li>Patches applied to issue trackers</li>
@@ -42,13 +42,13 @@
 </ol>
 <p>Each of these methods has its own process:</p>
 <ol type="i">
-<li>New projects join through the Apache Incubator project. All copyright holders have
to sign <a href="http://www.apache.org/licenses/#clas">Contributor License Agreements</a>
or <a href="http://www.apache.org/licenses/#grants">Software Grants</a>, 
+<li>Existing third party projects join through the Apache Incubator project. All copyright
holders have to sign <a href="/licenses/#clas">Contributor License Agreements</a>
or <a href="/licenses/#grants">Software Grants</a>, 
 and names are checked for trademark issues. CLAs tend to be for individuals who will continue
to develop the software, while grants are for those who will 
 not commit or for companies. You can learn more about that process <a href="http://incubator.apache.org/">here</a>.
 </li>
-<li>One off code donations can come in through a <a href="http://www.apache.org/licenses/software-grant.txt">software
grant</a>. You can see list of such grants at the 
+<li>One off code donations can come in through a <a href="/licenses/software-grant.txt">software
grant</a>. You can see list of such grants at the 
 <a href="http://incubator.apache.org/ip-clearance/index.html">IP Clearance page</a>.
</li>
-<li>Individuals who want to directly contribute to the project sign a <a href="http://www.apache.org/licenses/icla.txt">Individual
Contributor License Agreement</a> (CLA). Sometimes they and their employer will also
want to sign a 
-separte <a href="http://www.apache.org/licenses/cla-corporate.txt">Corporate CLA</a>
with the ASF, depending on the situation. Usually these contributions take the effect of commits
to the source code repository, another example is for access to updating the website through
a content management system. </li>
+<li>Individuals who want to directly contribute to the project sign a <a href="/licenses/icla.txt">Individual
Contributor License Agreement</a> (CLA). Sometimes they and their employer will also
want to sign a 
+separte <a href="/licenses/cla-corporate.txt">Corporate CLA</a> with the ASF,
depending on the situation. Usually these contributions take the effect of commits to the
source code repository, another example is for access to updating the website through a content
management system. </li>
 <li>Patches to the JIRA issue trackers contain a checkbox that users must check to
'Grant license to ASF for inclusion in ASF works'. Developers using the Bugzilla issue tracker
have to check for this . </li>
 <li>Mailing list patches are applied and expected to be simple. The same applies for
inline comments in the issue trackers, or any other form of conversation. None of these tools
easily support complex patches. </li>
 </ol>
@@ -58,9 +58,9 @@
 <p>In addition to original code licensed to the Apache Software Foundation, Apache
products may include third party code. Whether or not to distribute, 
 or use, that third party code is discussed on the legal-discuss@ mailing list as to whether
the license is acceptable. The very general philosophy is to 
 avoid licenses adding terms beyond the ASF's AL 2.0 license, while also remaining pragmatic
towards the needs of the user. Prior decisions may be viewed at 
-<a href="http://www.apache.org/legal/resolved.html">here</a>. </p>
+<a href="/legal/resolved.html">here</a>. </p>
 
-<p>Finally, Apache projects record their export classifications <a href="http://www.apache.org/licenses/exports/">here</a>.
</p> 
+<p>Finally, Apache projects record their export classifications <a href="/licenses/exports/">here</a>
and via a notice in a README file in the distribution as per the <a href="/dev/crypto.html">crypto
process</a>. </p> 
 
 </section>
 



---------------------------------------------------------------------
DISCLAIMER: Discussions on this list are informational and educational
only.  Statements made on this list are not privileged, do not
constitute legal advice, and do not necessarily reflect the opinions
and policies of the ASF.  See <http://www.apache.org/licenses/> for
official ASF policies and documents.
---------------------------------------------------------------------
To unsubscribe, e-mail: legal-discuss-unsubscribe@apache.org
For additional commands, e-mail: legal-discuss-help@apache.org


Mime
View raw message