diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-11 11:28:28 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-11 11:28:28 +0200 |
| commit | 1055939846ed1e3c5da2f7cd4e8be5657c799c1a (patch) | |
| tree | 28c934b1bb9e54f9b3d06ede886f2ec17ae874c4 | |
| parent | 5cea5d62e2bbe1558b4b930efaea97dc8f4116e6 (diff) | |
| parent | 686cd91f2f4b7d06fe9b21ab9745e7b60a9fa922 (diff) | |
Merge branch 'master' into nonedit
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 5795d32..afe0e87 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", |