Merge pull request #1580 from Airblader/feature-nop

Allow nop command without argument

diff --combined docs/userguide
index d60eefb2103e1ed9d222608797ced5343be27ae4,8528d684a89bd2515dde9e5b9f1ce7af07a614a9..3d935e40aac7c2fbf8f5d5f6c2b45e47db4dec8b
--- 1/docs/userguide
--- 2/docs/userguide
+++ b/docs/userguide
@@@ -1249,24 -1249,6 +1249,24 @@@ bar 
  }
  --------------------------------------------------------------
  
 +=== Custom separator symbol
 +
 +Specifies a custom symbol to be used for the separator as opposed to the vertical,
 +one pixel thick separator. Note that you may have to adjust the +sep_block_width+ 
 +property.
 +
 +*Syntax*:
 +-------------------------
 +separator_symbol <symbol>
 +-------------------------
 +
 +*Example*:
 +------------------------
 +bar {
 +    separator_symbol ":|:"
 +}
 +------------------------
 +
  === Workspace buttons
  
  Specifies whether workspace buttons should be shown or not. This is useful if
@@@ -2029,6 -2011,27 +2029,27 @@@ bindsym $mod+minus scratchpad sho
  bindsym mod4+s [title="^Sup ::"] scratchpad show
  ------------------------------------------------
  
+ === Nop
+ 
+ There is a no operation command +nop+ which allows you to override default
+ behavior. This can be useful for, e.g., disabling a focus change on clicks with
+ the middle mouse button.
+ 
+ The optional +comment+ argument is ignored, but will be printed to the log file
+ for debugging purposes.
+ 
+ *Syntax*:
+ ---------------
+ nop [<comment>]
+ ---------------
+ 
+ *Example*:
+ ----------------------------------------------
+ # Disable focus change for clicks on titlebars
+ # with the middle mouse button
+ bindsym button2 nop
+ ----------------------------------------------
+ 
  === i3bar control
  
  There are two options in the configuration of each i3bar instance that can be