update docs/userguide

diff --git a/_docs/userguide b/_docs/userguide
index 854acbbc7a98b7a687778d988b4238ef213f6f47..865ee4b97f410a903786cff354c34532060ff85b 100644 (file)
--- a/_docs/userguide
+++ b/_docs/userguide
@@ -160,7 +160,7 @@ paradigm but can be useful for some corner cases like "Save as" dialog
 windows, or toolbar windows (GIMP or similar). Those windows usually set the
 appropriate hint and are opened in floating mode by default.
 
-You can enable floating mode for a window by pressing +mod+Shift+Space+. By
+You can toggle floating mode for a window by pressing +mod+Shift+Space+. By
 dragging the window’s titlebar with your mouse you can move the window
 around. By grabbing the borders and moving them you can resize the window. You
 can also do that by using the <<floating_modifier>>.
@@ -448,6 +448,8 @@ for_window [class="urxvt"] border 1pixel
 for_window [title="x200: ~/work"] floating enable
 ------------------------------------------------
 
+The valid criteria are the same as those for commands, see <<command_criteria>>.
+
 === Variables
 
 As you learned in the section about keyboard bindings, you will have
@@ -709,6 +711,8 @@ the following keybinding:
 bindsym mod+x move workspace 3; workspace 3
 -------------------------------------------
 
+[[command_criteria]]
+
 Furthermore, you can change the scope of a command, that is, which containers
 should be affected by that command, by using various criteria. These are
 prefixed in square brackets to every command. If you want to kill all windows

diff --git a/docs/4.0/userguide.html b/docs/4.0/userguide.html
index 6698106e108763d8bef882a91b83e97fed816a78..4403ffa405b40c201cd756424584c67e721aa9ed 100644 (file)
--- a/docs/4.0/userguide.html
+++ b/docs/4.0/userguide.html
@@ -212,7 +212,7 @@ are not managed by i3, but by you. Using this mode violates the tiling
 paradigm but can be useful for some corner cases like "Save as" dialog\r
 windows, or toolbar windows (GIMP or similar). Those windows usually set the\r
 appropriate hint and are opened in floating mode by default.</p></div>\r
-<div class="paragraph"><p>You can enable floating mode for a window by pressing <tt>mod+Shift+Space</tt>. By\r
+<div class="paragraph"><p>You can toggle floating mode for a window by pressing <tt>mod+Shift+Space</tt>. By\r
 dragging the window’s titlebar with your mouse you can move the window\r
 around. By grabbing the borders and moving them you can resize the window. You\r
 can also do that by using the <a href="#floating_modifier">[floating_modifier]</a>.</p></div>\r
@@ -519,6 +519,7 @@ for_window [class="urxvt"] border 1pixel
 # directory to ~/work\r
 for_window [title="x200: ~/work"] floating enable</tt></pre>\r
 </div></div>\r
+<div class="paragraph"><p>The valid criteria are the same as those for commands, see <a href="#command_criteria">[command_criteria]</a>.</p></div>\r
 </div>\r
 <div class="sect2">\r
 <h3 id="_variables">4.9. Variables</h3>\r
@@ -799,7 +800,7 @@ the following keybinding:</p></div>
 <div class="content">\r
 <pre><tt>bindsym mod+x move workspace 3; workspace 3</tt></pre>\r
 </div></div>\r
-<div class="paragraph"><p>Furthermore, you can change the scope of a command, that is, which containers\r
+<div class="paragraph" id="command_criteria"><p>Furthermore, you can change the scope of a command, that is, which containers\r
 should be affected by that command, by using various criteria. These are\r
 prefixed in square brackets to every command. If you want to kill all windows\r
 which have the class Firefox, use:</p></div>\r

diff --git a/docs/userguide.html b/docs/userguide.html
index 6698106e108763d8bef882a91b83e97fed816a78..4403ffa405b40c201cd756424584c67e721aa9ed 100644 (file)
--- a/docs/userguide.html
+++ b/docs/userguide.html
@@ -212,7 +212,7 @@ are not managed by i3, but by you. Using this mode violates the tiling
 paradigm but can be useful for some corner cases like "Save as" dialog\r
 windows, or toolbar windows (GIMP or similar). Those windows usually set the\r
 appropriate hint and are opened in floating mode by default.</p></div>\r
-<div class="paragraph"><p>You can enable floating mode for a window by pressing <tt>mod+Shift+Space</tt>. By\r
+<div class="paragraph"><p>You can toggle floating mode for a window by pressing <tt>mod+Shift+Space</tt>. By\r
 dragging the window’s titlebar with your mouse you can move the window\r
 around. By grabbing the borders and moving them you can resize the window. You\r
 can also do that by using the <a href="#floating_modifier">[floating_modifier]</a>.</p></div>\r
@@ -519,6 +519,7 @@ for_window [class="urxvt"] border 1pixel
 # directory to ~/work\r
 for_window [title="x200: ~/work"] floating enable</tt></pre>\r
 </div></div>\r
+<div class="paragraph"><p>The valid criteria are the same as those for commands, see <a href="#command_criteria">[command_criteria]</a>.</p></div>\r
 </div>\r
 <div class="sect2">\r
 <h3 id="_variables">4.9. Variables</h3>\r
@@ -799,7 +800,7 @@ the following keybinding:</p></div>
 <div class="content">\r
 <pre><tt>bindsym mod+x move workspace 3; workspace 3</tt></pre>\r
 </div></div>\r
-<div class="paragraph"><p>Furthermore, you can change the scope of a command, that is, which containers\r
+<div class="paragraph" id="command_criteria"><p>Furthermore, you can change the scope of a command, that is, which containers\r
 should be affected by that command, by using various criteria. These are\r
 prefixed in square brackets to every command. If you want to kill all windows\r
 which have the class Firefox, use:</p></div>\r