doc: Make the CLA more simple/sane

1. Emails should go to @isaacs, not emily.
2. Ask for the electronic signature first, not the printed faxed thing.

1 files changed, 48 insertions, 50 deletions

diff --git a/doc/cla.html b/doc/cla.html
index ed5660b7bb5..1be563559f9 100644
--- a/doc/cla.html
+++ b/doc/cla.html
@@ -54,39 +54,12 @@ license is for your protection as well as the protection of
 NodeJS and its licensees; it does not change your rights to
 use your own Contributions for any other purpose.  Please
 complete the following information about you and the
-Contributions and send us an original signed Agreement at
-
-<p>
-Joyent, Inc <br/>
-One Embarcadero Center, 9th Floor<br/>
-San Francisco, CA 94111<br/>
-U.S.A.
-
-<p>
-Scanned agreements may also be emailed in PDF format to
-emily@joyent.com. You should also keep a copy for your own
-records.
+Contributions and sign electronically by filling out the form
+below.
 
 <p>
 If you have questions about these terms, please contact us
-at emily@joyent.com.
-
-
-<pre>
-Full name: _________________________________________________
-
-Mailing Address: ___________________________________________
-
-____________________________________________________________
-
-Country:   _________________________________________________
-
-Telephone: _________________________________________________
-
-Facsimile: _________________________________________________
-
-E-Mail:    _________________________________________________
-</pre>
+at isaacs@joyent.com.
 
 
 <h3>Corporate Contributions:</h3>
@@ -98,17 +71,7 @@ otherwise may claim rights in the Contributions, please
 provide information about your employer's policy on
 contributing to open source projects, including the name of
 the supervisor to contact in connection with such
-contributions:
-
-<pre>
-
-____________________________________________________________
-
-____________________________________________________________
-
-____________________________________________________________
-</pre>
-
+contributions.
 
 
 <h3>You and NodeJS agree:</h3>
@@ -172,14 +135,6 @@ CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY, OR
 FITNESS FOR A PARTICULAR PURPOSE.
 </ol>
 
-
-<pre>
-
-
-Please sign: _______________________________________________
-
-Date: ______________________________________________________
-</pre>
 </div>
 
 
@@ -187,9 +142,52 @@ Date: ______________________________________________________
 
 <iframe
   src="http://spreadsheets.google.com/embeddedform?formkey=dFhpTW5kWUtUVG1DTUpHOGR5U2VXNXc6MQ"
-  width="760" height="3265" frameborder="0" marginheight="0"
+  width="760" height="1240" frameborder="0" marginheight="0"
   marginwidth="0">Loading...</iframe>
 
 
+<p>As an alternative to electronic signing, you may also print
+the document and send the original to:
+
+<p>
+Joyent, Inc <br/>
+One Embarcadero Center, 9th Floor<br/>
+San Francisco, CA 94111<br/>
+U.S.A.
+
+<p>
+Scanned agreements may also be emailed in PDF format to
+isaacs@joyent.com. You should also keep a copy for your own
+records.
+
+<pre>
+Full name: _________________________________________________
+
+Mailing Address: ___________________________________________
+
+____________________________________________________________
+
+Country:   _________________________________________________
+
+Telephone: _________________________________________________
+
+Facsimile: _________________________________________________
+
+E-Mail:    _________________________________________________
+
+Employer:  _________________________________________________
+
+Employer Contact:   ________________________________________
+
+Employer Open Source Contribution Policy:  _________________
+
+____________________________________________________________
+
+____________________________________________________________
+
+Please sign: _______________________________________________
+
+Date: ______________________________________________________
+</pre>
 </body>
 </html>