Uniformize the cvs download instructions with the ones on WineHQ.

documentation/getting.sgml

@@ -474,64 +474,23 @@
         </sect3>
 
         <sect3>
-          <title>Configuring Wine-specific CVS settings</title>
-
-          <para>
-            First, you should do a
-          </para>
-  <screen>
-  <prompt>$ </><userinput>touch ~/.cvspass</>
-  </screen>
-          <para>
-            to create or update the file <filename>.cvspass</filename> in
-            your home directory, since CVS needs this file (for password
-	    and login management) and will complain loudly if it doesn't exist.
-          </para>
-
-          <para>
-            Second, we need to create the file
-            <filename>.cvsrc</filename> in your home directory
-            containing the CVS configuration settings needed for a valid
-            Wine CVS setup (use CVS compression, properly update file and
-            directory information, ...).
-            The content of this file should look like the following:
-            <programlisting>
-cvs -z 3
-update -PAd
-diff -u
-checkout -P
-            </programlisting>
-            Create the file with an <glossterm>editor</glossterm>
-            of your choice, either by running
-  <screen>
-  <prompt>$ </><userinput>&lt;editor&gt; ~/.cvsrc</>
-  </screen>
-            , where &lt;editor&gt; is the editor you want to use (e.g.
-            <command>joe</command>, <command>ae</command>,
-            <command>vi</command>),
-            or by creating the file <filename>.cvsrc</filename> in your
-            home directory with your favorite graphical editor like nedit, kedit,
-            gedit or others.
-          </para>
-        </sect3>
-
-	<sect3>
 	  <title>Downloading the Wine CVS tree</title>
 
 	  <para>
-	    Once CVS is installed and the Wine specific CVS
-	    configuration is done, you can now do a login on our CVS
+	    Once CVS is installed, you can now do a login on our CVS
 	    server and checkout (download) the Wine source code.
 	    First, let's do the server login, to connect to the US server:
 	  </para>
 	  <screen>
-  <prompt>$ </><userinput>cvs -d :pserver:cvs@cvs.winehq.org:/home/wine login</>
+  <prompt>$ </><userinput> export CVSROOT=:pserver:cvs@cvs.winehq.org:/home/wine</>
+  <prompt>$ </><userinput> cvs login</>
   </screen>
   <para>
   To connect to the EU server:
   </para>
   <screen>
-  <prompt>$ </><userinput>cvs -d :pserver:cvs@rhlx01.fht-esslingen.de:/home/wine login</>
+  <prompt>$ </><userinput>export CVSROOT=:pserver:cvs@rhlx01.fht-esslingen.de:/home/wine</>
+  <prompt>$ </><userinput>cvs login</>
   </screen>
 	  <para>
 	    If <command>cvs</command> successfully connects to the CVS server,
@@ -548,17 +507,10 @@ checkout -P
 	    directory, since the subdirectory is named after the CVS module
 	    that we want to check out). We assume that your current directory
 	    might be your user's home directory.
-	    To download the Wine tree into the subdirectory <filename>wine/</filename>, run,
-	    to download from the US server:
+	    To download the Wine tree into the subdirectory <filename>wine/</filename>, run:
 	  </para>
   <screen>
-  <prompt>$ </><userinput>cvs -d :pserver:cvs@cvs.winehq.org:/home/wine checkout wine</>
-  </screen>
-  <para>
-  Or, to download from the EU server:
-  </para>
-  <screen>
-  <prompt>$ </><userinput>cvs -d :pserver:cvs@rhlx01.fht-esslingen.de:/home/wine checkout wine</>
+  <prompt>$ </><userinput> cvs -z3 checkout wine</>
   </screen>
 	  <para>
 	    Downloading the CVS tree might take a while (some minutes
@@ -579,7 +531,7 @@ checkout -P
   <prompt>$ </><userinput>cd <replaceable>&lt;some_dir&gt;</></>
   </screen>
 	  <para>
-	    , where &lt;some_dir&gt; is the directory that
+	    where &lt;some_dir&gt; is the directory that
 	    <command>pwd</command> gave you.
 	    By running
 	  </para>
@@ -587,7 +539,7 @@ checkout -P
   <prompt>$ </><userinput>cd wine</>
   </screen>
 	  <para>
-	    , you can now change to the directory of the Wine CVS tree
+	    you can now change to the directory of the Wine CVS tree
 	    you just downloaded. Since you now have a fully working Wine
 	    source tree by having followed the steps above, you're now
 	    well-prepared to go to the Wine installation and configuration
@@ -612,14 +564,7 @@ checkout -P
 	</para>
   <screen>
   <prompt>$ </><userinput>make distclean</>
-  <prompt>$ </><userinput>cvs -d :pserver:cvs@cvs.winehq.org:/home/wine update</>
-  </screen>
-  <para>
-  or if you're using the EU server:
-  </para>
-  <screen>
-  <prompt>$ </><userinput>make distclean</>
-  <prompt>$ </><userinput>cvs -d :pserver:cvs@rhlx01.fht-esslingen.de:/home/wine update</>
+  <prompt>$ </><userinput>cvs update -PAd</>
   </screen>
 	<para>
 	  The <command>make distclean</command> part is optional, but