diff options
| author | intrigeri <intrigeri@boum.org> | 2009-01-15 20:04:31 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2009-01-15 20:04:31 +0100 |
| commit | e6992480e2e0cf965650f84aa97e01fe0fa71544 (patch) | |
| tree | b4c1743a8f99d22788e190b46f5cb1c09b9b50bb /auto.setup | |
| parent | 48de7f9c7b387ca9f21294b47efc58e7dd64c6ad (diff) | |
| parent | 63fe022602b622eb80bd38d64ee272b543ce0418 (diff) | |
Merge commit 'upstream/master' into prv/po
Conflicts:
debian/control
Diffstat (limited to 'auto.setup')
| -rw-r--r-- | auto.setup | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/auto.setup b/auto.setup index 9cf5e7725..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?"), ""); @@ -40,5 +40,4 @@ IkiWiki::Setup::Automator->import( rss => 1, atom => 1, syslog => 1, - hardlink => 1, ) |