X-Git-Url: http://erislabs.net/gitweb/?p=mir.git;a=blobdiff_plain;f=scripts%2Fmir-setup%2FREADME;h=c1c2c63168835990860dda047857a835d4b4339c;hp=8f81d2c3eb9d7e0d2f99ae49f07a9bd1c36c90b7;hb=0f54d72eb8bb97dc1d23c2ce0744767a4de0aeb9;hpb=665dae34ac91e19dfcb4d2330ac6e1a9280ac0f5

diff --git a/scripts/mir-setup/README b/scripts/mir-setup/README
index 8f81d2c3..c1c2c631 100755
--- a/scripts/mir-setup/README
+++ b/scripts/mir-setup/README
@@ -1,4 +1,4 @@
-$Id: README,v 1.1.2.1 2006/11/11 12:52:05 zak Exp $
+$Id: README,v 1.1.2.2 2009/01/18 04:28:49 ianb Exp $
 
 The mir-setup script was developed initially on pulp (the
 UK development server) and then on traven. It hasn't been
@@ -10,7 +10,7 @@ for more information on setting up sites with this script.
 
 The files in this directory should be installed as follows:
 
-mir/scripts/
+mir/scripts/mir-setup/
   mir-setup              ->   /usr/local/sbin/
   munge_config_file.pl   ->   /usr/local/share/mir-setup/
   conf/*                 ->   /etc/mir-setup/
@@ -19,5 +19,15 @@ If you choose different locations (for example running the
 script direct from the CVS checkout, you'll need to modify CONFDIR
 (in mir-setup itself) and/or SHAREDIR (in conf/config) accordingly.
 
+If you run ./mir-prepare direct from the mir/scripts/mir-setup/
+directory of the source tree, it will install and configure apache,
+java, tomcat, etc. ready for you to set up sites with mir-setup. It
+will also install mir-setup as detailed above.
+
+mir-prepare and the config files in conf/ assume you are using tomcat5.5.
+If you are still using tomcat4, use the config files in conf/tomcat4,
+and beware that mir-prepare may need changes. mir-setup should
+still work with tomcat4.
+
 Note that this script has only been used with the MIR_1_1 branch so
 far.