diff options
| author | Josh Triplett <josh@freedesktop.org> | 2008-02-09 23:02:52 -0800 |
|---|---|---|
| committer | Josh Triplett <josh@freedesktop.org> | 2008-02-09 23:02:52 -0800 |
| commit | 122f6df3259e8ca1dd96554d08cebce4b5c55acc (patch) | |
| tree | 2e1d6f54e62936792176caba483af8cc0907c755 /templates | |
| parent | fb82474be06f1be2c96bdfc231c3768cabe0d4eb (diff) | |
| parent | 8b577726ab3768d50ca7d3fdef240e37fe046fc2 (diff) | |
| download | ikiwiki-122f6df3259e8ca1dd96554d08cebce4b5c55acc.tar ikiwiki-122f6df3259e8ca1dd96554d08cebce4b5c55acc.tar.gz | |
Merge branch 'master' into prefix-directives
Conflicts:
debian/changelog
templates/change.tmpl
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/change.tmpl | 2 | ||||
| -rw-r--r-- | templates/page.tmpl | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/templates/change.tmpl b/templates/change.tmpl index 184d8dc2d..e476a7439 100644 --- a/templates/change.tmpl +++ b/templates/change.tmpl @@ -2,7 +2,7 @@ <TMPL_IF AUTHORURL> [[!meta authorurl="""<TMPL_VAR AUTHORURL>"""]] </TMPL_IF> -[[!meta title="""update of <TMPL_VAR WIKINAME>'s<TMPL_LOOP NAME="PAGES"> <TMPL_VAR PAGE></TMPL_LOOP>"""]] +[[!meta title="""change to<TMPL_LOOP NAME="PAGES"> <TMPL_VAR PAGE></TMPL_LOOP> on <TMPL_VAR WIKINAME>"""]] <div class="metadata"> <span class="desc"><br />Changed pages:</span> <span class="pagelinks"> diff --git a/templates/page.tmpl b/templates/page.tmpl index 3a1ac9ef8..249ee2efb 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -104,6 +104,7 @@ License: <TMPL_VAR LICENSE> <div class="pagedate"> Last edited <TMPL_VAR NAME=MTIME> +<!-- Created <TMPL_VAR NAME=CTIME> --> </div> </div> |