Merge branch 'master' of github.com:RichiH/vcsh

Conflicts:
	INSTALL

diff --git a/INSTALL b/INSTALL
index 498719124b50f120a5e03cd759647ec4a324960c..13f7b328825cfeed4fcc4729d8dca124fa744ca7 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -107,16 +107,14 @@ This is how my old setup procedure looked like. Adapt it to your own style or co
     sudo ln -s ~/work/git/vcsh/vcsh /usr/bin/local
     hash -r
 
-    # Grab my mr config. See below for details on how I set this up.
-    ~/work/git/vcsh/vcsh clone ssh://<remote>/mr.git
+Grab my mr config. see below for details on how I set this up
+
+    vcsh clone ssh://<remote>/mr.git
     cd ~/.config/mr/config.d/
     ln -s ../available.d/* .
 
-----------------
-
-# The old tutorial (?) #
 
-    # mr is used to actually retrieve configs, etc
+mr is used to actually retrieve configs, etc
 
     ~ % cat ~/.mrconfig
     [DEFAULT]

diff --git a/README b/README
index 5933b5abbd663310f9c75317746a06f0ac7c28d8..d52283d331a477c6498d82cbc392181a7a4ff927 100644 (file)
--- a/README
+++ b/README
@@ -3,10 +3,10 @@ vcsh - manage and sync config files via git
 vcsh allows you to have several git repositories, all maintaining their working trees in $HOME without clobbering each other.
 That, in turn, means you can have one repository per config set (zsh, vim, ssh, etc), picking and choosing which configs you want to use on which machine.
 
-It's been written for use with zsh, but it works with bash and even sh. Expect full support for /bin/sh soonish.
+vcsh was designed with mr [1] in mind so you might want to install that, as well.
 
 
-vcsh was designed with mr [1] in mind so you might want to install that, as well.
+Read INSTALL for detailed setup instructions.
 
 
 Questions? RichiH@{freenode,OFTC,IRCnet}