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

diff --git a/doc/todo/ctime_on_blog_post_pages_.mdwn b/doc/todo/ctime_on_blog_post_pages_.mdwn
new file mode 100644 (file)
index 0000000..4fd099d
--- /dev/null
+++ b/doc/todo/ctime_on_blog_post_pages_.mdwn
@@ -0,0 +1,5 @@
+[[Blog|ikiwiki/blog]] feeds and index pages show the posted time (ctime), the actual blog entry pages only show the modified time.
+
+The user has to look at the history link to find when a blog item was posted.
+
+It would be nice if blog entry post pages could include the ctime. -- [[Edward_Betts]]

diff --git a/doc/todo/multiple_templates.mdwn b/doc/todo/multiple_templates.mdwn
index 361270bb9bdc3368e3cb358574c2252a6fce7572..d165eebafff5ecbe93360b888020dfbdf4ef190e 100644 (file)
--- a/doc/todo/multiple_templates.mdwn
+++ b/doc/todo/multiple_templates.mdwn
@@ -1,11 +1,11 @@
-> Another useful feature might be to be able to choose a different template
-> file for some pages; blog pages would use a template different from the
+> Another useful feature might be to be able to choose a different [[template|wikitemplates]]
+> file for some pages; [[blog|ikiwiki/blog]] pages would use a template different from the
 > home page, even if both are managed in the same repository, etc.
 
-Well, that would probably be fairly easy to add if it used pagespecs to
+Well, that would probably be fairly easy to add if it used [[pagespecs|ikiwiki/pagespec]] to
 specify which pages use the non-default template.
 
-Hmm, I think the pagetemplate hook should allow one to get close enough to
+Hmm, I think the [[pagetemplate|plugins/pagetemplate]] hook should allow one to get close enough to
 this in a plugin now.
 
 See also: [[Allow_per-page_template_selection]] -- same thing, really.

diff --git a/doc/users/Edward_Betts.mdwn b/doc/users/Edward_Betts.mdwn
index 3beec42f5c588dce8c9e0ee9ef52016b36677f00..8653c33c25d946126f089b90a676a4b523f9d2a7 100644 (file)
--- a/doc/users/Edward_Betts.mdwn
+++ b/doc/users/Edward_Betts.mdwn
@@ -1,3 +1,4 @@
 My watchlist:
 
 [[inline pages="todo/allow_wiki_syntax_in_commit_messages" archive="yes" sort="mtime" atom="yes"]]
+

diff --git a/doc/wikitemplates.mdwn b/doc/wikitemplates.mdwn
index 1f6325b4bd4de620f71a075d8aa85e6570f21f2b..389bdbfe99c469a2e0bf6dd462abfa0d76d39620 100644 (file)
--- a/doc/wikitemplates.mdwn
+++ b/doc/wikitemplates.mdwn
@@ -14,7 +14,7 @@ located in /usr/share/ikiwiki/templates by default.
 * `change.tmpl` - Used to create a page describing a change made to the wiki.
 * `passwordmail.tmpl` - Not a html template, this is used to
   generate the mail with the user's password in it.
-* `rsspage.tmpl` - Used for generating rss feeds for [blogs|[ikiwiki/blog]].
+* `rsspage.tmpl` - Used for generating rss feeds for [[blogs|ikiwiki/blog]].
 * `rssitem.tmpl` - Used for generating individual items on rss feeds.
 * `atompage.tmpl` - Used for generating atom feeds for blogs.
 * `atomitem.tmpl` - Used for generating individual items on atom feeds.