Update coding_guide.rst

story645 · web-flow · commit 49a14f3c12a5 · 2017-01-30T00:33:38.000-05:00
diff --git a/doc/devel/coding_guide.rst b/doc/devel/coding_guide.rst
@@ -91,7 +91,7 @@ Backports
 When doing backports please include the branch you backported the
 commit to along with the SHA in a comment on the original PR.
 
-We do a backport from master to 2.x. assuming:
+We do a backport from master to v2.0.x assuming:
 
 * ``matplotlib`` is a read-only remote branch of the matplotlib/matplotlib repo 
 
@@ -102,12 +102,12 @@ backport.  This can be read off of the github PR page (in the UI with
 the merge notification) or through the git CLI tools.::
 
   git fetch matplotlib
-  git checkout v2.x
-  git merge --ff-only matplotlib/v2.x
+  git checkout v2.0.x
+  git merge --ff-only matplotlib/v2.0.x
   git cherry-pick -m 1 TARGET_SHA
   git log --graph --decorate  # to look at it
   # local tests? (use your judgment)
-  git push DANGER v2.x
+  git push DANGER v2.0.x
   # leave a comment on PR noting sha of the resulting commit
   # from the cherry-pick + branch it was moved to
 
