Skip to content

Commit 472d79f

Browse files
committed
SpringSource CLA renamed to Spring ICLA
1 parent 6ea407a commit 472d79f

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

CONTRIBUTING.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -189,11 +189,11 @@ intend to submit as pull requests. For example, this is not acceptable:
189189
Author: Nickname <[email protected]>
190190

191191
Rather, please include your first and last name, properly capitalized, as
192-
submitted against the SpringSource contributor license agreement:
192+
submitted against the Spring Individual Contributor License Agreement (ICLA):
193193

194194
Author: First Last <[email protected]>
195195

196-
This helps ensure traceability against the CLA and also goes a long way to
196+
This helps ensure traceability against the ICLA and also goes a long way to
197197
ensuring useful output from tools like `git shortlog` and others.
198198

199199
You can configure this via the account admin area in GitHub (useful for
@@ -236,16 +236,16 @@ Most importantly, please format your commit messages in the following way
236236
Issue: SPR-1234, SPR-1235
237237

238238

239-
1. Use imperative statements in the subject line, e.g. "Fix broken Javadoc link"
239+
1. Use imperative statements in the subject line, e.g. "Fix broken Javadoc link".
240240
1. Begin the subject line with a capitalized verb, e.g. "Add, Prune, Fix,
241241
Introduce, Avoid, etc."
242-
1. Do not end the subject line with a period
243-
1. Restrict the subject line to 50 characters or less if possible
244-
1. Wrap lines in the body at 72 characters or less
242+
1. Do not end the subject line with a period.
243+
1. Restrict the subject line to 50 characters or less if possible.
244+
1. Wrap lines in the body at 72 characters or less.
245245
1. Mention associated JIRA issue(s) at the end of the commit comment, prefixed
246-
with "Issue: " as above
246+
with "Issue: " as above.
247247
1. In the body of the commit message, explain how things worked before this
248-
commit, what has changed, and how things work now
248+
commit, what has changed, and how things work now.
249249

250250
For examples of this style, issue a `git log --author=cbeams` in the
251251
`spring-framework` git repository. For convenience, here are several such commits:
@@ -276,9 +276,9 @@ In the body:
276276
mechanisms in the framework insufficient? Make a case that this is a
277277
general-purpose problem and that yours is a general-purpose solution, etc.
278278
1. Add any additional information and ask questions; start a conversation or
279-
continue one from JIRA
280-
1. Mention the JIRA issue ID
281-
1. Also mention that you have submitted the CLA as described above
279+
continue one from JIRA.
280+
1. Mention the JIRA issue ID.
281+
1. Also mention that you have submitted the ICLA as described above.
282282

283283
Note that for pull requests containing a single commit, GitHub will default the
284284
subject line and body of the pull request to match the subject line and body of

0 commit comments

Comments
 (0)