From: Maks Date: Tue, 18 Sep 2012 18:58:57 +0000 (-0700) Subject: Merge pull request #120 from Goram/master X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=b2dec864819049deb3fc935352fca9d0096c131b;hp=1165488b2161a508c2afec6ea2cb1a1a0d792c4a;p=zf2.biz%2Fgalerie.git Merge pull request #120 from Goram/master Changed 2 spaces to 4. --- diff --git a/config/autoload/global.php b/config/autoload/global.php index 1473720..104762e 100644 --- a/config/autoload/global.php +++ b/config/autoload/global.php @@ -2,7 +2,7 @@ /** * Global Configuration Override * - * You can use this file for overridding configuration values from modules, etc. + * You can use this file for overriding configuration values from modules, etc. * You would place values in here that are agnostic to the environment and not * sensitive to security. * diff --git a/config/autoload/local.php.dist b/config/autoload/local.php.dist index 7862eba..33fb696 100644 --- a/config/autoload/local.php.dist +++ b/config/autoload/local.php.dist @@ -8,7 +8,7 @@ * * @NOTE: This file is ignored from Git by default with the .gitignore included * in ZendSkeletonApplication. This is a good practice, as it prevents sensitive - * credentials from accidentally being comitted into version control. + * credentials from accidentally being committed into version control. */ return array(