Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2012-06-10 21:30:36 +02:00
commit d4f8450ea9
1 changed files with 8 additions and 6 deletions

View File

@ -434,7 +434,8 @@ workspace_layout tabbed
=== Border style for new windows === Border style for new windows
This option determines which border style new windows will have. This option determines which border style new windows will have. The default is
"normal".
*Syntax*: *Syntax*:
--------------------------------------------- ---------------------------------------------
@ -691,11 +692,12 @@ the next section.
=== Focus follows mouse === Focus follows mouse
If you have a setup where your mouse usually is in your way (like a touchpad By default, window focus follows your mouse movements. However, if you have a
on your laptop which you do not want to disable completely), you might want setup where your mouse usually is in your way (like a touchpad on your laptop
to disable 'focus follows mouse' and control focus only by using your keyboard. which you do not want to disable completely), you might want to disable 'focus
The mouse will still be useful inside the currently active window (for example follows mouse' and control focus only by using your keyboard. The mouse will
to click on links in your browser window). still be useful inside the currently active window (for example to click on
links in your browser window).
*Syntax*: *Syntax*:
---------------------------- ----------------------------