Merge branch 'release-4.16.1'

[i3/i3] / man / i3-nagbar.man

diff --git a/man/i3-nagbar.man b/man/i3-nagbar.man
index 7dd3a238130e66ea09719d37aaa2365cfc4980f1..ef3a354588c23378ab97f5dc257b4b46a7132573 100644 (file)
--- a/man/i3-nagbar.man
+++ b/man/i3-nagbar.man
@@ -9,7 +9,7 @@ i3-nagbar - displays an error bar on top of your screen
 
 == SYNOPSIS
 
-i3-nagbar [-m <message>] [-b <button> <terminal-action>] [-B <button> <shell-action>] [-t warning|error] [-f <font>] [-v]
+i3-nagbar [-m <message>] [-b <button> <action>] [-B <button> <action>] [-t warning|error] [-f <font>] [-v]
 
 == OPTIONS
 
@@ -29,13 +29,15 @@ Display 'message' as text on the left of the i3-nagbar.
 *-f, --font* 'font'::
 Select font that is being used.
 
-*-b, --button* 'button' 'terminal-action'::
-Adds a button labelled 'button' to the bar. When pressed, the command given
-in 'terminal-action' is executed inside a terminal emulator, via i3-sensible-terminal(1).
-Multiple buttons can be defined.
+*-b, --button* 'button' 'action'::
+Create a button with text 'button'. The 'action' are the shell commands that
+will be executed by this button. Multiple buttons can be defined.
+Will launch the shell commands inside a terminal emulator, using
+i3-sensible-terminal.
 
-*-B, --button-sh* 'button' 'shell-action'::
-Same as *--button*, except that the command given in 'shell-action' is executed directly by the shell.
+*-B, --button-no-terminal* 'button' 'action'::
+Same as above, but will execute the shell commands directly, without launching a
+terminal emulator.
 
 == DESCRIPTION
 
@@ -53,7 +55,7 @@ i3-nagbar -m 'You have an error in your i3 config file!' \
 
 == SEE ALSO
 
-i3(1), i3-sensible-terminal(1)
+i3(1)
 
 == AUTHOR