--- projects/cms/documentation/papers/cvs-2.txt	2000/11/01 00:50:42	1.1
+++ projects/cms/documentation/papers/cvs-2.txt	2000/11/15 20:03:48	1.3
@@ -1,8 +1,23 @@
 Using CVS (part 2)
 ==================
 
-tdb1, 29/10/00.
+Contents
+--------
+ - Errata to "Using CVS (part 1)"
+   - Setting up CVS on a Public PC (with WinCVS/SSH)
+   - Setting up CVS off campus/SSB (with WinCVS/SSH)
+   
+ - How CVS handles binary files
+ - Tagging the Repository
+ - Branching in CVS
+ - Keyword Expansion
+ - Online CVS Resources
+ 
+ - See "Using CVS (part 1)" for basic information on setting 
+   up and using CVS at UKC.
 
+   tdb1, 29/10/00.
+
 Errata to "Using CVS (part 1)"
 ------------------------------
 Setting up CVS on a Public PC (with WinCVS/SSH)
@@ -62,6 +77,81 @@ you've already done the rest of the setup from the las
 document you should be able to do a checkout as normal, but 
 this time without the need for a mapped drive - which is a 
 much neater way of doing things.
+
+Setting up CVS off campus/SSB (with WinCVS/SSH)
+-----------------------------------------------
+To do this you'll need two packages. Firstly, and most 
+obviously WinCVS. The latest version of WinCVS (1.1b16) can 
+be downloaded from the "WinCvs 1.1 *BETA* / Client + Local / 
+Binaries" on the following page;
+
+http://www.wincvs.org/download.html
+
+Secondly you'll require SSH. I'm not sure where this package 
+orginated, but there is a current version on raptor at;
+
+/usr/local/proj/co600_10/sshwin32/ssh-1.2.14-win32bin.zip
+
+Armed with those two files you're ready to go. To get 
+started we need to get ssh installed, and a key setup with 
+raptor.
+
+Installing ssh is easy. Simply extract the contents of the 
+zip file in to your windows\system32 directory (on 
+winnt/win2k - windows\system on win9x). This will put the 
+DLL's in place and the binary ssh files.
+
+Next, setting up a key. This requires a few straightforward 
+steps.
+
+ - setup a directory to be considered your "home folder" and 
+   then ensure that the environment variable HOME is pointed 
+   at this directory. Then make a directory called .ssh 
+   within this.
+
+ - telnet into raptor and run this command;
+     ssh-keygen -f ssh-newkey -q -P '' -C '<user> on NT'"
+   
+   make sure you change <user> for your userid, and that you 
+   notice the difference between the single quote ' and the 
+   double quotes ".
+
+ - using ftp (or by any other means) copy the files named 
+   ssh-newkey and ssh-newkey.pub to the .ssh folder you made 
+   on your machine. Now rename them to identity and 
+   identity.pub respectively.
+
+ - Finally we need to get the contents of the identity.pub 
+   file above into the file ~/.ssh/authorized_keys on 
+   raptor. The easiest way to do this is to type the 
+   following;
+     cat ssh-newkey.pub >> .ssh/authorized_keys
+     
+   This assumes you didn't delete the ssh-newkey files, and 
+   that you are in your home folder. Finally, you can delete 
+   the ssh-newkey and ssh-newkey.pub files from raptor.
+
+Now, to test this setup you should try the following from a 
+command prompt;
+
+ssh -l <userid> raptor.ukc.ac.uk
+
+If everything has completed successfully you should now be 
+looking at a raptor prompt. If not... then work out why not!
+
+Right, now on to WinCVS. This is now a doddle. In the 
+preferences set the CVSROOT to;
+
+:ext:<user>@raptor.ukc.ac.uk:/usr/local/proj/co600_10/cvs
+
+Set Authentication to SSH server, and set the RSA identity 
+to your identity file (not the .pub one). Finally set the 
+browser directory to a suitable location and try checking 
+something out. If all has worked an SSH window should pop up 
+at the bottom of the screen and the files should appear.
+
+As a final note, turning TCP/IP compression on may make it 
+quicker over a modem.
 
 How CVS handles binary files
 ----------------------------