summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xMakefile.PL4
-rw-r--r--debian/changelog2
-rw-r--r--doc/ikiwiki.mdwn3
-rw-r--r--po/ikiwiki.pot2
4 files changed, 8 insertions, 3 deletions
diff --git a/Makefile.PL b/Makefile.PL
index cd9683d27..0315b6d49 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -31,11 +31,11 @@ ikiwiki.out: ikiwiki.in
chmod +x ikiwiki.out
extra_build: ikiwiki.out
- LANG= perl -I. $(extramodules) $(tflag) ikiwiki.out doc html --templatedir=templates \
+ LANG= perl -Iblib/lib $(extramodules) $(tflag) ikiwiki.out doc html --templatedir=templates \
--underlaydir=underlays/basewiki --nousedirs\
--wikiname="ikiwiki" --verbose \
--exclude=/discussion --no-discussion --userdir=users \
- --plugin=goodstuff \
+ --plugin=goodstuff --plugin=version \
--plugin=haiku --plugin=polygen --plugin=fortune
./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man
./mdwn2man ikiwiki-mass-rebuild 8 doc/ikiwiki-mass-rebuild.mdwn > ikiwiki-mass-rebuild.man
diff --git a/debian/changelog b/debian/changelog
index 7fc48ed51..26e9ea7cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ ikiwiki (2.16) UNRELEASED; urgency=low
* Finally implemented a simple per-page data storage mechanism for plugins,
via the %pagestate hash.
* Use pagestate in meta to detect potential redir loops.
+ * Added a version plugin that saves state about what's using it, to force
+ pages to rebuild when ikiwiki's version changes.
-- Joey Hess <joeyh@debian.org> Mon, 03 Dec 2007 14:47:36 -0500
diff --git a/doc/ikiwiki.mdwn b/doc/ikiwiki.mdwn
index a93bfb2e4..c3773ed3a 100644
--- a/doc/ikiwiki.mdwn
+++ b/doc/ikiwiki.mdwn
@@ -1,4 +1,7 @@
This wiki is powered by [ikiwiki](http://ikiwiki.info/).
+[[if test="enabled(version)"
+ then="(Currently running version [[version ]].)"
+]]
Some documentation on using ikiwiki:
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 66659457a..d928d1414 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 17:38-0500\n"
+"POT-Creation-Date: 2007-12-08 18:30-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"