Merge branch 'master' into next

diff --git a/docs/userguide b/docs/userguide
index 7db9c4e7d59a95c56ddc463eb9a9a544139ff777..8b3a685963aa362feacc1dd09e0f74a5c892406a 100644 (file)
--- 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