Merge pull request #6 from Airblader/feature-git-link

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

diff --git a/docs/userguide.html b/docs/userguide.html
index 90ec283e0639e8923f3e8299f0009bf8d353d96b..4a52eedf663644f4f1f78e50500eb79b84d00700 100644 (file)
--- a/docs/userguide.html
+++ b/docs/userguide.html
@@ -22,8 +22,9 @@ document.addEventListener("DOMContentLoaded", function(){asciidoc.footnotes(); a
                         <ul id="nav">\r
                                 <li><a style="border-bottom: 2px solid #fff" href="/docs">Docs</a></li>\r
                                 <li><a href="/screenshots">Screens</a></li>\r
+                                <li><a href="https://faq.i3wm.org/">FAQ</a></li>\r
                                 <li><a href="/contact">Contact</a></li>\r
-                                <li><a href="http://bugs.i3wm.org/">Bugs</a></li>\r
+                                <li><a href="https://github.com/i3/i3/issues">Bugs</a></li>\r
                         </ul>\r
         <br style="clear: both">\r
 <div id="content">\r
@@ -1322,7 +1323,24 @@ bar {
 </div></div>\r
 </div>\r
 <div class="sect2">\r
-<h3 id="_workspace_buttons">5.10. Workspace buttons</h3>\r
+<h3 id="_custom_separator_symbol">5.10. Custom separator symbol</h3>\r
+<div class="paragraph"><p>Specifies a custom symbol to be used for the separator as opposed to the vertical,\r
+one pixel thick separator.</p></div>\r
+<div class="paragraph"><p><strong>Syntax</strong>:</p></div>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>separator_symbol &lt;symbol&gt;</tt></pre>\r
+</div></div>\r
+<div class="paragraph"><p><strong>Example</strong>:</p></div>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>bar {\r
+    separator_symbol ":|:"\r
+}</tt></pre>\r
+</div></div>\r
+</div>\r
+<div class="sect2">\r
+<h3 id="_workspace_buttons">5.11. Workspace buttons</h3>\r
 <div class="paragraph"><p>Specifies whether workspace buttons should be shown or not. This is useful if\r
 you want to display a statusline-only bar containing additional information.</p></div>\r
 <div class="paragraph"><p>The default is to show workspace buttons.</p></div>\r
@@ -1340,7 +1358,7 @@ you want to display a statusline-only bar containing additional information.</p>
 </div></div>\r
 </div>\r
 <div class="sect2">\r
-<h3 id="_strip_workspace_numbers">5.11. Strip workspace numbers</h3>\r
+<h3 id="_strip_workspace_numbers">5.12. Strip workspace numbers</h3>\r
 <div class="paragraph"><p>Specifies whether workspace numbers should be displayed within the workspace\r
 buttons. This is useful if you want to have a named workspace that stays in\r
 order on the bar according to its number without displaying the number prefix.</p></div>\r
@@ -1363,7 +1381,7 @@ workspaces to "1:I", "2:II", "3:III", "4:IV", &#8230;</p></div>
 </div></div>\r
 </div>\r
 <div class="sect2">\r
-<h3 id="_binding_mode_indicator">5.12. Binding Mode indicator</h3>\r
+<h3 id="_binding_mode_indicator">5.13. Binding Mode indicator</h3>\r
 <div class="paragraph"><p>Specifies whether the current binding mode indicator should be shown or not.\r
 This is useful if you want to hide the workspace buttons but still be able\r
 to see the current binding mode indicator.\r
@@ -1383,7 +1401,7 @@ For an example of a <tt>mode</tt> definition, see <a href="#resizingconfig">[res
 </div></div>\r
 </div>\r
 <div class="sect2">\r
-<h3 id="_colors">5.13. Colors</h3>\r
+<h3 id="_colors">5.14. Colors</h3>\r
 <div class="paragraph"><p>As with i3, colors are in HTML hex format (#rrggbb). The following colors can\r
 be configured at the moment:</p></div>\r
 <div class="dlist"><dl>\r
@@ -2127,7 +2145,27 @@ bindsym mod4+s [title="^Sup ::"] scratchpad show</tt></pre>
 </div></div>\r
 </div>\r
 <div class="sect2">\r
-<h3 id="_i3bar_control">6.16. i3bar control</h3>\r
+<h3 id="_nop">6.16. Nop</h3>\r
+<div class="paragraph"><p>There is a no operation command <tt>nop</tt> which allows you to override default\r
+behavior. This can be useful for, e.g., disabling a focus change on clicks with\r
+the middle mouse button.</p></div>\r
+<div class="paragraph"><p>The optional <tt>comment</tt> argument is ignored, but will be printed to the log file\r
+for debugging purposes.</p></div>\r
+<div class="paragraph"><p><strong>Syntax</strong>:</p></div>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>nop [&lt;comment&gt;]</tt></pre>\r
+</div></div>\r
+<div class="paragraph"><p><strong>Example</strong>:</p></div>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt># Disable focus change for clicks on titlebars\r
+# with the middle mouse button\r
+bindsym button2 nop</tt></pre>\r
+</div></div>\r
+</div>\r
+<div class="sect2">\r
+<h3 id="_i3bar_control">6.17. i3bar control</h3>\r
 <div class="paragraph"><p>There are two options in the configuration of each i3bar instance that can be\r
 changed during runtime by invoking a command through i3. The commands <tt>bar\r
 hidden_state</tt> and <tt>bar mode</tt> allow setting the current hidden_state\r