Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/doc/users/Edward_Betts.mdwn b/doc/users/Edward_Betts.mdwn
index b32927a1c312b13f632506deaf3fbcd09baf5a7f..61d6150ef21dcd092cb11b94bcbb27eb2d843eca 100644 (file)
--- a/doc/users/Edward_Betts.mdwn
+++ b/doc/users/Edward_Betts.mdwn
@@ -1,9 +1,4 @@
 My watchlist:
 
-[[!inline archive="yes" sort="mtime" atom="yes" pages="
-todo/allow_wiki_syntax_in_commit_messages*
-todo/shortcut_with_different_link_text*
-todo/structured_page_data*
-tips/convert_mediawiki_to_ikiwiki*
-"]]
+[[!inline archive="yes" sort="mtime" atom="yes" pages="todo/allow_wiki_syntax_in_commit_messages* or todo/shortcut_with_different_link_text* or todo/structured_page_data* or tips/convert_mediawiki_to_ikiwiki*"]]