Merge branch 'master' into next

[i3/i3] / man / i3.man

diff --git a/man/i3.man b/man/i3.man
index 868ff8ccd4f601ed0b628d72a86d76b1971c623b..9d34c71038a316e01601ebe7543bffb15e7038a7 100644 (file)
--- a/man/i3.man
+++ b/man/i3.man
@@ -238,9 +238,10 @@ bindsym Mod1+Shift+r restart
 # exit i3 (logs you out of your X session)
 bindsym Mod1+Shift+e exit
 
-# Start i3bar to display a workspace bar (plus the system information i3status
-# finds out, if available)
-exec i3status | i3bar -d
+# display workspace buttons plus a statusline generated by i3status
+bar {
+    status_command i3status
+}
 -------------------------------------------------------------
 
 === ~/.xsession
@@ -293,9 +294,10 @@ exec /usr/bin/i3 -V -d all >> ~/.i3/logfile
 === I3SOCK
 
 This variable overwrites the IPC socket path (placed in
-/tmp/i3-%u/ipc-socket.%p by default, where %u is replaced with your UNIX
-username and %p is replaced with i3’s PID). The IPC socket is used by external
-programs like i3-msg(1) or i3bar(1).
+/tmp/i3-%u.XXXXXX/ipc-socket.%p by default, where %u is replaced with your UNIX
+username, %p is replaced with i3’s PID and XXXXXX is a string of random
+characters from the portable filename character set (see mkdtemp(3))). The IPC
+socket is used by external programs like i3-msg(1) or i3bar(1).
 
 == TODO
 
@@ -309,7 +311,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://i3.zekjur.net/
+You can also access these documents online at http://i3wm.org/
 
 i3-input(1), i3-msg(1), i3-wsbar(1), i3-nagbar(1), i3-config-wizard(1),
 i3-migrate-config-to-v4(1)