There will be frequent exceptions. Try not to violate this rule too often, and if you do, feel a little bit guilty about it.
 
+{subsection: Making the branch}
+
+{code}
+# Lets decide on the name "V7_1-GreatFeature-branch". This means we
+# are going to branch from the end of V7_1-branch, so you should make
+# sure it is known to build on all platforms and pass all tests.
+$ git branch V7_1-GreatFeature-branch master
+
+# Now push that new branch to the central repository so everyone can
+# see it
+$ git push origin V7_1-GreatFeature-branch
+
+# You now have a local and central branch named V7_1-GreatFeature-branch,
+# but the local branch is not tracking the central branch, so "git
+# pull" won't get other peoples changes to the branch. Let's fix that
+# by recreating the local branch so that it tracks the central branch
+$ git branch -f V7_1-GreatFeature-branch origin/V7_1-GreatFeature-branch
+{endcode}
+
 {subsection: Document the branch name}
 
-You must add a description of the new branch {wiki: GitBranchDescriptions here}. The description should include the name of the person who created or is responsible for the branch, the date, where the new branch came from, what it is for, and any plans for when/where it's going to be merged back into (if we know them).
+You must add a description of the new branch at GitBranchDescriptions. The description should include the name of the person who created or is responsible for the branch, the date, where the new branch came from, what it is for, and any plans for when/where it's going to be merged back into (if we know them).
+
+An example for a tag is:
+
+{code}
+*3/2/2010 V7_5_1* {linebreak}
+The offical tag for 7.5.1, from the V7_5_1-branch.
+Version string: $CondorVersion: 7.5.1 Mar 1 2010 BuildID: 220663 $
+Original build tag: BUILD-V7_5_1-branch-2010-2-28_2
+{endcode}
+
+An example for a branch is:
+
+{code}
+*3/29/2010 V7_5_2-branch* {linebreak}
+Branch for 7.5.2 release, created from BUILD-trunk-2010-3-27.
+{endcode}
+
+Please follow the markup style of the nearby entries.
 
 {subsection: Document merge strategy}
 
@@ -64,7 +101,7 @@
 
 {subsubsection: old world order}
 
-The applies to 7.4 and early 7.5.x releases. It is not longer used.
+The applies to 7.4 and early 7.5.x releases. It is no longer used, but this is kept just in case we need a new branch, say for an urgent security fix, for 7.2 or 7.4.
 
 Once you've got a workspace that has the sticky-bit set pointing to
    your new branch, you should modify the version string in