Merge pull request #2004 from Airblader/bug-2003

[i3/i3] / docs / userguide

diff --git a/docs/userguide b/docs/userguide
index b077eb66d42e49cc9a70361c615be4a9691e9b10..c98c25f9d98039772c4e92c53ff1d0a518cc3d5c 100644 (file)
--- a/docs/userguide
+++ b/docs/userguide
@@ -604,12 +604,16 @@ The valid criteria are the same as those for commands, see <<command_criteria>>.
 [[no_focus]]
 
 When a new window appears, it will be focused. The +no_focus+ directive allows preventing
-this from happening and can be used in combination with <<command_criteria>>.
+this from happening and must be used in combination with <<command_criteria>>.
 
 Note that this does not apply to all cases, e.g., when feeding data into a running application
 causing it to request being focused. To configure the behavior in such cases, refer to
 <<focus_on_window_activation>>.
 
++no_focus+ will also be ignored for the first window on a workspace as there shouldn't be
+a reason to not focus the window in this case. This allows for better usability in
+combination with +workspace_layout+.
+
 *Syntax*:
 -------------------
 no_focus <criteria>
@@ -1845,6 +1849,10 @@ container to workspace next+, +move container to workspace prev+ to move a
 container to the next/previous workspace and +move container to workspace current+
 (the last one makes sense only when used with criteria).
 
++workspace next+ cycles through either numbered or named workspaces. But when it
+reaches the last numbered/named workspace, it looks for named workspaces after
+exhausting numbered ones and looks for numbered ones after exhausting named ones.
+
 See <<move_to_outputs>> for how to move a container/workspace to a different
 RandR output.