add i3 v4.5

[i3/i3.github.io] / docs / userguide.html

diff --git a/docs/userguide.html b/docs/userguide.html
index 0f294dfb58732aa52910ea48210a2662948d40b3..ed6f188b144b19d422679355a31b4190a0ddc579 100644 (file)
--- a/docs/userguide.html
+++ b/docs/userguide.html
@@ -31,7 +31,7 @@ window.onload = function(){asciidoc.footnotes(); asciidoc.toc(2);}
 <h1>i3 User’s Guide</h1>\r
 <span id="author">Michael Stapelberg</span><br />\r
 <span id="email"><tt>&lt;<a href="mailto:michael@i3wm.org">michael@i3wm.org</a>&gt;</tt></span><br />\r
-<span id="revdate">August 2012</span>\r
+<span id="revdate">February 2013</span>\r
 <div id="toc">
   <div id="toctitle">Table of Contents</div>
   <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript>
@@ -384,7 +384,7 @@ font pango:[family list] [style options] [size]</tt></pre>
 <pre><tt>font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1\r
 font pango:DejaVu Sans Mono 10\r
 font pango:DejaVu Sans Mono, Terminus Bold Semi-Condensed 11\r
-font pango:Terminus 11x</tt></pre>\r
+font pango:Terminus 11px</tt></pre>\r
 </div></div>\r
 </div>\r
 <div class="sect2">\r
@@ -648,6 +648,9 @@ starts up being named Firefox, and only when Vimperator is loaded does the
 title change. As i3 will get the title as soon as the application maps the\r
 window (mapping means actually displaying it on the screen), you’d need to have\r
 to match on <em>Firefox</em> in this case.</p></div>\r
+<div class="paragraph"><p>Assignments are processed by i3 in the order in which they appear in the config\r
+file. The first one which matches the window wins and later assignments are not\r
+considered.</p></div>\r
 <div class="paragraph"><p><strong>Syntax</strong>:</p></div>\r
 <div class="listingblock">\r
 <div class="content">\r
@@ -803,10 +806,7 @@ will be rendered.</p></div>
 <pre><tt>client.background color</tt></pre>\r
 </div></div>\r
 <div class="paragraph"><p>Only clients that do not cover the whole area of this window expose the color\r
-used to paint it. If you use a color other than black for your terminals, you\r
-most likely want to set the client background color to the same color as your\r
-terminal program&#8217;s background color to avoid black gaps between the rendered\r
-area of the terminal and the i3 border.</p></div>\r
+used to paint it.</p></div>\r
 <div class="paragraph"><p>Colors are in HTML hex format (#rrggbb), see the following example:</p></div>\r
 <div class="paragraph"><p><strong>Examples (default colors)</strong>:</p></div>\r
 <div class="listingblock">\r
@@ -1241,6 +1241,14 @@ statusline
 </p>\r
 </dd>\r
 <dt class="hdlist1">\r
+separator\r
+</dt>\r
+<dd>\r
+<p>\r
+        Text color to be used for the separator.\r
+</p>\r
+</dd>\r
+<dt class="hdlist1">\r
 focused_workspace\r
 </dt>\r
 <dd>\r
@@ -1286,6 +1294,7 @@ urgent_workspace
 <pre><tt>colors {\r
     background &lt;color&gt;\r
     statusline &lt;color&gt;\r
+    separator &lt;color&gt;\r
 \r
     colorclass &lt;border&gt; &lt;background&gt; &lt;text&gt;\r
 }</tt></pre>\r
@@ -1297,6 +1306,7 @@ urgent_workspace
     colors {\r
         background #000000\r
         statusline #ffffff\r
+        separator #666666\r
 \r
         focused_workspace  #4c7899 #285577 #ffffff\r
         active_workspace   #333333 #5f676a #ffffff\r
@@ -1740,7 +1750,7 @@ bindsym $mod+x move container to output VGA1</tt></pre>
 <div class="paragraph"><p><strong>Syntax</strong>:</p></div>\r
 <div class="listingblock">\r
 <div class="content">\r
-<pre><tt>resize &lt;grow|shrink&gt; &lt;direction&gt; [&lt;px&gt; px] [or &lt;ppt&gt; ppt]</tt></pre>\r
+<pre><tt>resize &lt;grow|shrink&gt; &lt;direction&gt; [&lt;px&gt; px [or &lt;ppt&gt; ppt]]</tt></pre>\r
 </div></div>\r
 <div class="paragraph"><p>Direction can either be one of <tt>up</tt>, <tt>down</tt>, <tt>left</tt> or <tt>right</tt>. Or you can be\r
 less specific and use <tt>width</tt> or <tt>height</tt>, in which case i3 will take/give\r
@@ -1785,7 +1795,7 @@ bindsym $mod+r mode "resize"</tt></pre>
 <div class="paragraph"><p>Often when in a multi-monitor environment, you want to quickly jump to a\r
 specific window. For example, while working on workspace 3 you may want to\r
 jump to your mail client to email your boss that you’ve achieved some\r
-important goal. Instead of figuring out how to navigate to your mailclient,\r
+important goal. Instead of figuring out how to navigate to your mail client,\r
 it would be more convenient to have a shortcut. You can use the <tt>focus</tt> command\r
 with criteria for that.</p></div>\r
 <div class="paragraph"><p><strong>Syntax</strong>:</p></div>\r