Merge branch 'master' into next

[i3/i3] / docs / userguide

diff --git a/docs/userguide b/docs/userguide
index 72555b53d1fe0505712c7d29e7ee362a65b3d8b2..4eadccb1d3dfb4eb6653a4864f378ab58a1ea5f2 100644 (file)
--- a/docs/userguide
+++ b/docs/userguide
@@ -316,13 +316,15 @@ and fall back to a working font.
 *Syntax*:
 ------------------------------
 font <X core font description>
 *Syntax*:
 ------------------------------
 font <X core font description>

-font xft:<a FreeType font description>
+font pango:[family list] [style options] [size]

 ------------------------------
 
 *Examples*:
 --------------------------------------------------------------
 font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
 ------------------------------
 
 *Examples*:
 --------------------------------------------------------------
 font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1

-font xft:DejaVu Sans Mono 10
+font pango:DejaVu Sans Mono 10
+font pango:DejaVu Sans Mono, Terminus Bold Semi-Condensed 11
+font pango:Terminus 11px

 --------------------------------------------------------------
 
 [[keybindings]]
 --------------------------------------------------------------
 
 [[keybindings]]


@@ -479,12 +481,15 @@ workspace_layout tabbed
 === Border style for new windows
 
 This option determines which border style new windows will have. The default is
 === Border style for new windows
 
 This option determines which border style new windows will have. The default is

-"normal".
+"normal". Note that new_float applies only to windows which are starting out as
+floating windows, e.g. dialog windows.

 
 *Syntax*:
 ---------------------------------------------
 new_window <normal|1pixel|none|pixel>
 
 *Syntax*:
 ---------------------------------------------
 new_window <normal|1pixel|none|pixel>

+new_float <normal|1pixel|none|pixel>

 ---------------------------------------------
 ---------------------------------------------

+

 *Example*:
 ---------------------
 new_window 1pixel
 *Example*:
 ---------------------
 new_window 1pixel


@@ -1117,7 +1122,7 @@ font <font>
 --------------------------------------------------------------
 bar {
     font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
 --------------------------------------------------------------
 bar {
     font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1

-    font xft:DejaVu Sans Mono 10
+    font pango:DejaVu Sans Mono 10

 }
 --------------------------------------------------------------
 
 }
 --------------------------------------------------------------
 


@@ -1503,19 +1508,29 @@ specify a default name if there's currently no workspace starting with a "1".
 
 You can rename workspaces. This might be useful to start with the default
 numbered workspaces, do your work, and rename the workspaces afterwards to
 
 You can rename workspaces. This might be useful to start with the default
 numbered workspaces, do your work, and rename the workspaces afterwards to

-reflect what’s actually on them.
+reflect what’s actually on them. You can also omit the old name to rename
+the currently focused workspace. This is handy if you wan't to use the
+rename command with +i3-input+.

 
 *Syntax*:
 ----------------------------------------------------
 rename workspace <old_name> to <new_name>
 
 *Syntax*:
 ----------------------------------------------------
 rename workspace <old_name> to <new_name>

+rename workspace to <new_name>

 ----------------------------------------------------
 
 *Examples*:
 ----------------------------------------------------
 
 *Examples*:

-------------------------------------------------
+--------------------------------------------------------------------------

 i3-msg 'rename workspace 5 to 6'
 i3-msg 'rename workspace 1 to "1: www"'
 i3-msg 'rename workspace "1: www" to "10: www"'
 i3-msg 'rename workspace 5 to 6'
 i3-msg 'rename workspace 1 to "1: www"'
 i3-msg 'rename workspace "1: www" to "10: www"'

-------------------------------------------------
+i3-msg 'rename workspace to "2: mail"
+bindsym $mod+r exec i3-input -F 'rename workspace to %s' -P 'New name: '
+--------------------------------------------------------------------------
+
+=== Moving workspaces to a different screen
+
+See <<move_to_outputs>> for how to move a container/workspace to a different
+RandR output.

 
 === Moving containers/workspaces to RandR outputs
 
 
 === Moving containers/workspaces to RandR outputs
 


@@ -1550,7 +1565,7 @@ If you want to resize containers/windows using your keyboard, you can use the
 
 *Syntax*:
 ---------------------------------------------------------
 
 *Syntax*:
 ---------------------------------------------------------

-resize <grow|shrink> <direction> [<px> px] [or <ppt> ppt]
+resize <grow|shrink> <direction> [<px> px [or <ppt> ppt]]

 ---------------------------------------------------------
 
 Direction can either be one of +up+, +down+, +left+ or +right+. Or you can be
 ---------------------------------------------------------
 
 Direction can either be one of +up+, +down+, +left+ or +right+. Or you can be


@@ -1597,7 +1612,7 @@ bindsym $mod+r mode "resize"
 Often when in a multi-monitor environment, you want to quickly jump to a
 specific window. For example, while working on workspace 3 you may want to
 jump to your mail client to email your boss that you’ve achieved some
 Often when in a multi-monitor environment, you want to quickly jump to a
 specific window. For example, while working on workspace 3 you may want to
 jump to your mail client to email your boss that you’ve achieved some

-important goal. Instead of figuring out how to navigate to your mailclient,
+important goal. Instead of figuring out how to navigate to your mail client,

 it would be more convenient to have a shortcut. You can use the +focus+ command
 with criteria for that.
 
 it would be more convenient to have a shortcut. You can use the +focus+ command
 with criteria for that.