===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.1,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- src/usr.bin/tmux/tmux.1	2010/02/17 21:12:06	1.153
+++ src/usr.bin/tmux/tmux.1	2010/02/22 20:41:16	1.154
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tmux.1,v 1.153 2010/02/17 21:12:06 nicm Exp $
+.\" $OpenBSD: tmux.1,v 1.154 2010/02/22 20:41:16 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 $Mdocdate: February 17 2010 $
+.Dd $Mdocdate: February 22 2010 $
 .Dt TMUX 1
 .Os
 .Sh NAME
@@ -649,11 +649,13 @@
 .Pp
 The next and previous word keys use space and the
 .Ql - ,
-.Ql _ ,
-.Ql \&"
+.Ql _
 and
 .Ql @
-characters as word delimiters.
+characters as word delimiters by default, but this can be adjusted by
+setting the
+.Em word-separators
+window option.
 Next word moves to the start of the next word, next word end to the end of the
 next word and previous word to the start of the previous word.
 The three next and previous space keys work similarly but use a space alone as
@@ -2030,6 +2032,13 @@
 Like
 .Ar window-status-format ,
 but is the format used when the window is the current window.
+.Pp
+.It Ic word-separators Ar string
+Sets the window's conception of what characters are considered word
+separators, for the purposes of the next and previous word commands in
+copy mode.
+The default is
+.Ql \ -_@ .
 .Pp
 .It Xo Ic xterm-keys
 .Op Ic on | off