Merge pull request #5305 from lucascherifi/master

Typo fix

CHANGELOG.md

@@ -1,7 +1,7 @@
 ### [1.1.0] - 2016-05-10
 
   * Added fallback to SSH for https bitbucket URLs
-  * Added BaseCommand::isProxyCommand that can be overriden to mark a command as being a mere proxy, which helps avoid duplicate warnings etc on composer startup
+  * Added BaseCommand::isProxyCommand that can be overridden to mark a command as being a mere proxy, which helps avoid duplicate warnings etc on composer startup
   * Fixed archiving generating long paths in zip files on Windows
 
 ### [1.1.0-RC] - 2016-04-29

src/Composer/DependencyResolver/Rule.php

@@ -221,7 +221,7 @@ class Rule
                             $extra = $package->getExtra();
 
                             if (!empty($extra['config.platform'])) {
-                                $text .= ' -> your PHP version ('.phpversion().') overriden by "config.platform.php" version ('.$package->getPrettyVersion().') does not satisfy that requirement.';
+                                $text .= ' -> your PHP version ('.phpversion().') overridden by "config.platform.php" version ('.$package->getPrettyVersion().') does not satisfy that requirement.';
                             } else {
                                 $text .= ' -> your PHP version ('.$package->getPrettyVersion().') does not satisfy that requirement.';
                             }

tests/Composer/Test/Fixtures/installer/github-issues-4319.test

@@ -37,7 +37,7 @@ Your requirements could not be resolved to an installable set of packages.
 
   Problem 1
     - Installation request for a ~1.0 -> satisfiable by a[1.0.0].
-    - a 1.0.0 requires php 5.5 -> your PHP version (%s) overriden by "config.platform.php" version (5.3) does not satisfy that requirement.
+    - a 1.0.0 requires php 5.5 -> your PHP version (%s) overridden by "config.platform.php" version (5.3) does not satisfy that requirement.
 
 --EXPECT--