diff --git a/TODO b/TODO
index 4a5b6b73..c2b9915d 100644
--- a/TODO
+++ b/TODO
@@ -101,6 +101,4 @@
 - document swap-pane and rotate-window
 - document status-keys
 - document break-pane
-- document -8 flag
 - document set-remain-on-exit
-- document -L and update socket path bits in tmux.1
diff --git a/examples/n-marriott.conf b/examples/n-marriott.conf
index 4acb8d13..908f6895 100644
--- a/examples/n-marriott.conf
+++ b/examples/n-marriott.conf
@@ -29,14 +29,15 @@ bind m setw monitor-activity
 bind y setw force-width 81
 bind u setw force-width 0
 
+bind D detach \; lock
 bind N neww \; splitw -d
 
-bind ~ split-window "top -s 0.5"
-bind "#" split-window "ncmpc -f ~/.ncmpc.conf"
-bind / command-prompt "split-window 'man %%'"
+bind ~ split-window "exec top -s 0.5"
+bind "#" split-window "exec ncmpc -f ~/.ncmpc.conf"
+bind / command-prompt "split-window 'exec man %%'"
 
-# First session.s
-new -d -s0 -nirssi 'ssh -t natalya screen -DRS irssi irssi'
+# First session.
+new -d -s0 -nirssi 'exec ssh -t natalya screen -DRS irssi irssi'
 setw -t0:0 monitor-activity on
 setw -t0:0 aggressive-resize on
 set -t0 status-bg green
@@ -54,10 +55,6 @@ neww -d
 neww -d
 neww -d
 neww -d
-neww -d
-neww -d
-neww -d
-neww -d
 
 # Second session.
 new -d -s1
diff --git a/examples/n-marriott.sh b/examples/n-marriott.sh
index e1d8ecc5..55cb9815 100644
--- a/examples/n-marriott.sh
+++ b/examples/n-marriott.sh
@@ -5,9 +5,7 @@
 # I alias this script to "session" in .profile and use it to reconnect to
 # the main session (0) on my main tmux server.
 
-SOCKET=/tmp/tmux-1000-main
+TMUX="tmux -dLmain"
 
-TMUX="tmux -S $SOCKET"
-
-$TMUX has -s0 2>/dev/null || $TMUX start
-$TMUX attach -d -s0
+$TMUX has -t0 2>/dev/null || $TMUX -qf ~/.tmux.conf.main start
+exec $TMUX attach -d -t0
diff --git a/tmux.1 b/tmux.1
index 1c290ac1..b7db46e3 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1,4 +1,4 @@
-.\" $Id: tmux.1,v 1.84 2009-04-20 19:11:31 nicm Exp $
+.\" $Id: tmux.1,v 1.85 2009-04-20 19:25:58 nicm Exp $
 .\"
 .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
 .\"
@@ -14,7 +14,7 @@
 .\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd June 30, 2008
+.Dd April 20, 2009
 .Dt TMUX 1
 .Os
 .Sh NAME
@@ -23,8 +23,9 @@
 .Sh SYNOPSIS
 .Nm tmux
 .Bk -words
-.Op Fl 2dqUuVv
+.Op Fl 28dqUuVv
 .Op Fl f Ar file
+.Op Fl L Ar socket-name
 .Op Fl S Ar socket-path
 .Op Ar command Op Ar flags
 .Ek
@@ -54,6 +55,10 @@ The options are as follows:
 Force
 .Nm
 to assume the terminal supports 256 colours.
+.It Fl 2
+Like
+.Fl 8 ,
+indicates the terminal supports 88 colours.
 .It Fl d
 Force
 .Nm
@@ -70,14 +75,27 @@ commands which are executed in sequence when the server is first started.
 .It Fl q
 Prevent the server sending various information messages, for example when
 window flags are altered.
+.It Fl L Ar socket-name
+.Nm
+stores the server socket in a directory under
+.Pa /tmp ;
+the default socket is named
+.Em default .
+This option allows a different socket name to be specified, allowing several
+independent
+.Nm
+servers to be run.
+Unlike
+.Fl S
+a full path is not necessary: the sockets are all created in the same
+directory.
 .It Fl S Ar socket-path
-Specify an alternative path to the server socket.
-The default is
-.Pa /tmp/tmux-UID ,
-where
-.Em UID
-is the uid of the user who invoked
-.Nm .
+Specify a full alternative path to the server socket.
+If 
+.Fl S
+is specified, the default socket directory is not used and any
+.Fl L
+flag is ignored.
 .It Fl U
 Unlock the server.
 .It Fl u
diff --git a/tmux.c b/tmux.c
index 46b6fcd8..e7a52ac4 100644
--- a/tmux.c
+++ b/tmux.c
@@ -1,4 +1,4 @@
-/* $Id: tmux.c,v 1.112 2009-04-01 20:15:48 nicm Exp $ */
+/* $Id: tmux.c,v 1.113 2009-04-20 19:25:58 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -71,8 +71,8 @@ const char      *__progname = "tmux";
 __dead void
 usage(void)
 {
-	fprintf(stderr, "usage: "
-	    "%s [-2dquVv] [-f file] [-S socket-path] [command [flags]]\n",
+	fprintf(stderr, "usage: %s [-28dqUuVv] [-f file] "
+	    "[-L socket-name] [-S socket-path] [command [flags]]\n",
 	    __progname);
 	exit(1);
 }