summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-11 11:25:03 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-11 11:25:03 +0200
commitc8b411641e28f3d2d760752391edca67afc554b2 (patch)
tree2dbc7aaf88892eb83fc75a02f6b92c18f09a1a8c
parent665db7a4af7e86d6202f0295cbc3a8b12708ca00 (diff)
parent3aa64f2c1b42806b5d38e0a20feedcf01122384d (diff)
Merge branch 'master' into allinone
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 5730fcb..97cee63 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",