merge default -> lsx

[dmenu.git] / dmenu.1

diff --git a/dmenu.1 b/dmenu.1
index a4fcfd9..7243a36 100644 (file)
--- a/dmenu.1
+++ b/dmenu.1
@@ -8,8 +8,6 @@ dmenu \- dynamic menu
 .RB [ \-i ]
 .RB [ \-l
 .IR lines ]
 .RB [ \-i ]
 .RB [ \-l
 .IR lines ]

-.RB [ \-m
-.IR monitor ]

 .RB [ \-p
 .IR prompt ]
 .RB [ \-fn
 .RB [ \-p
 .IR prompt ]
 .RB [ \-fn


@@ -25,32 +23,24 @@ dmenu \- dynamic menu
 .RB [ \-v ]
 .P
 .BR dmenu_run " ..."
 .RB [ \-v ]
 .P
 .BR dmenu_run " ..."

-.P
-.B dmenu_path

 .SH DESCRIPTION
 .B dmenu
 .SH DESCRIPTION
 .B dmenu

-is a dynamic menu for X, originally designed for
-.BR dwm (1).
-It manages huge numbers of user-defined menu items efficiently.
-.P
-dmenu reads a list of newline-separated items from stdin and creates a menu.
-When the user selects an item or enters any text and presses Return, their
-choice is printed to stdout and dmenu terminates.
+is a dynamic menu for X, which reads a list of newline\-separated items from
+stdin.  When the user selects an item and presses Return, their choice is printed
+to stdout and dmenu terminates.  Entering text will narrow the items to those
+matching the tokens in the input.

 .P
 .B dmenu_run
 .P
 .B dmenu_run

-is a dmenu script used by dwm which lists programs in the user's PATH and
+is a dmenu script used by dwm which lists programs in the user's $PATH and

 executes the selected item.
 executes the selected item.

-.P
-.B dmenu_path
-is a program used by dmenu_run to find and cache a list of executables.

 .SH OPTIONS
 .TP
 .B \-b
 dmenu appears at the bottom of the screen.
 .TP
 .B \-f
 .SH OPTIONS
 .TP
 .B \-b
 dmenu appears at the bottom of the screen.
 .TP
 .B \-f

-dmenu grabs the keyboard before reading stdin.  This is faster, but may lock up
-X if stdin is from a terminal.
+dmenu grabs the keyboard before reading stdin.  This is faster, but will lock up
+X until stdin reaches end\-of\-file.

 .TP
 .B \-i
 dmenu matches menu items case insensitively.
 .TP
 .B \-i
 dmenu matches menu items case insensitively.


@@ -58,9 +48,6 @@ dmenu matches menu items case insensitively.
 .BI \-l " lines"
 dmenu lists items vertically, with the given number of lines.
 .TP
 .BI \-l " lines"
 dmenu lists items vertically, with the given number of lines.
 .TP

-.BI \-m " monitor"
-dmenu appears on the given Xinerama screen.
-.TP

 .BI \-p " prompt"
 defines the prompt to be displayed to the left of the input field.
 .TP
 .BI \-p " prompt"
 defines the prompt to be displayed to the left of the input field.
 .TP


@@ -86,23 +73,24 @@ defines the selected foreground color.
 prints version information to stdout, then exits.
 .SH USAGE
 dmenu is completely controlled by the keyboard.  Besides standard Unix line
 prints version information to stdout, then exits.
 .SH USAGE
 dmenu is completely controlled by the keyboard.  Besides standard Unix line

-editing and item selection (Up/Down/Left/Right, PageUp/PageDown, Home/End), the
+editing and item selection (arrow keys, page up/down, home and end), the

 following keys are recognized:
 .TP
 following keys are recognized:
 .TP

-.B Tab (Control\-i)
+.B Tab (Ctrl\-i)

 Copy the selected item to the input field.
 .TP
 Copy the selected item to the input field.
 .TP

-.B Return (Control\-j)
+.B Return (Ctrl\-j)

 Confirm selection.  Prints the selected item to stdout and exits, returning
 success.
 .TP
 Confirm selection.  Prints the selected item to stdout and exits, returning
 success.
 .TP

-.B Shift\-Return (Control\-Shift\-j)
+.B Shift\-Return (Ctrl\-Shift\-j)

 Confirm input.  Prints the input text to stdout and exits, returning success.
 .TP
 Confirm input.  Prints the input text to stdout and exits, returning success.
 .TP

-.B Escape (Control\-c)
+.B Escape (Ctrl\-c)

 Exit without selecting an item, returning failure.
 .TP
 Exit without selecting an item, returning failure.
 .TP

-.B Control\-y
+.B Ctrl\-y

 Paste the current X selection into the input field.
 .SH SEE ALSO
 Paste the current X selection into the input field.
 .SH SEE ALSO

-.BR dwm (1)
+.IR dwm (1),
+.IR lsx (1)