# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: thomas.r.martin@gmail.com-20081224024522-\
#   hzc29j18zaa62zcx
# target_branch: http://bazaar.launchpad.net/%7Eubuntu-core-\
#   doc/ubuntu-doc/ubuntu-intrepid/
# testament_sha1: c87dded26f8de46ae31c1e7aeb6b2b4b31622df5
# timestamp: 2008-12-23 20:45:54 -0600
# base_revision_id: mdke@ubuntu.com-20081123121031-qm94f4uo5yoodlfw
# 
# Begin patch
=== modified file 'serverguide/C/vcs.xml'
--- serverguide/C/vcs.xml	2008-07-13 05:11:32 +0000
+++ serverguide/C/vcs.xml	2008-12-24 02:45:22 +0000
@@ -388,9 +388,7 @@
         <sect2 id="cvs-installation" status="review">
           <title>Installation</title>
             <para>
-              At a terminal prompt, enter the following command to install
-              <application>cvs</application>:
-
+              To install <application>CVS</application>, run the following command from a terminal prompt:
 <screen>
 <command>sudo apt-get install cvs</command>
 </screen>
@@ -448,7 +446,7 @@
 can start the cvs server by running following command:
 
 <screen>
-<command>sudo /etc/init.d/xinetd start</command>
+<command>sudo /etc/init.d/xinetd restart</command>
 </screen>
             </para>
             <para>

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVkP/FEAAZjfgAAQUWf//1oC
DQC////wUAOWzuD3l4HuvbzCSSamjU2EmY0TJNNplHqnpPU00NDygSSI01PRkp5qn6RT9UaGgeo0
HqaBpowlNETTU0nqZA0yAaGgMh6hoAbVT1J6JtGoCaM0AAQyMAAJJKntJjFPRQeo8oHqZAAYQNNM
ceRZvv4lq4Xpkyi1aSfjegjcw7rNr0/vlmU5yYZE9YbZUFyCyKEo9vLDuWj0x7DDL+1N6IW1Y5zj
BF0viI1sbrO+d180OOfKds+iTo64kFvIohg3KcjEUvJUu3zgsE+iSMGFZqS7CKDqNO5F3nyrhRVj
4JW+LnbUFukjUSKpgTTDrCba9A5S4e41APhOQSrVGJCgfAgsVcK9bssTOU9PAvh3ntOpdNJEDMpX
CG8z+i1H5HzzxilRCzoJ1bCwuQoCxE44iYVjIsnCrtEIRTlkPOBcOwKrt7r4Moi6ol3inKOQ0BT7
TdOTuRoaK47lptsdL9NXCwKcSajHI+ifqF1C8UyetDsUTQgWHupo+qiVuOCMjk9ZRWCE1YD6Reoj
CqTiY3MqC8feWlo4tHi7ZFULacRhk+BaE7TWjYZFvobwRm0qzdF0xadqHXLg61d8puWCT2SgCGuQ
I+b74T/YoptL6tVhXa5birAaDOZjIDQbxRG5XRLwySn5TcNve9Tw988RVLdmQEzv2mSp8zEiM7vu
jgh00haLEmCUsIhxJY++l3ukRQg7epRXyNQ3rJtctCcqx0omJqizec3L2XCl31ib9cDm5xLTIe5+
VVcQ16AkJX8H9MeI16YTdKNXo0A9rjcpDCpwGlPpzXUrJyIbIrHkZKZYZTsFSb1uT+uIndkv75G8
Gzh4MlX8CoCK2caW//I0FpsSgoluZK7mHzNlx07O90b4BrGDmBt2Tvp4itNCpB9OleSWpTjEp8qR
bPubDFGI09DYED+BwYij/yqCwU2VK/EPClo9gsqYdmk4PoIHBEOz8z8DLUCExRhjLY9XXDyvI5r4
LaESTTIV3cRielVIMPprnxaW21lcYB1yPim2LSlIbhzWSwlmt0nKYc/XAWsyfue9NFaVZ6XZJoMT
TEB1tSCqdpM2doqJaThbEYgNQnljWMUh9NZhXLsxoHlmRnRAdXKSrbdxmhNxSHjASGTohJLgZQZD
iCLvMNOa+nBHsqNOV1zTUbASWu4sOxXqGjM3h+E35FxzF0FxPhLyF3JFOFCQWQ/8UQ==