Merge pull request #1552 from cblecker/cla-update

Update CLA.md

1 files changed, 45 insertions, 42 deletions

diff --git a/CLA.md b/CLA.md
index 83df2ffe..b8e2d4d6 100644
--- a/CLA.md
+++ b/CLA.md
@@ -1,54 +1,68 @@
 # The Contributor License Agreement
 
-The [Cloud Native Computing Foundation][CNCF] defines the legal status of the
-contributed code in a _Contributor License Agreement_ (CLA).
+The [Cloud Native Computing Foundation](https://www.cncf.io/community) defines
+the legal status of the contributed code in a _Contributor License Agreement_
+(CLA).
 
 Only original source code from CLA signatories can be accepted into kubernetes.
 
-This policy does not apply to [third_party] and [vendor].
+This policy does not apply to [third_party](https://git.k8s.io/kubernetes/third_party)
+and [vendor](https://git.k8s.io/kubernetes/vendor).
 
-## How do I sign?
+## What am I agreeing to?
+
+There are two versions of the CLA:
+
+1. One for [individual contributors](https://github.com/cncf/cla/blob/master/individual-cla.pdf)
+submitting contributions on their own behalf.
+1. One for [corporations](https://github.com/cncf/cla/blob/master/corporate-cla.pdf)
+to sign for contributions submitted by their employees.
 
-#### 1. Read
+It is important to read and understand this legal agreement.
+
+## How do I sign?
 
-  * [CLA for individuals] to sign up as an individual or as an employee of a signed organization.
-  * [CLA for corporations] to sign as a corporation representative and manage signups from your organization.
-  
-#### 2. Sign in with GitHub.
+#### 1. Log into the Linux Foundation ID Portal with Github
 
-Click
-  * [Individual signup] to sign up as an individual or as an employee of a signed organization. 
-  * [Corporation signup] to sign as a corporation representative and manage signups from your organization.
+Click one of:
+  * [Individual signup](https://identity.linuxfoundation.org/projects/cncf) to
+  sign up as an individual or as an employee of a signed organization.
+  * [Corporation signup](https://identity.linuxfoundation.org/node/285/organization-signup)
+  to sign as a corporation representative and manage signups from your organization.
 
-Either signup form looks like this:
+Once you get to the sign in form, click "Log in with Github":
 
 ![CNCFCLA1](http://i.imgur.com/tEk2x3j.png)
 
-#### 3. Enter the correct E-mail address to validate!
+#### 2. Create Linux Foundation ID Portal account with correct e-mail address
 
-Your github email address __must match__ the same address you use when signing the CLA.
+Ensure that the e-mail address you use when completing this form matches the one
+you will use for your commits.
 
-The address entered in the form must meet two constraints:
- 
- * It __must match__ your  [git email] (the output of `git config user.email`)
-   or your PRs will not be approved!
+If you are signing up as an employee, you must use your official
+person@organization.domain email address in the CNCF account registration page.
 
- * Use `git config user.name "Mona Lisa"` and `git config user.email "mona@example.com"`
-   to ensure you've set this properly.
+![CNCFCLA2](http://i.imgur.com/t3WAtrz.png)
 
- * It must be your official `person@organization.com` address if you signed up
-   as an employee of said organization.
+#### 3. Complete signing process
 
- * If you've already submitted a PR you can correct your user.name and user.email 
-   and then use use `git commit --ammend --reset-author` and then `git push` to 
-   correct the PR.  
+Once you have created your account, follow the instructions to complete the
+signing process via Hellosign.
 
- * Github has [documentation] on setting email addresses. 
-    
+#### 4. Ensure your Github e-mail address matches address used to sign CLA
 
-![CNCFCLA2](http://i.imgur.com/t3WAtrz.png)
+Your Github email address __must match__ the same address you use when signing
+the CLA. Github has [documentation](https://help.github.com/articles/setting-your-commit-email-address-on-github/)
+on setting email addresses.
+
+You must also set your [git e-mail](https://help.github.com/articles/setting-your-email-in-git)
+to match this e-mail address as well.
 
-#### 4. Look for an email indicating successful signup.
+If you've already submitted a PR you can correct your user.name and user.email
+and then use use `git commit --ammend --reset-author` and then `git push` to
+correct the PR.
+
+#### 5. Look for an email indicating successful signup.
 
 > The Linux Foundation
 >
@@ -62,19 +76,8 @@ Once you have this, the CLA authorizer bot will authorize your PRs.
 
 ![CNCFCLA3](http://i.imgur.com/C5ZsNN6.png)
 
-
 ## Troubleshooting
 
 If you are having problems with signed the CLA send a mail to: `helpdesk@rt.linuxfoundation.org`.
 
-Someone from the CNCF will respond to your ticket to help. 
-
-[CNCF]: https://www.cncf.io/community
-[CLA for individuals]: https://github.com/cncf/cla/blob/master/individual-cla.pdf
-[CLA for corporations]: https://github.com/cncf/cla/blob/master/corporate-cla.pdf
-[Corporation signup]: https://identity.linuxfoundation.org/node/285/organization-signup
-[Individual signup]: https://identity.linuxfoundation.org/projects/cncf
-[git email]: https://help.github.com/articles/setting-your-email-in-git
-[third_party]: https://git.k8s.io/kubernetes/third_party
-[vendor]: https://git.k8s.io/kubernetes/vendor
-[documentation]: https://help.github.com/articles/setting-your-commit-email-address-on-github/
+Someone from the CNCF will respond to your ticket to help.