Merge branch 'release-4.16.1'

[i3/i3] / man / i3.man

diff --git a/man/i3.man b/man/i3.man
index 203b42eea26e57ab7379fd180d50c8a4651b6146..640b5ac81a36e95703f8a627711cde624e9137a7 100644 (file)
--- a/man/i3.man
+++ b/man/i3.man
@@ -77,6 +77,12 @@ i3 keeps your layout in a tree data structure.
 Window::
 An X11 window, like the Firefox browser window or a terminal emulator.
 
+Floating Window::
+A window which "floats" on top of other windows. This style is used by i3 to
+display X11 windows with type "dialog", such as the "Print" or "Open File"
+dialog boxes in many GUI applications. Use of floating windows can be
+fine-tuned with the for_window command (see HTML userguide).
+
 Split container::
 A split container contains multiple other split containers or windows.
 +
@@ -165,8 +171,8 @@ Exits i3.
 When starting, i3 looks for configuration files in the following order:
 
 1. ~/.config/i3/config (or $XDG_CONFIG_HOME/i3/config if set)
-2. /etc/xdg/i3/config (or $XDG_CONFIG_DIRS/i3/config if set)
-3. ~/.i3/config
+2. ~/.i3/config
+3. /etc/xdg/i3/config (or $XDG_CONFIG_DIRS/i3/config if set)
 4. /etc/i3/config
 
 You can specify a custom path using the -c option.
@@ -335,7 +341,7 @@ which is why this is not integrated into this manpage), the debugging guide,
 and the "how to hack" guide. If you are building from source, run:
  +make -C docs+
 
-You can also access these documents online at http://i3wm.org/
+You can also access these documents online at https://i3wm.org/
 
 i3-input(1), i3-msg(1), i3bar(1), i3-nagbar(1), i3-config-wizard(1),
 i3-migrate-config-to-v4(1)