diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-09-05 12:37:57 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-09-05 12:37:57 -0400 |
| commit | f9618417753fc680eaaa6b42b8555e625103a619 (patch) | |
| tree | 74e039b40b6a2f43af1a29547fb779989bb982d7 | |
| parent | a1c7f3282d4f7b67f2103c341904d29e73359995 (diff) | |
| parent | 660fde2caa368ba07468837a3a5543353a41232c (diff) | |
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
| -rw-r--r-- | doc/todo/structured_page_data/discussion.mdwn | 1 | ||||
| -rw-r--r-- | doc/users/Edward_Betts.mdwn | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/todo/structured_page_data/discussion.mdwn b/doc/todo/structured_page_data/discussion.mdwn new file mode 100644 index 000000000..bc7f39277 --- /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 69ca043c2..0d4483fa8 100644 --- 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* "]] |