Merge commit 'upstream/master' into pub/po

[git.ikiwiki.info.git] / doc / users / Edward_Betts.mdwn

diff --git a/doc/users/Edward_Betts.mdwn b/doc/users/Edward_Betts.mdwn
index 038c00eb7fc76e3984b9047428ecf46a8158378d..b32927a1c312b13f632506deaf3fbcd09baf5a7f 100644 (file)
--- a/doc/users/Edward_Betts.mdwn
+++ b/doc/users/Edward_Betts.mdwn
@@ -1,3 +1,9 @@
 My watchlist:
 
-[[inline pages="todo/allow_wiki_syntax_in_commit_messages" archive=yes]]
+[[!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*
+"]]
+