summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-11 11:23:44 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-11 11:23:44 +0200
commit5cea5d62e2bbe1558b4b930efaea97dc8f4116e6 (patch)
tree2cab40b478ac994b0475bf7595b6c75653a87f75
parent63c1477123651ccaac5a817992578ae37094d953 (diff)
parent3aa64f2c1b42806b5d38e0a20feedcf01122384d (diff)
Merge branch 'master' into nonedit
Conflicts (manually resolved): ikiwiki.setup Also, examplewiki -> samplewiki applied to admin setup too.
-rw-r--r--ikiwiki.setup2
-rw-r--r--ikiwiki_admin.setup2
2 files changed, 2 insertions, 2 deletions
diff --git a/ikiwiki.setup b/ikiwiki.setup
index d9d6973..5795d32 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -11,7 +11,7 @@ use IkiWiki::Setup::Standard {
adminemail => 'me@example.org',
# Be sure to customise these..
- srcdir => $ENV{'HOME'} . "/private_webdata/examplewiki/content_dummy",
+ srcdir => $ENV{'HOME'} . "/private_webdata/samplewiki/content_dummy",
destdir => $ENV{'HOME'} . "/public_websites/wiki.example.org/wiki",
url => "http://wiki.example.org",
diff --git a/ikiwiki_admin.setup b/ikiwiki_admin.setup
index 88ba4ae..eda158d 100644
--- a/ikiwiki_admin.setup
+++ b/ikiwiki_admin.setup
@@ -11,7 +11,7 @@ use IkiWiki::Setup::Standard {
adminemail => 'me@example.org',
# Be sure to customise these..
- srcdir => $ENV{'HOME'} . "/private_webdata/examplewiki/content",
+ srcdir => $ENV{'HOME'} . "/private_webdata/samplewiki/content",
destdir => $ENV{'HOME'} . "/public_websites/wiki.example.org",
url => "http://wiki.example.org",