Update of /cvsroot/netrek/server/Vanilla
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5654

Modified Files:
Log Message:

Index: FAQ
RCS file: /cvsroot/netrek/server/Vanilla/FAQ,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FAQ	6 May 2006 12:09:32 -0000	1.1
+++ FAQ	7 May 2006 00:28:18 -0000	1.2
@@ -5,3 +5,37 @@
 2.  How do we get client keys?
 	crontab updated
+D1.  How do I update my darcs repo to pull in these changes?
+darcs pull
+This will pull in these changes from the repository you last did a get
+or pull from.  Chances are this is the repository you want.
+Remember there are multiple repositories, and they may not have the same
+changes.  That's the whole idea of decentralised development.  The
+netrek.org repository tracks CVS on SourceForge until 1st June 2006.  My
+public repository has some changes that are not and never will be in
+The changes you saw on the Netrek CVS mailing list are the changes made
+to CVS on SourceForge.  If these are the only changes you want in your
+darcs repository, then you should pull from only the netrek.org
+To make that explicit rather than having darcs default to the last used
+repository, add the URL of the repository to the end of the pull
+command, like so:
+darcs pull http://www.netrek.org/repos/netrek-server/
+Please read this section of the manual:
+Switching from CVS
+Darcs commands for CVS users