@@ -23,34 +23,34 @@ truly trivial, e.g. typo fixes, removing compiler warnings, etc.
2323
2424If you're considering anything more than correcting a typo or fixing a minor
2525bug, please discuss it on the [ spring-framework-contrib] [ ] mailing list before
26- submitting a pull request. We're happy to provide guidance but please spend an
26+ submitting a pull request. We're happy to provide guidance, but please spend an
2727hour or two researching the subject on your own including searching the mailing
2828list for prior discussions.
2929
3030## Sign the Contributor License Agreement
3131
3232If you have not previously done so, please fill out and submit the
3333[ SpringSource CLA form] [ ] . You'll receive a token when this process is complete.
34- Keep track of this, you may be asked for it later!
34+ Keep track of this; you may be asked for it later!
3535
3636Note that emailing/postal mailing a signed copy is _ not_ necessary. Submission
3737of the web form is all that is required.
3838
39- When you've completed the web form, simply add the following in a comment on
39+ Once you've completed the web form, simply add the following in a comment on
4040your pull request:
4141
4242 I have signed and agree to the terms of the SpringSource Individual
4343 Contributor License Agreement.
4444
4545You do not need to include your token/id. Please add the statement above to all
46- future pull requests as well, simply so the Spring Framework team knows
46+ future pull requests as well, simply so that the Spring Framework team knows
4747immediately that this process is complete.
4848
4949
5050## Create your branch from ` 3.2.x `
5151
5252If your pull request addresses a bug or improvement, please create your branch
53- Spring Framework's ` 3.2.x ` branch. ` master ` is reserved for work on new features
53+ from Spring Framework's ` 3.2.x ` branch. ` master ` is reserved for work on new features
5454for the next major version of the framework. Rest assured that if your pull
5555request is accepted and merged into ` 3.2.x ` , these changes will also eventually
5656be merged into ` master ` .
@@ -72,7 +72,7 @@ Please carefully follow the whitespace and formatting conventions already
7272present in the framework.
7373
74741 . Tabs, not spaces
75- 1 . Unix (LF), not dos (CRLF) line endings
75+ 1 . Unix (LF), not DOS (CRLF) line endings
76761 . Eliminate all trailing whitespace
77771 . Wrap Javadoc at 90 characters
78781 . Aim to wrap code at 90 characters, but favor readability over wrapping
@@ -228,11 +228,11 @@ Most importantly, please format your commit messages in the following way
228228
2292291 . Use imperative statements in the subject line, e.g. "Fix broken Javadoc link"
2302301 . Begin the subject line sentence with a capitalized verb, e.g. "Add, Prune,
231- Fix, Introduce, Avoid, etc"
231+ Fix, Introduce, Avoid, etc. "
2322321 . Do not end the subject line with a period
2332331 . Keep the subject line to 50 characters or less if possible
2342341 . Wrap lines in the body at 72 characters or less
235- 1 . Mention associated jira issue(s) at the end of the commit comment, prefixed
235+ 1 . Mention associated JIRA issue(s) at the end of the commit comment, prefixed
236236 with "Issue: " as above
2372371 . In the body of the commit message, explain how things worked before this
238238 commit, what has changed, and how things work now
0 commit comments