Merge branch 'master' into next

diff --combined INSTALL
index e2e7ac97b307162af92093e3cce62a266f81a271,09a2616f3842508625fab3d6e11fc50b3fcc023c..47709ccfcd4c3ee3f2bf720bf9a9f85cf493a533
--- 1/INSTALL
--- 2/INSTALL
+++ b/INSTALL
@@@ -56,11 -56,12 +56,12 @@@ as user foo, and that you want to conne
  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.
  
@@@ -69,7 -70,7 +70,7 @@@ with the command
  
        key=~/.paraslash/key.$LOGNAME
        mkdir -p ~/.paraslash
 -      (umask 077 && openssl genrsa -out $key)
 +      (umask 077 && openssl genrsa -out $key 2048)
  
  Next, extract its public part: