diff options
| author | Joey Hess <joey@kitenet.net> | 2010-10-08 19:32:20 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-10-08 19:32:20 -0400 |
| commit | 726270ad0017cfd1d1c36e9a765eb0638bec86f6 (patch) | |
| tree | bfd395a2d069469592fd8bb0f3347fd391d64dea | |
| parent | 59ea972fc91005699b14204c989c2d29997a3009 (diff) | |
| parent | 7aba3bd74696dc5c3f51448db29bfba0c58d6529 (diff) | |
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
| -rw-r--r-- | doc/ikiwiki/directive/aggregate/discussion.mdwn | 3 | ||||
| -rw-r--r-- | doc/news/openid.mdwn | 2 | ||||
| -rw-r--r-- | doc/templates/discussion.mdwn | 3 | ||||
| -rw-r--r-- | doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn | 2 |
4 files changed, 9 insertions, 1 deletions
diff --git a/doc/ikiwiki/directive/aggregate/discussion.mdwn b/doc/ikiwiki/directive/aggregate/discussion.mdwn new file mode 100644 index 000000000..cf3d2022f --- /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 32325559e..025a07802 100644 --- 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 4ddc48ac3..efeedf448 100644 --- 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 6ca9962ba..fb33f195c 100644 --- 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]] |