Branching and merging of the source and manual can happen at different times, just like with CVS.  The use of externals is different.  Externals will now be branched, instead of having CVS modules (form CVSROOT/modules) to checkout just a portion of the entire externals repository.
 
-<h1>Preliminary setup</h1>
+{section: Preliminary setup}
 
 There are a few one-time tasks you must do before actively develop with git.
 
-<h3>Adding git to your path</h3>
+{subsection: Adding git to your path}
 
-To use git, you don't need to set any environment variables, but you must add git to your path.  It isn't installed by default on the currently-supported CSL linux machines, just add /unsup/git/bin to the beginning of your path.  You may also choose to add /s/tcl-8.4.5/bin to your path so you can run the git GUI (aptly named git-gui).
+To use git, you don't need to set any environment variables, but you must add git to your path.  It isn't installed by default on the currently-supported CSL linux machines, just add =/unsup/git/bin= to the beginning of your path.  You may also choose to add =/s/tcl-8.4.5/bin= to your path so you can run the git GUI (aptly named git-gui).
 
-<h3>Tell git some things about you</h3>
+{subsection: Tell git some things about you}
 
 To make patches and diffs a bit more self-documenting, you should now tell git your email address and common name.
 
-<pre>
+{code}
 $ git config --global user.name "Your Name"
 $ git config --global user.email "your_login@cs.wisc.edu"
 # Season the following to taste
 $ git config --global core.editor "/usr/ucb/vi"
-</pre>
+{endcode}
 
-This edits the per-user git config file that is global across all repos.  git config edits the ~/.gitconfig file, which is a .ini style file.
+This edits the per-user git config file that is global across all repos.  git config edits the =~/.gitconfig file=, which is a .ini style file.
 
 On Windows you may also want to run:
 
-<pre>
+{code}
 git config --global core.autocrlf false
-</pre>
+{endcode}
 
 This stops git on Windows from changing the line endings.
-<p>
 
-Alternatively, if you do want to use <code>core.autocrlf</code>, then you should also enable <code>core.safecrlf</code>:
+Alternatively, if you do want to use =core.autocrlf=, then you should also enable =core.safecrlf=:
 
 <pre>
 git config --global core.autocrlf true