diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-11 11:28:53 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-11 11:28:53 +0200 |
| commit | ae1c85f66ab42dc9a8fbb0aaf4a91790c990e96c (patch) | |
| tree | 6cbb41545360a95e014e75aa78a21c52975c9a41 | |
| parent | 928cc5b253ef7313c6b636b9900fbb141006eb59 (diff) | |
| parent | 686cd91f2f4b7d06fe9b21ab9745e7b60a9fa922 (diff) | |
Merge branch 'master' into allinone
Conflicts (manually resolved):
ikiwiki.setup
| -rw-r--r-- | ikiwiki.setup | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ikiwiki.setup b/ikiwiki.setup index 97cee63..a3cabff 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -12,7 +12,7 @@ use IkiWiki::Setup::Standard { # Be sure to customise these.. srcdir => $ENV{'HOME'} . "/private_webdata/samplewiki/content_dummy", - destdir => $ENV{'HOME'} . "/public_websites/wiki.example.org/wiki", + destdir => $ENV{'HOME'} . "/public_websites/wiki.example.org", url => "http://wiki.example.org", cgiurl => "http://wiki.example.org/ikiwiki.cgi", |