diff --git a/cmd-new-session.c b/cmd-new-session.c
index aeff70bf..859ca35e 100644
--- a/cmd-new-session.c
+++ b/cmd-new-session.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-new-session.c,v 1.14 2007-10-26 12:29:07 nicm Exp $ */
+/* $Id: cmd-new-session.c,v 1.15 2007-11-09 16:04:29 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -41,7 +41,7 @@ struct cmd_new_session_data {
 
 const struct cmd_entry cmd_new_session_entry = {
 	"new-session", "new",
-	"[-d] [-s session name] [-n window name] [command]",
+	"[-d] [-s session-name] [-n window-name] [command]",
 	CMD_STARTSERVER|CMD_NOSESSION|CMD_CANTNEST,
 	cmd_new_session_parse,
 	cmd_new_session_exec, 
diff --git a/cmd-select-window.c b/cmd-select-window.c
index 7b260ad3..d393f868 100644
--- a/cmd-select-window.c
+++ b/cmd-select-window.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-select-window.c,v 1.7 2007-10-30 10:59:43 nicm Exp $ */
+/* $Id: cmd-select-window.c,v 1.8 2007-11-09 16:04:29 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -38,7 +38,7 @@ struct cmd_select_window_data {
 };
 
 const struct cmd_entry cmd_select_window_entry = {
-	"select-window", "selectw", "[command]",
+	"select-window", "selectw", "index",
 	0,
 	cmd_select_window_parse,
 	cmd_select_window_exec, 
diff --git a/tmux.1 b/tmux.1
index b2b98b5b..fc3c6747 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1,4 +1,4 @@
-.\" $Id: tmux.1,v 1.2 2007-11-09 15:29:59 nicm Exp $
+.\" $Id: tmux.1,v 1.3 2007-11-09 16:04:29 nicm Exp $
 .\"
 .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
 .\"
@@ -84,7 +84,104 @@ and described in the following section.
 .Pp
 .El
 .Sh COMMANDS
-TBC
+.Nm
+supports the following commands:
+.Bl -tag -width Ds
+.It Xo Ic attach-session
+.Op Fl d
+.Xc
+.D1 (Alias: Ic attach )
+.It Xo Ic bind-key
+.Ar key Ar command Op Ar arguments
+.Xc
+.D1 (Alias: Ic bind )
+.It Xo Ic detach-session
+.Op Fl a
+.Xc
+.D1 (Alias: Ic detach )
+.It Xo Ic has-session 
+.Xc
+.D1 (Alias: Ic has )
+.It Xo Ic kill-window 
+.Op Fl i Ar index
+.Xc
+.D1 (Alias: Ic killw )
+.It Xo Ic last-window 
+.Xc
+.D1 (Alias: Ic last )
+.It Xo Ic link-window 
+.Op Fl i Ar index
+.Ar name Ar index
+.Xc
+.D1 (Alias: Ic linkw )
+.It Xo Ic list-clients 
+.Xc
+.D1 (Alias: Ic lsc )
+.It Xo Ic list-keys 
+.Xc
+.D1 (Alias: Ic lsk )
+.It Xo Ic list-sessions 
+.Xc
+.D1 (Alias: Ic ls )
+.It Xo Ic list-windows
+.Xc
+.D1 (Alias: Ic lsw )
+.It Xo Ic new-session
+.Op Fl d
+.Op Fl s Ar session-name
+.Op Fl n Ar window-name
+.Op Ar command
+.Xc
+.D1 (Alias: Ic new )
+.It Xo Ic new-window 
+.Op Fl d
+.Op Fl i Ar index
+.Op Fl n Ar name
+.Op Ar command
+.Xc
+.D1 (Alias: Ic neww )
+.It Xo Ic next-window 
+.Xc
+.D1 (Alias: Ic next )
+.It Xo Ic previous-window 
+.Xc
+.D1 (Alias: Ic prev )
+.It Xo Ic refresh-session 
+.Op Fl a
+.Xc
+.D1 (Alias: Ic refresh )
+.It Xo Ic rename-session new-name
+.Xc
+.D1 (Alias: Ic rename )
+.It Xo Ic rename-window
+.Op Fl i Ar index
+.Ar new-name
+.Xc
+.D1 (Alias: Ic renamew )
+.It Xo Ic select-window 
+.Ar index
+.Xc
+.D1 (Alias: Ic selectw )
+.It Xo Ic send-prefix
+.Xc
+.It Xo Ic set-option  )
+.Ar option Ar value
+.Xc
+.D1 (Alias: Ic set )
+.It Xo Ic swap-window 
+.Op Fl i Ar index
+.Ar name Ar index
+.Xc
+.D1 (Alias: Ic swapw )
+.It Xo Ic unbind-key
+.Ar key
+.Xc
+.D1 (Alias: Ic unbind )
+.It Xo Ic unlink-window 
+.Op Fl i Ar index
+.Xc
+.D1 (Alias: Ic unlinkw )
+.El
 .Sh SEE ALSO
 .Xr pty 4
 .Sh AUTHORS