@@ -107,13 +107,13 @@ Choose the right Branch
107107Before working on a patch, you must determine on which branch you need to
108108work. The branch should be based on the `master ` branch if you want to add a
109109new feature. But if you want to fix a bug, use the oldest but still maintained
110- version of Symfony where the bug happens (like `2.1 `).
110+ version of Symfony where the bug happens (like `2.2 `).
111111
112112..note ::
113113
114114 All bug fixes merged into maintenance branches are also merged into more
115115 recent branches on a regular basis. For instance, if you submit a patch
116- for the `2.1 ` branch, the patch will also be applied by the core team on
116+ for the `2.2 ` branch, the patch will also be applied by the core team on
117117 the `master ` branch.
118118
119119Create a Topic Branch
@@ -126,18 +126,18 @@ topic branch:
126126
127127 $ git checkout -b BRANCH_NAME master
128128
129- 1 branch, first track the remote
130- `2.1 ` branch locally:
129+ 2 branch, first track the remote
130+ `2.2 ` branch locally:
131131
132132..code-block ::bash
133133
134- $ git checkout -t origin/2.1
134+ $ git checkout -t origin/2.2
135135
136- 1 branch to work on the bugfix:
136+ 2 branch to work on the bugfix:
137137
138138..code-block ::bash
139139
140- $ git checkout -b BRANCH_NAME 2.1
140+ $ git checkout -b BRANCH_NAME 2.2
141141
142142tip ::
143143
@@ -230,7 +230,7 @@ while to finish your changes):
230230
231231tip ::
232232
233- Replace `master ` with `2.1 ` if you are working on a bugfix
233+ Replace `master ` with `2.2 ` if you are working on a bugfix
234234
235235When doing the ``rebase `` command, you might have to fix merge conflicts.
236236``git status `` will show you the *unmerged * files. Resolve all the conflicts,
@@ -254,8 +254,8 @@ You can now make a pull request on the ``symfony/symfony`` Github repository.
254254
255255..tip ::
256256
257- Take care to point your pull request towards ``symfony:2.1 `` if you want
258- the core team to pull a bugfix based on the 2.1 branch.
257+ Take care to point your pull request towards ``symfony:2.2 `` if you want
258+ the core team to pull a bugfix based on the 2.2 branch.
259259
260260To ease the core team work, always include the modified components in your
261261pull request message, like in: