HTCondorWiki: Managing Condor Source Trees With Git

 
 The most common Condor use case is working on a feature all by yourself.  We can easily share this work later with others if need be, so don't worry about whether to choose this approach or the team approach described later.
 
-First, you'll want to make a branch for this work, so you'll need to decide where to branch from, either the development or stable series.  Let's say that you want to branch from the 7.0 branch, named =V7_0-branch=.  You'll need to name the branch, too.  This is a local name, so you need not worry about name collisions.  Let's call the branch GreatFeature.  For historical reasons (cough CVS), all of our released branches end in -branch, but there's no need to keep that convention for local branches.
+First, you'll want to make a branch for this work, so you'll need to decide where to branch from, either the development or stable series.  Let's say that you want to branch from the 7.0 branch, named =V7_0-branch=.  You'll need to name the branch, too.  This is a local name, so you need not worry about name collisions.  Let's call the branch {quote:GreatFeature}.  For historical reasons (cough CVS), all of our released branches end in -branch, but there's no need to keep that convention for local branches.
 
 {code}
 # Checkout your local 7.0 branch, the one that tracks the central
@@ -320,16 +320,16 @@
 
 {subsection: Update the version string}
 
-Third, and finally, you should fix the version string on your new branch.  You do this by editing =src/condor_c++_util/condor_version.C= on your new branch.  The exact version you decide on is up to you, but as always you should only change the "comment" portion of he version string, i.e. anything after =__DATE__= and before =$=. For example, if the old version string (on the V6_5-branch) looked something like =static char* CondorVersionString = "$CondorVersion: 6.5.3 " __DATE__ " $";= you might choose =static char* CondorVersionString = "$CondorVersion: 6.5.3 " __DATE__ " PRE-RELEASE-UWCS $";=.
+Third, and finally, you should fix the version string on your new branch.  You do this by editing =src/condor_c++_util/condor_version.C= on your new branch.  The exact version you decide on is up to you, but as always you should only change the "comment" portion of he version string, i.e. anything after =__DATE__= and before =$=. For example, if the old version string (on the V6_5-branch) looked something like =static char* {quote:CondorVersionString} = "$CondorVersion: 6.5.3 " __DATE__ " $";= you might choose =static char* {quote:CondorVersionString} = "$CondorVersion: 6.5.3 " __DATE__ " PRE-RELEASE-UWCS $";=.
 
 {code}
 # Checkout the new branch
 $ git checkout V7_1-GreatFeature-branch
 
-# Fix src/condor_c++_util/condor_version.C
+# Fix src/condor_c++_util/condor_version.cpp
 
 # Commit your change
-$ git commit src/condor_c++_util/condor_version.C
+$ git commit src/condor_c++_util/condor_version.cpp
 $ git push
 {endcode}