Merge branch 'colors-userguide' into next

diff --combined docs/userguide
index d7552e8c786ee88400d7e23cdbde9b366dd346ee,97a9ab06a296f8bbf7ba486d5a4c4a1f50b7ab5b..55c10b42d9a19fc7d2d2d5f9baf4e58e0bd877ec
--- 1/docs/userguide
--- 2/docs/userguide
+++ b/docs/userguide
@@@ -590,11 -590,14 +590,14 @@@ area of the termianal and the i3 border
  
  Colors are in HTML hex format (#rrggbb), see the following example:
  
- *Examples*:
- --------------------------------------
- # class        border  backgr. text
- client.focused #2F343A #900000 #FFFFFF
- --------------------------------------
+ *Examples (default colors)*:
+ -----------------------------------------------
+ # class                 border  backgr. text
+ client.focused          #4c7899 #285577 #ffffff
+ client.focused_inactive #333333 #5f676a #ffffff
+ client.unfocused        #333333 #222222 #888888
+ client.urgent           #2f343a #900000 #ffffff
+ -----------------------------------------------
  
  Note that for the window decorations, the color around the child window is the
  background color, and the border color is only the two thin lines at the top of
@@@ -760,11 -763,6 +763,11 @@@ You can also switch to the next and pre
  workspace 1, 3, 4 and 9 and you want to cycle through them with a single key
  combination.
  
 +To move a container to another xrandr output such as +LVDS1+ or +VGA1+, you can
 +use the +move output+ command followed by the name of the target output. You
 +may also use +left+, +right+, +up+, +down+ instead of the xrandr output name to
 +move to the the next output in the specified direction.
 +
  *Examples*:
  -------------------------
  bindsym mod+1 workspace 1