Skip to content

Commit 3c73a8f

Browse files
committed
Instruct contributors to branch from master
1 parent 00fea1f commit 3c73a8f

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

CONTRIBUTING.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,11 @@ future pull requests as well, simply so that the Spring Framework team knows
4747
immediately that this process is complete.
4848

4949

50-
## Create your branch from `3.2.x`
50+
## Create your branch from `master`
5151

52-
If your pull request addresses a bug or improvement, please create your branch
53-
from Spring Framework's `3.2.x` branch. `master` is reserved for work on new features
54-
for the next major version of the framework. Rest assured that if your pull
55-
request is accepted and merged into `3.2.x`, these changes will also eventually
56-
be merged into `master`.
52+
Master currently represents work toward Spring Framework 4.0. Please submit
53+
all pull requests there, even bug fixes and minor improvements. Backports to
54+
`3.2.x` will be considered on a case-by-case basis.
5755

5856

5957
## Use short branch names
@@ -129,7 +127,7 @@ e.g.
129127
* ...
130128
*
131129
* @author First Last
132-
* @since 3.2
130+
* @since 4.0
133131
* @see ...
134132
*/
135133
```

0 commit comments

Comments
 (0)