* cvs-server.txt: updated instructions

diff --git a/ChangeLog b/ChangeLog
index e19713e30b6b41636fa9c54bae0da664ba5ec3db..898b0cafa3c298c791dc8357c2c30e27550e2393 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-19  Erez Zadok  <ezk@cs.sunysb.edu>
+
+       * cvs-server.txt: updated instructions
+
 2004-01-18  Erez Zadok  <ezk@cs.sunysb.edu>
 
        * minor new port: i386-unknown-freebsd5.2.

diff --git a/cvs-server.txt b/cvs-server.txt
index 0943963082cb95f92cb5fb39e1fc280aaa952d19..cd11ef10dc08732d34a8633bd29804c449f76d6f 100644 (file)
--- a/cvs-server.txt
+++ b/cvs-server.txt
@@ -1,25 +1,25 @@
 ##############################################################################
 Here are generic CVS server instructions:
 
-(1) Login to the cvs server.  Not needed more than once b/c the cvs login
-    will record your cvs password in $HOME/.cvspass.  Change "ezk" for your
-    CVS user id.
-
-$ cvs -d :pserver:ezk@shekel.mcl.cs.columbia.edu:/proj/bank/cvsroot login
-CVS password:
-
-Type in your password, crypt(3)'ed in /proj/bank/cvsroot/CVSROOT/passwd.
+(1) Get an SSH Public key installed on cvs.am-utils.org.  You can generate a
+    public/private key pair using ssh-keygen(1).  Then copy the key into
+    your ~/.ssh/authorized_keys file on cvs.am-utils.org.  If you don't have
+    login access on cvs.am-utils.org, then email
+    am-utils-developers@am-utils.org.
 
 (2) Then, check out a fresh copy of 6.1 (experimental)
 
-$ cvs -d :pserver:ezk@shekel.mcl.cs.columbia.edu:/proj/bank/cvsroot checkout am-utils
+$ export CVS_RSH=ssh
+$ cvs -d ${USER}@cvs.am-utils.org:/home/cvsroot checkout am-utils
 
-Or, to checkout the stable branch:
+    Or, to checkout the stable branch:
 
-$ cvs -d :pserver:ezk@shekel.mcl.cs.columbia.edu:/proj/bank/cvsroot checkout -r amd-6-0-stable am-utils
+$ cvs -d ${USER}@cvs.am-utils.org:/home/cvsroot checkout -r amd-6-0-stable am-utils
 
-(3) Then you can do normal edit, commit, update, etc. w/o having to worry
-    about your $CVSROOT or the -d option.
+(3) Then you can do normal edit, commit, update, etc. without having to
+    worry about your $CVSROOT or the -d option.  Just remember to keep
+    setting CVS_RSH=ssh in your environment (or put it in your
+    .profile/.login file).
 
 ##############################################################################
 To merge changes from the stable branch into the main (experimental) branch:
@@ -28,16 +28,7 @@ $ cvs update -j amd-6-0-stable -kk
 
 - don't worry about all the files that change; it's probably because of cvs
   keywords in the sources
-- after the merge, do a 'cvs update -d' and resolve any conflicts
 
-##############################################################################
-
-There are two new mailing lists:
-
-amd-maintainers@shekel.mcl.cs.columbia.edu: for Amd maintainers to
-       communicate internally w/o exposure to the greater user community.
+- after the merge, do a 'cvs update -d' and resolve any conflicts
 
-amd-cvslog@shekel.mcl.cs.columbia.edu: to get cvs log messages.  I've used a
-       better (I hope) script for loginfo.  It provides different output
-       and can be tweaked as well.
 ##############################################################################