diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-11 11:30:17 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-11 11:30:17 +0200 |
| commit | fe86ef498309f06b2418eaf131a1fd1ae15bd701 (patch) | |
| tree | 5624afb8018187beb0bedf9ea83e43b399226c2f | |
| parent | fedca72d55ae521c29dee01725614b89140c202b (diff) | |
| parent | 1055939846ed1e3c5da2f7cd4e8be5657c799c1a (diff) | |
Merge branch 'nonedit' into allinone-da
Conflicts (manually resolved):
ikiwiki_da.setup
| -rw-r--r-- | ikiwiki_da.setup | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ikiwiki_da.setup b/ikiwiki_da.setup index 36221ad..c8148ef 100644 --- a/ikiwiki_da.setup +++ b/ikiwiki_da.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", |