diff options
| -rw-r--r-- | debian/NEWS | 9 | ||||
| -rw-r--r-- | doc/ikiwiki.mdwn | 12 | ||||
| -rw-r--r-- | po/ikiwiki.pot | 2 | ||||
| l--------- | underlays/basewiki/ikiwiki.mdwn | 1 |
4 files changed, 23 insertions, 1 deletions
diff --git a/debian/NEWS b/debian/NEWS index 87fcc5e63..0ef731441 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,3 +1,12 @@ +ikiwiki (2.16) UNRELEASED; urgency=low + + Many of the pages in ikiwiki's basewiki have been moved and renamed in this + release, to avoid the basewiki including pages with names like "blog". + Redirection pages have been left behind for these moved pages temporarily, + and will be removed later. + + -- Joey Hess <joeyh@debian.org> Sat, 08 Dec 2007 16:04:43 -0500 + ikiwiki (2.14) unstable; urgency=low This version of ikiwiki is more picky about symlinks in the path leading diff --git a/doc/ikiwiki.mdwn b/doc/ikiwiki.mdwn new file mode 100644 index 000000000..a93bfb2e4 --- /dev/null +++ b/doc/ikiwiki.mdwn @@ -0,0 +1,12 @@ +This wiki is powered by [ikiwiki](http://ikiwiki.info/). + +Some documentation on using ikiwiki: + +* [[ikiwiki/formatting]] +* [[ikiwiki/blog]] +* [[ikiwiki/pagespec]] +* [[ikiwiki/PreprocessorDirective]] +* [[ikiwiki/wikilink]] +* [[ikiwiki/markdown]] +* [[ikiwiki/subpage]] +* [[ikiwiki/openid]] diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 682928a99..ded390439 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-08 15:44-0500\n" +"POT-Creation-Date: 2007-12-08 16:00-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/underlays/basewiki/ikiwiki.mdwn b/underlays/basewiki/ikiwiki.mdwn new file mode 120000 index 000000000..6d43605d5 --- /dev/null +++ b/underlays/basewiki/ikiwiki.mdwn @@ -0,0 +1 @@ +../../doc/ikiwiki.mdwn
\ No newline at end of file |