Merge branch 'obsd-master'

2 files changed, 8 insertions, 8 deletions

diff --git a/cmd-find.c b/cmd-find.c
index 23b02a00..5da65174 100644
--- a/cmd-find.c
+++ b/cmd-find.c
@@ -101,10 +101,10 @@ const char *cmd_find_pane_table[][2] = {
 	{ "{top-right}", "top-right" },
 	{ "{bottom-left}", "bottom-left" },
 	{ "{bottom-right}", "bottom-right" },
-	{ "{up}", "{up}" },
-	{ "{down}", "{down}" },
-	{ "{left}", "{left}" },
-	{ "{right}", "{right}" },
+	{ "{up-of}", "{up}" },
+	{ "{down-of}", "{down}" },
+	{ "{left-of}", "{left}" },
+	{ "{right-up}", "{right}" },
 	{ NULL, NULL }
 };
 
diff --git a/tmux.1 b/tmux.1
index 83eab55a..2001a2f1 100644
--- a/tmux.1
+++ b/tmux.1
@@ -500,10 +500,10 @@ The following special tokens are available for the pane index:
 .It Li "{top-right}" Ta "" Ta "The top-right pane"
 .It Li "{bottom-left}" Ta "" Ta "The bottom-left pane"
 .It Li "{bottom-right}" Ta "" Ta "The bottom-right pane"
-.It Li "{up}" Ta "" Ta "The pane above the active pane"
-.It Li "{down}" Ta "" Ta "The pane below the active pane"
-.It Li "{left}" Ta "" Ta "The pane to the left of the active pane"
-.It Li "{right}" Ta "" Ta "The pane to the right of the active pane"
+.It Li "{up-of}" Ta "" Ta "The pane above the active pane"
+.It Li "{down-of}" Ta "" Ta "The pane below the active pane"
+.It Li "{left-of}" Ta "" Ta "The pane to the left of the active pane"
+.It Li "{right-of}" Ta "" Ta "The pane to the right of the active pane"
 .El
 .Pp
 The tokens