committing changes for conflict test

[git.ikiwiki.info.git] / doc / ikiwiki.setup

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index c03092b7acd5b1e28242a02ef9867ef3b596e7a3..e60d0f40709f0ab5cd0a8a5a1ce020b53396382f 100644 (file)
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -10,8 +10,8 @@ use IkiWiki::Setup::Standard {
 
        # Be sure to customise these..
        srcdir => "/path/to/source",
-       templatedir => "/path/to/templates",
        destdir => "/var/www/wiki",
+       templatedir => "/usr/share/ikiwiki/templates",
 
        url => "http://myhost/wiki",
        cgiurl => "http://myhost/ikiwiki.cgi",