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

diff --git a/doc/todo/structured_page_data/discussion.mdwn b/doc/todo/structured_page_data/discussion.mdwn
new file mode 100644 (file)
index 0000000..bc7f392
--- /dev/null
+++ b/doc/todo/structured_page_data/discussion.mdwn
@@ -0,0 +1 @@
+How about using JSON? YAML is popular in the Perl world, but the Web 2.0 world seems more excited about using JSON for data serialization. I find it easier to edit JSON by hand than YAML. -- [[Edward|/users/Edward_Betts]]

diff --git a/doc/users/Edward_Betts.mdwn b/doc/users/Edward_Betts.mdwn
index 69ca043c23c128a951269205dda9669ff688b3c7..0d4483fa87f05431d2d7ee38502eae9896d6b3c0 100644 (file)
--- a/doc/users/Edward_Betts.mdwn
+++ b/doc/users/Edward_Betts.mdwn
@@ -1,4 +1,7 @@
 My watchlist:
 
-[[!inline pages="todo/allow_wiki_syntax_in_commit_messages todo/shortcut_with_different_link_text" archive="yes" sort="mtime" atom="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* "]]