From 5629f1cecff9337af1bc5bce74417ff48c3c3bad Mon Sep 17 00:00:00 2001
From: vivekv <>
Date: Sun, 25 Aug 2002 03:29:40 +0000
Subject: [PATCH] version 0.5 ready for publishing

---
 .../CVS-BestPractices/cvs-bestpractices.xml   | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/LDP/ref/docbook/CVS-BestPractices/cvs-bestpractices.xml b/LDP/ref/docbook/CVS-BestPractices/cvs-bestpractices.xml
index ea94acf8..526f91a3 100644
--- a/LDP/ref/docbook/CVS-BestPractices/cvs-bestpractices.xml
+++ b/LDP/ref/docbook/CVS-BestPractices/cvs-bestpractices.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0"?>
 
+<!-- $Id$ -->
+
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 	
 "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
 
@@ -67,10 +69,10 @@
 
 <revision>
 <revnumber>0.5</revnumber>
-<date>2002-06-30</date>
+<date>2002-08-25</date>
 <authorinitials>vv</authorinitials>
-<revremark>Adding references to other CVS sources and some server side
-scripting</revremark>
+<revremark>Fixed some more errors in the document and added references to
+other CVS sources and some server side scripting</revremark>
 </revision>
 
 <revision>
@@ -256,6 +258,8 @@ paper in no particular order are.
 <listitem> <para>Jorgen Grahn </para> </listitem>
 
 <listitem> <para>Thomas S. Urban </para> </listitem>
+<listitem> <para>Cam Mayor </para> </listitem>
+<listitem> <para>Sally Miller</para> </listitem>
 
 </orderedlist>
 </para>
@@ -982,7 +986,7 @@ levels have started to come in.  </para>
 
 <para>Now, we are ready for business.  Let us examine the bug fixes and
 enhancements track.  Assume that there are three bugs of which two are of a
-high priority that should be fixed away (possibly within a week) and the
+high priority that should be fixed right away (possibly within a week) and the
 third can be delivered after some time (say after 4 weeks).  In the
 middle of this schedule there is a regular release scheduled in three weeks.
 Considering that we have a busy month ahead, let us see how exactly we can
@@ -1012,7 +1016,7 @@ The bug fix team will check out using the command line
 </para>
 </listitem>
 <listitem>
-<para>The team that is working on the next team will use the command line
+<para>The team that is working on the next release will use the command line
 </para>
 <para>
 <command>cvs checkout -R {project name}</command>
@@ -1020,16 +1024,21 @@ The bug fix team will check out using the command line
 </listitem>
 </orderedlist>
 
-<para> As soon as the bug fix team completes the two top priority bugs,
-they will update and commit their changes to the bug fix branch using the command
-line
-<literallayout>
+<para> As soon as the bug fix team completes the two top priority bugs, they
+will update, verify a successful build and commit their changes to the bug
+fix branch using the command line
+</para>
 <command>
 cvs update -R -r release_1_0_patches {module name}
+</command>
+
+<para>The team should perform a build at this point to verify that the
+update did not break any code on the branch.  Once the build is successful,
+the branch should be committed back into the repository.  </para>
+
+<command>
 cvs commit -R -r release_1_0_patches {module name}
 </command>
-</literallayout>
-</para>
 
 <para>Now, the regular process of build-test-build is followed to make a
 	version ready for delivery.  The final version of the source code is