Config: Hint that moduleFolder directive is currently not in use

refs #3776

application/forms/Config/GeneralForm.php

@@ -191,7 +191,10 @@ class GeneralForm extends Form
             array(
                 'label'     => 'Module Folder',
                 'required'  => true,
-                'helptext'  => 'Use this folder to activate modules (must be writable by your webserver)',
+                'helptext'  => 'The moduleFolder directive is currently not used anywhere but '
+                    . 'configureable via the frontend and ini. With feature #4607 moduleFolder '
+                    . 'will be replaced with a configuration directive for locations of '
+                    . 'installed modules',
                 'value'     => $cfg->get('moduleFolder', $this->getConfigDir() . '/config/enabledModules')
             )
         );

config/config.ini

@@ -1,30 +1,36 @@
 [global]
-environment = development
+environment         = "development"        
-timezone    = "Europe/Berlin"
+timezone            = "Europe/Berlin"      
-indexModule = monitoring
+indexModule         = "monitoring"         
-indexController = dashboard
+indexController     = "dashboard"          
-moduleFolder = "/etc/icinga2-web/enabledModules"
+; The moduleFolder directive is currently not used anywhere but configureable
-dateFormat = "d/m/Y"
+; via the frontend and this file. With feature #4607 moduleFolder will
-timeFormat = "g:i A"
+; be replaced with a configuration directive for locations of
+; installed modules
+moduleFolder        = "/etc/icinga2-web/enabledModules"
+dateFormat          = "d/m/Y"              
+timeFormat          = "g:i A"              
 
 [logging]
 ; General log
-enable  = 1
+enable              = "1"                  
-type    = stream
+type                = "stream"             
-verbose = 1
+verbose             = "1"                  
-target  = /tmp/icinga2.log
+target              = "/tmp/icinga2.log"   
 
 ; For development and debug purposes: Logs additional (non critical) events to a
 ; seperate log
-debug.enable = 1
+debug.enable        = "1"                  
-debug.type   = stream
+debug.type          = "stream"             
-debug.target = /tmp/icinga2.debug.log
+debug.target        = "/tmp/icinga2.debug.log"
 
 ; Use ini store to store preferences on local disk
 [preferences]
-type=ini
+type                = "ini"                
 
 ; Use database to store preference into mysql or postgres
 ;[preferences]
 ;type=db
 ;resource=icingaweb-mysql
+
+configPath          = "/vagrant/config/preferences"

library/Icinga/Web/Controller/ActionController.php

@@ -75,7 +75,7 @@ class ActionController extends ZfController
     protected $modifiesSession = false;
 
     /**
-     * True if authentication suceeded, otherwise false
+     * True if authentication succeeded, otherwise false
      *
      * @var bool
      */