Updated to use Bochs 2.6.11

[pintos-anon] / doc / devel.texi

diff --git a/doc/devel.texi b/doc/devel.texi
index ea024c164404d280f4e520ac4301e1d13407d037..588f1857474ca5b109d4f63b543b968c64ff2e36 100644 (file)
--- a/doc/devel.texi
+++ b/doc/devel.texi
@@ -6,12 +6,18 @@ Here are some tools that you might find useful while developing code.
 @menu
 * Tags::
 * cscope::
-* CVS:: @ifset recommendsourceforge 
-* SourceForge:: @end ifset 
+@ifset recommendcvs
+* CVS::
+@end ifset
+@ifset recommendgit
+* Git::
+@end ifset
 @ifset recommendvnc
-* VNC:: @end ifset 
+* VNC::
+@end ifset 
 @ifset recommendcygwin
-* Cygwin:: @end ifset
+* Cygwin::
+@end ifset
 @end menu
 
 @node Tags
@@ -57,6 +63,20 @@ Emacs and some versions of @command{vi} have their own interfaces to
 visit @url{http://cscope.sourceforge.net, the @command{cscope} home
 page}.
 
+@ifset recommendgit
+@node Git
+@section Git
+
+It's crucial that you use a source code control system to manage your
+Pintos code. This will allow you to keep track of your changes
+and coordinate changes made by different people in the project. For this
+class we recommend that you use Git; if you followed the instructions on
+getting started, a Git repository will already have been created for you.
+If you don't already know how to use Git, we recommend that you read
+the @uref{http://git-scm.com/book, , Pro Git} book online.
+@end ifset
+
+@ifset recommendcvs
 @node CVS
 @section CVS
 
@@ -77,18 +97,6 @@ For more information, visit the @uref{https://www.cvshome.org/, , CVS
 home page}.
 
 @include localcvsinstructions.texi
-
-@ifset recommendsourceforge
-@node SourceForge
-@section SourceForge
-
-SourceForge is a web-based system for facilitating software
-development.  It provides you with a version-control system (typically
-CVS, as described above) and other tools for tracking your software.
-You can use it to store files, track bugs, and post notes about
-development progress.  You can set up your own
-project in SourceForge at @uref{http://sourceforge.net, ,
-sourceforge.net}.
 @end ifset
 
 @ifset recommendvnc