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

diff --git a/doc/ikiwiki/directive/aggregate/discussion.mdwn b/doc/ikiwiki/directive/aggregate/discussion.mdwn
new file mode 100644 (file)
index 0000000..cf3d202
--- /dev/null
+++ b/doc/ikiwiki/directive/aggregate/discussion.mdwn
@@ -0,0 +1,3 @@
+It would be awesome if table could aggregrate remote CSVs too. I want something like:
+
+     !table file="http://cyclehireapp.com/cyclehirelive/cyclehire.csv"

diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn
index 32325559e574ea07687903b2575ca55f3ec0a2ce..025a07802345a6bb3f80bd684687c4143be9566a 100644 (file)
--- a/doc/news/openid.mdwn
+++ b/doc/news/openid.mdwn
@@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an
 OpenID, and see how OpenID works for you. And let me know your feelings about
 making such a switch. --[[Joey]]
 
-[[!poll 66 "Accept only OpenID for logins" 21 "Accept only password logins" 37 "Accept both"]]
+[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 37 "Accept both"]]

diff --git a/doc/templates/discussion.mdwn b/doc/templates/discussion.mdwn
index 4ddc48ac36092949c4edc2f30fca7f9892d41bef..efeedf448a03735492411cfb4f16b88e9ba5276e 100644 (file)
--- a/doc/templates/discussion.mdwn
+++ b/doc/templates/discussion.mdwn
@@ -7,6 +7,9 @@ note and popups are templates? But they're not in the templates directory, and i
 > installed there, typically in `/usr/share/ikiwiki/basewiki/templates/`
 > --[[Joey]]
 
+> > And how am I able to use e.g. links? It's not listed in `/usr/share/ikiwiki/basewiki/templates`.
+> > I intend do (mis)use links for a horizontal navigation. Or may I be better off altering page.tmpl?
+> > --z3ttacht
 
 Is there a list of the TMPL_VAR-Variables that are defined by ikiwiki?
 

diff --git a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn
index 6ca9962ba632a1e33c27017ab9cbf5cbb00d2993..fb33f195c1593fe950e31eab42e6621e32e5abf0 100644 (file)
--- a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn
+++ b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn
@@ -21,4 +21,6 @@ and decided this time it was really needed to implement this feature.
 
 --[[intrigeri]]
 
+> Ping. --[[intrigeri]]
+
 [[!tag patch]]