diff ec73849b6936d839410ccb239d14b2f7c7ca3d6f uncommitted
--- a/lib/namespace
+++ b/lib/namespace
@@ -43,3 +43,10 @@
 . /lib/namespace.local
 . /lib/namespace.$sysname
 . /cfg/$sysname/namespace
+
+bind -c /usr/glenda /n/fossil/usr/glenda
+bind -c /n/fossil/usr/ /usr/
+bind -c /n/other/usr/$user/tmp /usr/$user/tmp
+bind -c /usr/$user/tmp /tmp
+
+cd /usr/$user
--- a/rc/bin/fshalt
+++ b/rc/bin/fshalt
@@ -24,6 +24,10 @@
 bind -c '#s' /srv
 bind '#p' /proc
 
+# start venti flushing
+venti/sync -h localhost >[2]/dev/null &
+venti/sync  >[2]/dev/null &
+
 unmount /mnt/consoles >[2]/dev/null
 kill consolefs | rc			# don't compete with /mnt/consoles
 sleep 1
@@ -30,12 +34,31 @@
 
 c=`{ls /srv/cwfs*cmd >[2]/dev/null}
 h=`{ls /srv/hjfs*cmd >[2]/dev/null}
-e=`{ls /srv/ext4*cmd >[2]/dev/null}
-s=`{awk '/^sd./ {print substr($1,3,1)}' '#S/sdctl' >[2]/dev/null}
+f=`{ls /srv/fscons*>[2]/dev/null}
 
 # for scram, don't scram other systems
 bind -b '#P' /dev >[2]/dev/null
+if(! ~ $reboot yes){
+	if (test -e '#P'/apm)
+		scram=yes
+	if (test -e '#P'/acpitbls -a -e '#P'/iow)
+		scram=yes
+}
 
+echo -n syncing...
+for(i in $f) @ {
+	echo -n $i...
+	echo fsys all sync >>$i
+}
+
+# flush the last bit of possible fossil traffic
+if (ls /srv | grep -s fossil) {
+	echo -n venti...
+	venti/sync -h localhost >[2]/dev/null &
+	venti/sync  >[2]/dev/null &
+	sleep 5
+}
+
 # halting (binaries we run can't be on the fs we're halting)
 ramfs
 builtin cd /tmp
@@ -73,6 +96,12 @@
 		while(test -e $i)
 			sleep 1
 	}
+	for(i in $f) @ {
+		echo -n $i...
+		echo fsys all halt >>$i
+		sleep 2
+	}
+
 	echo
 	echo done halting
 
--- a/rc/bin/service/telcodata
+++ b/rc/bin/service/telcodata
@@ -1,3 +1,15 @@
 #!/bin/rc
-echo This is the plan 9 incoming fax line.
-echo Please do not make data calls to us.
+
+fn sigint {
+}
+
+fn sighup {
+	echo kill > /proc/$pid/note
+}
+
+while () {
+	echo -n user:
+	user=`{read -n 1}
+	if (~ $#user 1)
+		auth/login $user
+}
--- a/rc/bin/termrc
+++ b/rc/bin/termrc
@@ -93,9 +93,4 @@
 if(test -f /dev/apm)
 	aux/apm
 
-if(~ $terminal *reform*){
-	reform/pm
-	reform/audio
-}
-
-dontkill '^(ipconfig|factotum|mntgen|venti|hjfs|kfs|cfs|cwfs.*|9660srv|dossrv|paqfs|cs|dns|listen|reboot|usbd|kb|disk|ether|wpa)$'
+dontkill '^(ipconfig|factotum|mntgen|venti|hjfs|kfs|cfs|cwfs.*|9660srv|dossrv|paqfs|cs|dns|listen|reboot|usbd|kb|disk|ether|wpa|fossil)$'
--- a/sys/man/1/git
+++ b/sys/man/1/git
@@ -230,7 +230,7 @@
 .B -b
 option will cause the repository to be initialized as a bare repository.
 Passing the
-. -u
+.B -u
 .I upstream
 option will cause the upstream to be configured to
 .I upstream.
--- a/sys/man/6/keyboard
+++ b/sys/man/6/keyboard
@@ -25,6 +25,15 @@
 .B Caps
 .B Lock
 acts as an additional control key.
+To make it work like an actual
+.B Caps
+.B Lock
+key ou can get it with:
+.PP
+.RS
+.L
+echo none 58 63588 >/dev/kbmap
+.RE
 .PP
 The delete character
 .RB ( 0x7F )
--- a/sys/src/9/boot/nusbrc
+++ b/sys/src/9/boot/nusbrc
@@ -5,7 +5,7 @@
 mkdir -p -m 700 '#σc/usb'
 mkdir -p -m 700 '#σc/usbnet'
 
-if(! nusb/usbd)
+if(! nusb/usbd -d)
 	exit
 
 @{
@@ -71,7 +71,7 @@
 		devs='#σc/sdU'^($1 $5)
 		rm -rf '#σc/usb/'^$1.* '#σc/usb/'^$5.hid '#σc/usbnet/'^$1.* $devs $devs.*
 	}
-	rc < '#σ/usb/usbevent' &
+	rc -x < '#σ/usb/usbevent' &
 }
 
 # usbd removes this file once all devices have been enumerated
--- a/sys/src/9/ip/devip.c
+++ b/sys/src/9/ip/devip.c
@@ -816,7 +816,7 @@
 }
 
 /* 
- *  find a unused loacal port for a protocol.
+ *  find a unused local port for a protocol.
  *
  *  p needs to be locked
  */
--- a/sys/src/cmd/aux/getflags.c
+++ b/sys/src/cmd/aux/getflags.c
@@ -5,7 +5,7 @@
 void
 usage(void)
 {
-	print("status=usage\n");
+	fprint(2, "status=usage\n");
 	exits(0);
 }
 
--- a/sys/src/cmd/aux/vga/igfx.c
+++ b/sys/src/cmd/aux/vga/igfx.c
@@ -837,7 +837,7 @@
 			dpll = igfx->pipe[x].dpll;
 			/* enable pll */
 			dpll->ctrl.v = 1<<31;
-			/* LCPLL 2700 (non scc) reference */
+			/* LCPLL 2700 (non ssc) reference */
 			dpll->ctrl.v |= 3<<28;
 
 			genwrpll(freq, &n2, &p1, &r2);
--- a/sys/src/cmd/cmp.c
+++ b/sys/src/cmd/cmp.c
@@ -127,6 +127,6 @@
 static void
 usage(void)
 {
-	print("usage: cmp [-lLs] file1 file2 [offset1 [offset2] ]\n");
+	fprint(2, "usage: cmp [-lLs] file1 file2 [offset1 [offset2] ]\n");
 	exits("usage");
 }