Merge branch 'master' into debian-jessie-backports

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

diff --git a/auto.setup b/auto.setup
index 843b4193aba78f2312f84e3c62cd273274f04438..1bcac36cb31c799f8a85aa90b41d2f4408019534 100644 (file)
--- a/auto.setup
+++ b/auto.setup
@@ -18,7 +18,7 @@ our $wikiname_short=IkiWiki::Setup::Automator::sanitize_wikiname($wikiname);
 our $rcs=IkiWiki::Setup::Automator::ask(
        gettext("What revision control system to use?"), "git");
 our $admin=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("Which user (wiki account or openid) will be admin?"), $ENV{USER});
+       gettext("Which user (wiki account, openid, or email) 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?"), "");
 use Net::Domain q{hostfqdn};
 our $domain=hostfqdn() || IkiWiki::Setup::Automator::ask(
        gettext("What is the domain name of the web server?"), "");