Merge branch 'master' into feature/composer

[zf2.biz/galerie.git] / module / Application / config / module.config.php

diff --git a/module/Application/config/module.config.php b/module/Application/config/module.config.php
index 4af685f..8015ff5 100644 (file)
--- a/module/Application/config/module.config.php
+++ b/module/Application/config/module.config.php
@@ -11,7 +11,7 @@ return array(
                         'action'     => '[a-zA-Z][a-zA-Z0-9_-]*',
                     ),
                     'defaults' => array(
-                        'controller' => 'IndexController',
+                        'controller' => 'index',
                         'action'     => 'index',
                     ),
                 ),
@@ -21,19 +21,22 @@ return array(
                 'options' => array(
                     'route'    => '/',
                     'defaults' => array(
-                        'controller' => 'IndexController',
+                        'controller' => 'index',
                         'action'     => 'index',
                     ),
                 ),
             ),
         ),
     ),
-    'controllers' => array(
-        'IndexController' => 'Application\Controller\IndexController'
+    'controller' => array(
+        'classes' => array(
+            'index' => 'Application\Controller\IndexController'
+        ),
     ),
     'view_manager' => array(
         'display_not_found_reason' => true,
         'display_exceptions'       => true,
+        'doctype'                  => 'HTML5',
         'not_found_template'       => 'error/404',
         'exception_template'       => 'error/index',
         'template_map' => array(