Merge branch 'master' into next

2011-10-02 12:57:27 +01:00 · 2011-10-02 12:57:27 +01:00 · 3537f2d4ca
commit 3537f2d4ca
parent 0482dc7546 454cc746d7
1 changed files with 1 additions and 1 deletions
--- a/docs/userguide
+++ b/docs/userguide
@ -785,7 +785,7 @@ id::
 	Compares the X11 window ID, which you can get via +xwininfo+ for example.
 title::
 	Compares the X11 window title (_NET_WM_NAME or WM_NAME as fallback).
-mark::
+con_mark::
 	Compares the mark set for this container, see <<vim_like_marks>>.
 con_id::
 	Compares the i3-internal container ID, which you can get via the IPC