merged 2.0

symfony · Jul 9, 2012 · 1ea9c13 · 1ea9c13
2 parents d120ca9 + 6a06a62
commit 1ea9c13
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Container.php b/Container.php
@@ -220,8 +220,8 @@ public function has($id)
     /**
      * Gets a service.
      *
-     * If a service is both defined through a set() method and
-     * with a set*Service() method, the former has always precedence.
+     * If a service is defined both through a set() method and
+     * with a get{$id}Service() method, the former has always precedence.
      *
      * @param string  $id              The service identifier
      * @param integer $invalidBehavior The behavior when the service does not exist