From fb89bfd26bc248b8ce7c21446512b78b9ecb3391 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 7 Nov 2008 12:22:01 -0500
Subject: [PATCH] document wikistatedir, though it's still internal
---
IkiWiki.pm | 9 ++++++++-
po/ikiwiki.pot | 14 +++++++-------
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/IkiWiki.pm b/IkiWiki.pm
index 91d2e6082..1aaa4d33c 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -403,6 +403,13 @@ sub getsetup () { #{{{
safe => 0,
rebuild => 0,
},
+ wikistatedir => {
+ type => "internal",
+ default => undef,
+ description => "path to the .ikiwiki directory holding ikiwiki state",
+ safe => 0,
+ rebuild => 0,
+ },
setupfile => {
type => "internal",
default => undef,
@@ -467,7 +474,7 @@ sub checkconfig () { #{{{
}
$config{wikistatedir}="$config{srcdir}/.ikiwiki"
- unless exists $config{wikistatedir};
+ unless exists $config{wikistatedir} && defined $config{wikistatedir};
if (defined $config{umask}) {
umask(possibly_foolish_untaint($config{umask}));
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 6894dd2f6..34fa5e65b 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: 2008-11-06 20:47-0500\n"
+"POT-Creation-Date: 2008-11-07 12:23-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"
@@ -48,7 +48,7 @@ msgstr ""
msgid "You are banned."
msgstr ""
-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1182
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1189
msgid "Error"
msgstr ""
@@ -951,25 +951,25 @@ msgstr ""
msgid "refreshing wiki.."
msgstr ""
-#: ../IkiWiki.pm:466
+#: ../IkiWiki.pm:473
msgid "Must specify url to wiki with --url when using --cgi"
msgstr ""
-#: ../IkiWiki.pm:512
+#: ../IkiWiki.pm:519
msgid "cannot use multiple rcs plugins"
msgstr ""
-#: ../IkiWiki.pm:541
+#: ../IkiWiki.pm:548
#, perl-format
msgid "failed to load external plugin needed for %s plugin: %s"
msgstr ""
-#: ../IkiWiki.pm:1165
+#: ../IkiWiki.pm:1172
#, perl-format
msgid "preprocessing loop detected on %s at depth %i"
msgstr ""
-#: ../IkiWiki.pm:1678
+#: ../IkiWiki.pm:1685
msgid "yes"
msgstr ""
--
2.26.2