diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2010-01-07 15:10:29 -0500 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2010-01-07 15:10:29 -0500 |
| commit | db44ee6ed0bcadcda070a9fddc0e8ceb5a468527 (patch) | |
| tree | bbda5844d1c9027cedb73ac764b03b1a615f662f /doc | |
| parent | a250a55baaf86c6c8ebc35f908a9fc2e3c7526b4 (diff) | |
| parent | 436e29731026194e961ed0f11e85517308a400d9 (diff) | |
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ikiwikiusers.mdwn | 1 | ||||
| -rw-r--r-- | doc/sandbox.mdwn | 1 | ||||
| -rw-r--r-- | doc/todo/allow_site-wide_meta_definitions.mdwn | 5 |
3 files changed, 7 insertions, 0 deletions
diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index aa4b4b4e6..0ebab313d 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -49,6 +49,7 @@ Projects & Organizations * [Tinc VPN](http://tinc-vpn.org/) * [The XCB library](http://xcb.freedesktop.org/) * [The Philolexian Society of Columbia University](http://www.columbia.edu/cu/philo/) +* [Fachschaft Informatik HU Berlin](http://fachschaft.informatik.hu-berlin.de/) Personal sites and blogs ======================== diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index e23c6330b..f1a6ed3b4 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -74,3 +74,4 @@ bar [[!toggle id="foobar" text="foo/bar"]] +Hmm, can I dig it? diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn index 62317ba1a..99a9cf1e2 100644 --- a/doc/todo/allow_site-wide_meta_definitions.mdwn +++ b/doc/todo/allow_site-wide_meta_definitions.mdwn @@ -178,3 +178,8 @@ definitions essentially. * title -- [[Jon]] + +>>> Merry Christmas/festive season/happy new year folks. I've been away from +>>> ikiwiki for the break, and now I've returned to watching recentchanges. +>>> Hopefully I'll be back in the mix soon, too. In the meantime, Joey, have +>>> you had a chance to look at this yet? -- [[Jon]] |