aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2010-02-05 13:46:35 -0500
committerJoey Hess <joey@gnu.kitenet.net>2010-02-05 13:46:35 -0500
commit919d66b3257a7733049b8ac158ae6c80e0613ef0 (patch)
treefc9967f8cd7ad473c35e834b48a761e778f0f773 /doc
parent34a64557cf5f4a913c07f04d021debdd5fb58b1b (diff)
parent0e67c26e2e656cf54aa13033c56e204237ef5775 (diff)
downloadikiwiki-919d66b3257a7733049b8ac158ae6c80e0613ef0.tar
ikiwiki-919d66b3257a7733049b8ac158ae6c80e0613ef0.tar.gz
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Diffstat (limited to 'doc')
-rw-r--r--doc/users/Edward_Betts.mdwn7
1 files changed, 1 insertions, 6 deletions
diff --git a/doc/users/Edward_Betts.mdwn b/doc/users/Edward_Betts.mdwn
index b32927a1c..61d6150ef 100644
--- 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*"]]