merged master

Change-Id: I0323bdbc035962a6ac8f9473df8a6b72acf82b4c

diff --git a/maintenance/install.php b/maintenance/install.php
index 65d6a70..8e0b2e1 100644 (file)
--- a/maintenance/install.php
+++ b/maintenance/install.php
@@ -39,7 +39,7 @@ class CommandLineInstaller extends Maintenance {
                $this->addArg( 'name', 'The name of the wiki', true);
 
                $this->addArg( 'admin', 'The username of the wiki administrator (WikiSysop)', true );
-               $this->addOption( 'pass', 'The password for the wiki administrator. You will be prompted for this if it isn\'t provided', false, true );
+               $this->addOption( 'pass', 'The password for the wiki administrator.', true, true );
                /* $this->addOption( 'email', 'The email for the wiki administrator', false, true ); */
                $this->addOption( 'scriptpath', 'The relative path of the wiki in the web server (/wiki)', false, true );