Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2011-12-24 15:37:13 +01:00
commit cea6f7ad96
1 changed files with 5 additions and 5 deletions

View File

@ -323,7 +323,7 @@ bindcode [Modifiers+]keycode command
*Examples*:
--------------------------------
# Fullscreen
bindsym mod+f f
bindsym mod+f fullscreen
# Restart
bindsym mod+Shift+r restart
@ -519,7 +519,7 @@ use it, it has to be a UTF-8 encoded arrow, not `->` or something like that.
To get the class and instance, you can use +xprop+. After clicking on the
window, you will see the following output:
*xwininfo*:
*xprop*:
-----------------------------------
WM_CLASS(STRING) = "irssi", "URxvt"
-----------------------------------
@ -619,7 +619,7 @@ Only clients that do not cover the whole area of this window expose the color
used to paint it. If you use a color other than black for your terminals, you
most likely want to set the client background color to the same color as your
terminal program's background color to avoid black gaps between the rendered
area of the termianal and the i3 border.
area of the terminal and the i3 border.
Colors are in HTML hex format (#rrggbb), see the following example:
@ -1228,7 +1228,7 @@ number or name of the workspace. To move containers to specific workspaces, use
You can also switch to the next and previous workspace with the commands
+workspace next+ and +workspace prev+, which is handy, for example, if you have
workspace 1, 3, 4 and 9 and you want to cycle through them with a single key
combination. Similarily, you can use +move workspace next+ and +move workspace
combination. Similarly, you can use +move workspace next+ and +move workspace
prev+ to move a container to the next/previous workspace.
[[back_and_forth]]
@ -1238,7 +1238,7 @@ back_and_forth+.
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.
move to the next output in the specified direction.
*Examples*:
-------------------------