Merge branch 'master' into pid-workspaces

1 files changed, 14 insertions, 1 deletions

diff --git a/sway/sway.5.scd b/sway/sway.5.scd
index 5ce6bf06..d369d7b6 100644
--- a/sway/sway.5.scd
+++ b/sway/sway.5.scd
@@ -92,6 +92,12 @@ They are expected to be used with *bindsym* or at runtime through *swaymsg*(1).
 *focus* output <name>
 	Moves focus to the named output.
 
+*focus tiling*
+	Sets focus to the last focused tiling container.
+
+*focus floating*
+	Sets focus to the last focused floating container.
+
 *focus* mode\_toggle
 	Moves focus between the floating and tiled layers.
 
@@ -413,10 +419,12 @@ The default colors are:
 *mode* <mode>
 	Switches to the specified mode. The default mode _default_.
 
-*mode* <mode> *{* <commands...> *}*
+*mode* [--pango\_markup] <mode> *{* <commands...> *}*
 	_commands..._ after *{* will be added to the specified mode. A newline is
 	required between *{* and the first command, and *}* must be alone on a
 	line. Only *bindsym* and *bindcode* commands are permitted in mode blocks.
+	If _--pango\_markup_ is given, then _mode_ will be interpreted as pango
+	markup.
 
 *mouse\_warping* output|none
 	If _output_ is specified, the mouse will be moved to new outputs as you
@@ -491,6 +499,11 @@ config after the others, or it will be matched instead of the others.
 	*unmark* will remove _identifier_ from the list of current marks on a
 	window. If _identifier_ is omitted, all marks are removed.
 
+*urgent* enable|disable|allow|deny
+	Using _enable_ or _disable_ manually sets or unsets the window's urgent
+	state. Using _allow_ or _deny_ controls the window's ability to set itself
+	as urgent. By default, windows are allowed to set their own urgency.
+
 *workspace* [number] <name>
 	Switches to the specified workspace. The string "number" is optional and is
 	used to sort workspaces.