diff --git a/TODO b/TODO
index b85b5850..4ac30d4a 100644
--- a/TODO
+++ b/TODO
@@ -75,7 +75,6 @@
 - activity/bell should be per-window not per-link? what if it is cur win in
   session not being watched?
 - man page:
-      show-options
       set-window-option
       show-window-options
       explanation of -t format
diff --git a/cmd-set-option.c b/cmd-set-option.c
index 8b6da0d4..244f1476 100644
--- a/cmd-set-option.c
+++ b/cmd-set-option.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-set-option.c,v 1.27 2008-06-15 08:01:54 nicm Exp $ */
+/* $Id: cmd-set-option.c,v 1.28 2008-06-16 06:33:50 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -44,7 +44,7 @@ struct cmd_set_option_data {
 
 const struct cmd_entry cmd_set_option_entry = {
 	"set-option", "set",
-	"[-t target-window] option value",
+	"[-t target-session] option value",
 	0,
 	NULL,
 	cmd_set_option_parse,
diff --git a/cmd-show-options.c b/cmd-show-options.c
index 9e94e690..7a4a5095 100644
--- a/cmd-show-options.c
+++ b/cmd-show-options.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-show-options.c,v 1.1 2008-06-15 08:01:54 nicm Exp $ */
+/* $Id: cmd-show-options.c,v 1.2 2008-06-16 06:33:50 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -46,7 +46,7 @@ struct cmd_show_options_data {
  */
 const struct cmd_entry cmd_show_options_entry = {
 	"show-options", "show",
-	"[-t target-window]",
+	"[-t target-session]",
 	0,
 	NULL,
 	cmd_show_options_parse,
diff --git a/tmux.1 b/tmux.1
index 55474806..b05a9d71 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1,4 +1,4 @@
-.\" $Id: tmux.1,v 1.33 2008-06-15 08:01:54 nicm Exp $
+.\" $Id: tmux.1,v 1.34 2008-06-16 06:33:50 nicm Exp $
 .\"
 .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
 .\"
@@ -477,11 +477,16 @@ All arguments are sent sequentially from first to last.
 .Xc
 Send the prefix key to a window as if it was pressed.
 .It Xo Ic set-option
-.Op Fl t Ar target-window
+.Op Fl t Ar target-session
 .Ar option Ar value
 .Xc
 .D1 (alias: Ic set )
 Set an option.
+If
+.Ar target-session
+is specified, the option is set for that session; otherwise, the global option
+is set.
+A global option is used by all sessions which lack an option overriding it.
 Possible options are:
 .Bl -tag -width Ds
 .It Xo Ic bell-action
@@ -528,6 +533,16 @@ or
 .It Ic status-fg Ar colour
 Set status line foreground colour.
 .El
+.It Xo Ic show-options
+.Op Fl t Ar target-session
+.Ar option Ar value
+.Xc
+.D1 (alias: Ic show )
+Show the currently set options.
+If a
+.Ar target-session
+is specified, the options for that session are shown; otherwise, the global
+options are listed.
 .It Xo Ic start-server
 .Xc
 Start the