summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/git.mdwn1
-rw-r--r--doc/ikiwikiusers.mdwn1
-rw-r--r--doc/sandbox.mdwn1
-rw-r--r--doc/todo/allow_site-wide_meta_definitions.mdwn5
4 files changed, 8 insertions, 0 deletions
diff --git a/doc/git.mdwn b/doc/git.mdwn
index d21a282e4..5167ad004 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -55,6 +55,7 @@ into [[Joey]]'s working tree. This is recommended. :-)
* [[KathrynAndersen]] `git://github.com/rubykat/ikiplugins.git`
* [[ktf]] `git://github.com/ktf/ikiwiki.git`
* [[tove]] `git://github.com/tove/ikiwiki.git`
+* [[GiuseppeBilotta]] `git://git.oblomov.eu/ikiwiki`
## branches
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]]