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

diff --git a/doc/plugins/contrib/nimble.mdwn b/doc/plugins/contrib/nimble.mdwn
new file mode 100644 (file)
index 0000000..29e2686
--- /dev/null
+++ b/doc/plugins/contrib/nimble.mdwn
@@ -0,0 +1,6 @@
+[[!template id=plugin name=nimble author="[[schmonz]]"]]
+[[!template id=gitbranch branch=schmonz/nimble author="[[schmonz]]"]]
+[[!tag type/format]]
+
+This plugin lets ikiwiki convert [Nimble](http://was.tl/projects/nimble/)
+to HTML.

diff --git a/doc/todo/support_linking_to_cgit.mdwn b/doc/todo/support_linking_to_cgit.mdwn
index 00afb82fd6ea31a79d27fc023763a7d4b56ef897..f379edee83d3b58bc2fcddfab4f3edcaa2a20342 100644 (file)
--- a/doc/todo/support_linking_to_cgit.mdwn
+++ b/doc/todo/support_linking_to_cgit.mdwn
@@ -25,6 +25,8 @@ the substitution of `\[[file]]` in `diffurl` and `historyurl`?
 >>> for the Git plugin. Please review and merge if you like
 >>> it. --[[intrigeri]]
 
+>>>> Ping? --[[intrigeri]]
+
 [[wishlist]]
 
 [[!tag patch]]