Merge branch 'master' into next

diff --git a/INSTALL b/INSTALL
index e2e7ac97b307162af92093e3cce62a266f81a271..47709ccfcd4c3ee3f2bf720bf9a9f85cf493a533 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -56,11 +56,12 @@ as user foo, and that you want to connect from client_host as user bar.
 As foo@server_host, create ~/.paraslash/server.users by typing the
 following commands:
 
+       user=bar
        target=~/.paraslash/server.users
-       key=~/.paraslash/key.pub.$LOGNAME
+       key=~/.paraslash/key.pub.$user
        perms=AFS_READ,AFS_WRITE,VSS_READ,VSS_WRITE
        mkdir -p ~/.paraslash
-       echo "user $LOGNAME $key $perms" >> $target
+       echo "user $user $key $perms" >> $target
 
 This gives "bar" the full privileges.