X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/e910acfbc91a6132b82bf4f33b19574d61da3169..f8d24df4c40dc958649aafeb6646d876f290dbb7:/auto.setup

diff --git a/auto.setup b/auto.setup
index 74879dbc5..3da5e3a62 100644
--- a/auto.setup
+++ b/auto.setup
@@ -17,7 +17,7 @@ our $wikiname=IkiWiki::Setup::Automator::ask(
 our $rcs=IkiWiki::Setup::Automator::ask(
 	gettext("What revision control system to use?"), "git");
 our $admin=IkiWiki::Setup::Automator::ask(
-	gettext("What wiki user (or openid) will be wiki admin?"), $ENV{USER});
+	gettext("What wiki user (or openid) will be admin?"), $ENV{USER});
 use Net::Domain q{hostfqdn};
 our $domain=hostfqdn() || ikiwiki::setup::automator::ask(
 	gettext("What is the domain name of the web server?"), "");
@@ -28,7 +28,7 @@ IkiWiki::Setup::Automator->import(
 	rcs => $rcs,
 	srcdir => "$ENV{HOME}/$wikiname",
 	destdir => "$ENV{HOME}/public_html/$wikiname",
-	repository => "$ENV{HOME}/$wikiname.$rcs",
+	repository => "$ENV{HOME}/$wikiname.".($rcs eq "monotone" ? "mtn" : $rcs),
 	dumpsetup => "$ENV{HOME}/$wikiname.setup",
 	url => "http://$domain/~$ENV{USER}/$wikiname",
 	cgiurl => "http://$domain/~$ENV{USER}/$wikiname/ikiwiki.cgi",
@@ -40,6 +40,4 @@ IkiWiki::Setup::Automator->import(
 	rss => 1,
 	atom => 1,
 	syslog => 1,
-	prefix_directives => 1,
-	hardlink => 1,
 )