Pluralize setting

[bspwm.git] / doc / bspwm.1.txt

diff --git a/doc/bspwm.1.txt b/doc/bspwm.1.txt
index 1231c60ac4509842ba979bdb4fd6d63a116538c0..776388155849d5c4a297cef2a24b117721f28666 100644 (file)
--- a/doc/bspwm.1.txt
+++ b/doc/bspwm.1.txt
@@ -134,7 +134,7 @@ Select a window.
 
 ----
 WINDOW_SEL := <window_id> 
-            | (DIR|CYCLE_DIR|biggest|last|focused|older|newer)[.floating|.tiled][.like|.unlike][.manual][.urgent][.local]
+            | (DIR|CYCLE_DIR|biggest|last|focused|older|newer)[.floating|.tiled][.like|.unlike][.manual|.automatic][.urgent][.local]
 ----
 
 Primary Selectors
@@ -177,7 +177,10 @@ unlike::
        Only consider windows that have a different class than the current window.
 
 manual::
-       Only consider windows in manual splitting mode (see *--presel*).
+       Only consider windows in manual splitting mode.
+
+automatic::
+       Only consider windows in automatic splitting mode.
 
 local::
        Only consider windows of the current desktop.
@@ -192,8 +195,8 @@ Select a desktop.
 
 ----
 DESKTOP_SEL := <desktop_name>
-             | ^<n>
-             | (CYCLE_DIR|last|focused[:MONITOR_SEL]|older|newer)[.occupied|.free][.urgent][.local]
+             | [MONITOR_SEL:]^<n>
+             | (CYCLE_DIR|last|[MONITOR_SEL:]focused|older|newer)[.occupied|.free][.urgent][.local]
 ----
 
 Primary Selectors
@@ -510,7 +513,10 @@ Options
        Enable or disable the recording of window focus history.
 
 *--subscribe*::
-       Continuously print status informations on standard output.
+       Continuously print status informations.
+
+*--get-status*::
+       Print the current status informations.
 
 Pointer
 ~~~~~~~
@@ -543,7 +549,7 @@ rule 'OPTIONS'
 Options
 ^^^^^^^
 
-*-a*, *--add* <class_name>|<instance_name>|* [*-o*|*--one-shot*] [monitor=MONITOR_SEL|desktop=DESKTOP_SEL|window=WINDOW_SEL] [(floating|fullscreen|pseudo_tiled|locked|sticky|private|center|lower|follow|manage|focus)=(true|false)] [split_dir=DIR]::
+*-a*, *--add* <class_name>|<instance_name>|* [*-o*|*--one-shot*] [monitor=MONITOR_SEL|desktop=DESKTOP_SEL|window=WINDOW_SEL] [(floating|fullscreen|pseudo_tiled|locked|sticky|private|center|follow|manage|focus)=(true|false)] [split_dir=DIR]::
        Create a new rule.
 
 *-r*, *--remove* ^<n>|head|tail|<class_name>|<instance_name>|*...::
@@ -558,7 +564,7 @@ Config
 General Syntax
 ^^^^^^^^^^^^^^
 
-config [-m 'MONITOR_SEL'|-d 'DESKTOP_SEL'] <key> [<value>]::
+config [-m 'MONITOR_SEL'|-d 'DESKTOP_SEL'|-w 'WINDOW_SEL'] <key> [<value>]::
        Get or set the value of <key>.
 
 Quit
@@ -570,6 +576,19 @@ General Syntax
 quit [<status>]::
        Quit with an optional exit status.
 
+Exit Codes
+----------
+
+If the server can't handle a message, *bspc* will return with one of the following exit codes:
+
+1::
+       Failure.
+2::
+       Syntax error.
+3::
+       Unknown command.
+
+
 Settings
 --------
 Colors are either http://en.wikipedia.org/wiki/X11_color_names[X color names] or '#RRGGBB', booleans are 'true' or 'false'.
@@ -655,11 +674,17 @@ Global Settings
        Set the value of the '_BSPWM_FLOATING_WINDOW' atom of each window according to its floating state.
 
 'ignore_ewmh_focus'::
-       Ignore EWMH requests to focus a window.
+       Ignore EWMH focus requests coming from applications.
 
-'remove_disabled_monitor'::
+'remove_disabled_monitors'::
        Consider disabled monitors as disconnected.
 
+'remove_unplugged_monitors'::
+       Remove unplugged monitors.
+
+'merge_overlapping_monitors'::
+       Merge overlapping monitors (the bigger remains).
+
 Monitor and Desktop Settings
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -669,15 +694,18 @@ Monitor and Desktop Settings
 'left_padding'::
        Padding space added at the sides of the monitor or desktop.
 
+Desktop and Window Settings
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+'border_width'::
+       Window border width.
+
 Desktop Settings
 ~~~~~~~~~~~~~~~~
 
 'window_gap'::
        Size of the gap that separates windows.
 
-'border_width'::
-       Window border width.
-
 
 Status Format
 -------------