HTCondorWiki: Source Code Branches

 
 *: Code that implements new features or non-urgent bug fixes, aka code targeted for v8.5, should go into the *master* branch.
 
-*: {strike}Urgent bug fixes to developer release candidate go into *V8_5_0-branch, but only with permission of the wrangler*. They should then be merged into *master*. {linebreak} V8_5_0-branch is *frozen*, and requests to commit to this branch will probably be denied{endstrike}
+*: Urgent bug fixes to developer release candidate go into *V8_5_0-branch, but only with permission of the wrangler*. They should then be merged into *master*. {linebreak} {strike}V8_5_0-branch is *frozen*, and requests to commit to this branch will probably be denied{endstrike}
 
 *: Serious bug fixes to stable series features MAY go into *V8_2-branch*, or the *V8_4_0-branch* - discussion with wrangler is needed to decide which. _ALL COMMITS TO A STABLE BRANCH {wiki: PerformingCodeReviews MUST BE CODE REVIEWED}_ - the ticket should show who did the code review. Commits should then be merged into
-*:: *V8_4_0-branch* with permission of the wranger,and/or
-*:: *V8_4-branch*
+*:: *V8_4-branch* with permission of the wranger,and/or
+*:: *V8_5_0-branch*
 *:: *master*, as above.
 
 *: If code needs to be reviewed before pushing, then you should use "git format-patch" to create a patch, and attach it to the ticket. If it's a larger change, you should put it into a topic branch instead.