summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/git.mdwn1
-rw-r--r--doc/todo/nested_preprocessor_directives.mdwn2
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/git.mdwn b/doc/git.mdwn
index d221b7c35..ebea400ee 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -72,6 +72,7 @@ think about merging them. This is recommended. :-)
* [[levitte]] `git://github.com/levitte/ikiwiki.git`
* jo `git://git.debian.org/users/jo-guest/ikiwiki.git`
([browse](http://git.debian.org/?p=users/jo-guest/ikiwiki.git;a=summary))
+* [[timonator]] `git://github.com/timo/ikiwiki.git`
## branches
diff --git a/doc/todo/nested_preprocessor_directives.mdwn b/doc/todo/nested_preprocessor_directives.mdwn
index 1d44cea88..f38f94444 100644
--- a/doc/todo/nested_preprocessor_directives.mdwn
+++ b/doc/todo/nested_preprocessor_directives.mdwn
@@ -26,7 +26,7 @@ nesting, a new syntax would be needed. Maybe something xml-like?
>>
>> \[[!directive text=<<FOO
>> ...
->> <<FOO]]
+>> FOO]]
>>
>> Since that's implemented, I will probably just merge it,
>> once I satisfy myself it doesn't blow up in any edge cases.