rdonkin 2003/12/01 12:37:43
Modified: docs/site agreement.html roles.html
xdocs/site agreement.xml roles.xml
Log:
Replaced text of Contributors License Agreement with link to main ASF site. This
kind of information is best maintained in one place. docs/site/agreement.html
xdocs/site/agreement.xml
Revision Changes Path
1.48 +3 -100 jakarta-site2/docs/site/agreement.html
Index: agreement.html
===================================================================
RCS file: /home/cvs/jakarta-site2/docs/site/agreement.html,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- agreement.html 20 Nov 2003 21:40:41 -0000 1.47
+++ agreement.html 1 Dec 2003 20:37:42 -0000 1.48
@@ -192,106 +192,9 @@
<tr><td>
<blockquote>
<p>
-All Apache committers should have a signed Contributor License Agreement on file.
-If you have not already done so, please complete this Agreement and
-send it by facsimile to the Foundation at +1-410-803-2258, or send a
-photocopy by regular mail to The Apache Software Foundation,
-1901 Munsey Drive, Forest Hill, MD 21050-2747, U.S.A. Please read this
-document carefully before signing and keep the original for your records.
-</p>
- <p>
-If you have any questions, please contact <a
href="mailto:jim.AT.apache.DOT.org";>Jim
-Jagielski</a>.
-</p>
- <p>
----------------- cut here ----------------
-</p>
- <p>
-The Apache Software Foundation
-</p>
- <p>
-Contributor License Agreement
-</p>
- <p>
-Thank you for your interest in The Apache Software Foundation (the
-"Foundation"). In order to clarify the intellectual property license
-granted with contributions of software from any person or entity
-(the "Contributor"), the Foundation would like to have a Contributor
-License Agreement on file that has been signed by the Contributor,
-indicating agreement to the license terms below. This license is for
-your protection as a Contributor of software to the Foundation and does
-not change your right to use your own contributions for any other purpose.
-</p>
- <p>
-If you have not already done so, please complete this Agreement and
-send it by facsimile to the Foundation at +1-410-803-2258, or send a
-photocopy by regular mail to The Apache Software Foundation,
-1901 Munsey Drive, Forest Hill, MD 21050-2747, U.S.A. Please read this
-document carefully before signing and keep the original for your records.
-</p>
- <p><code>
-Full name:_______________________ E-Mail:__________________<br />
-<br />
-Mailing Address:_________________ Telephone:_______________<br />
-<br />
-_________________________________ Facsimile:_______________<br />
-<br />
-_________________________________ Country:_________________
-</code></p>
- <p>
-You and the Foundation hereby accept and agree to the following terms
-and conditions:
-</p>
- <p>
-1. Your "Contributions" means all of your past, present and future
- contributions of object code, source code and documentation to the
- Foundation, however submitted to the Foundation, excluding any
- submissions that are conspicuously marked or otherwise designated in
- writing by You as "Not a Contribution."
-</p>
- <p>
-2. You hereby grant to the Foundation a non-exclusive, irrevocable,
- worldwide, no-charge, transferable copyright license to use,
- execute, prepare derivative works of, and distribute (internally
- and externally, in object code and, if included in your
- Contributions, source code form) your Contributions. Except for the
- rights granted to the Foundation in this paragraph, You reserve all
- right, title and interest in and to your Contributions.
-</p>
- <p>
-3. You represent that you are legally entitled to grant the above
- license. If your employer(s) have rights to intellectual property
- that you create, you represent that you have received permission
- to make the Contributions on behalf of that employer, or that your
- employer has waived such rights for your Contributions to the
- Foundation.
-</p>
- <p>
-4. You represent that, except as disclosed in your Contribution
- submission(s), each of your Contributions is your original creation.
- You represent that your Contribution submission(s) include complete
- details of any license or other restriction (including, but not
- limited to, related patents and trademarks) associated with any part
- of your Contribution(s) (including a copy of any applicable license
- agreement). You agree to notify the Foundation of any facts or
- circumstances of which you become aware that would make Your
- representations in this Agreement inaccurate in any respect.
-</p>
- <p>
-5. You are not expected to provide support for your Contributions,
- except to the extent you desire to provide support. You may provide
- support for free, for a fee, or not at all. Your Contributions are
- provided as-is, with all faults defects and errors, and without
- warranty of any kind (either express or implied) including, without
- limitation, any implied warranty of merchantability and fitness for
- a particular purpose and any warranty of non-infringement.
-</p>
- <p><code>
-Please sign: _____________________________ Date: __________
-</code></p>
- <p>
----------------- cut here ----------------
-</p>
+ Please see the <a href="http://www.apache.org/licenses/index.html#clas";>main
Apache Software Foundation page</a>.
+ Thanks.
+ </p>
</blockquote>
</p>
</td></tr>
1.88 +6 -4 jakarta-site2/docs/site/roles.html
Index: roles.html
===================================================================
RCS file: /home/cvs/jakarta-site2/docs/site/roles.html,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- roles.html 30 Nov 2003 23:27:03 -0000 1.87
+++ roles.html 1 Dec 2003 20:37:42 -0000 1.88
@@ -241,10 +241,12 @@
The first stage of the process is that the result of the vote thread should be
carbon copied to the pmc list by the existing committer who will be executing
the required process. An email should be sent to the prospected committer offering
- them committership preferrable with the from header set to an offical apache.org
email address
- and the reply-to header set to
- <strong>pmc at jakarta.apache.org</strong> so that the reply is recorded on that
list.
- Note that non-pmc members will need to add a additional reply-to header so that
they receive a copy.
+ them committership preferrable with the <code>from</code> header set to
anapache.org email address
+ and the <code>reply-to</code> header set to
+ <strong>pmc at jakarta.apache.org</strong> (so that the reply will be recorded on
that list).
+ Note that non-pmc members will need to add a additional <code>reply-to</code>
header so that they receive a copy.
+ </p>
+ <p>
This is an
example offer letter:
</p>
1.3 +5 -119 jakarta-site2/xdocs/site/agreement.xml
Index: agreement.xml
===================================================================
RCS file: /home/cvs/jakarta-site2/xdocs/site/agreement.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- agreement.xml 2 Oct 2003 08:55:47 -0000 1.2
+++ agreement.xml 1 Dec 2003 20:37:42 -0000 1.3
@@ -8,125 +8,11 @@
<body>
- <section name="Contributor License Agreement">
-
-<p>
-All Apache committers should have a signed Contributor License Agreement on file.
-If you have not already done so, please complete this Agreement and
-send it by facsimile to the Foundation at +1-410-803-2258, or send a
-photocopy by regular mail to The Apache Software Foundation,
-1901 Munsey Drive, Forest Hill, MD 21050-2747, U.S.A. Please read this
-document carefully before signing and keep the original for your records.
-</p>
-
-<p>
-If you have any questions, please contact <a
href="mailto:jim.AT.apache.DOT.org";>Jim
-Jagielski</a>.
-</p>
-
-<p>
----------------- cut here ----------------
-</p>
-
-<p>
-The Apache Software Foundation
-</p>
-
-<p>
-Contributor License Agreement
-</p>
-
-<p>
-Thank you for your interest in The Apache Software Foundation (the
-"Foundation"). In order to clarify the intellectual property license
-granted with contributions of software from any person or entity
-(the "Contributor"), the Foundation would like to have a Contributor
-License Agreement on file that has been signed by the Contributor,
-indicating agreement to the license terms below. This license is for
-your protection as a Contributor of software to the Foundation and does
-not change your right to use your own contributions for any other purpose.
-</p>
-
-<p>
-If you have not already done so, please complete this Agreement and
-send it by facsimile to the Foundation at +1-410-803-2258, or send a
-photocopy by regular mail to The Apache Software Foundation,
-1901 Munsey Drive, Forest Hill, MD 21050-2747, U.S.A. Please read this
-document carefully before signing and keep the original for your records.
-</p>
-
-<p><code>
-Full name:_______________________ E-Mail:__________________<br/>
-<br/>
-Mailing Address:_________________ Telephone:_______________<br/>
-<br/>
-_________________________________ Facsimile:_______________<br/>
-<br/>
-_________________________________ Country:_________________
-</code></p>
-
-<p>
-You and the Foundation hereby accept and agree to the following terms
-and conditions:
-</p>
-
-<p>
-1. Your "Contributions" means all of your past, present and future
- contributions of object code, source code and documentation to the
- Foundation, however submitted to the Foundation, excluding any
- submissions that are conspicuously marked or otherwise designated in
- writing by You as "Not a Contribution."
-</p>
-
-<p>
-2. You hereby grant to the Foundation a non-exclusive, irrevocable,
- worldwide, no-charge, transferable copyright license to use,
- execute, prepare derivative works of, and distribute (internally
- and externally, in object code and, if included in your
- Contributions, source code form) your Contributions. Except for the
- rights granted to the Foundation in this paragraph, You reserve all
- right, title and interest in and to your Contributions.
-</p>
-
-<p>
-3. You represent that you are legally entitled to grant the above
- license. If your employer(s) have rights to intellectual property
- that you create, you represent that you have received permission
- to make the Contributions on behalf of that employer, or that your
- employer has waived such rights for your Contributions to the
- Foundation.
-</p>
-
-<p>
-4. You represent that, except as disclosed in your Contribution
- submission(s), each of your Contributions is your original creation.
- You represent that your Contribution submission(s) include complete
- details of any license or other restriction (including, but not
- limited to, related patents and trademarks) associated with any part
- of your Contribution(s) (including a copy of any applicable license
- agreement). You agree to notify the Foundation of any facts or
- circumstances of which you become aware that would make Your
- representations in this Agreement inaccurate in any respect.
-</p>
-
-<p>
-5. You are not expected to provide support for your Contributions,
- except to the extent you desire to provide support. You may provide
- support for free, for a fee, or not at all. Your Contributions are
- provided as-is, with all faults defects and errors, and without
- warranty of any kind (either express or implied) including, without
- limitation, any implied warranty of merchantability and fitness for
- a particular purpose and any warranty of non-infringement.
-</p>
-
-<p><code>
-Please sign: _____________________________ Date: __________
-</code></p>
-
-<p>
----------------- cut here ----------------
-</p>
-
+ <section name="Contributor License Agreement">
+ <p>
+ Please see the <a href='http://www.apache.org/licenses/index.html#clas'>main
Apache Software Foundation page</a>.
+ Thanks.
+ </p>
</section>
</body>
</document>
1.14 +2 -1 jakarta-site2/xdocs/site/roles.xml
Index: roles.xml
===================================================================
RCS file: /home/cvs/jakarta-site2/xdocs/site/roles.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- roles.xml 30 Nov 2003 23:27:03 -0000 1.13
+++ roles.xml 1 Dec 2003 20:37:42 -0000 1.14
@@ -67,7 +67,8 @@
The first stage of the process is that the result of the vote thread should be
carbon copied to the pmc list by the existing committer who will be executing
the required process. An email should be sent to the prospected committer offering
- them committership preferrable with the <code>from</code> header set to
anapache.org email address
+ them committership preferrable with the <code>from</code> header set to an
+ apache.org email address
and the <code>reply-to</code> header set to
<strong>pmc at jakarta.apache.org</strong> (so that the reply will be recorded on
that list).
Note that non-pmc members will need to add a additional <code>reply-to</code>
header so that they receive a copy.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
