Merge branch 'master' of https://github.com/wdalmut/zf2 into feature/…

…docs-mvc-route-it
Hanssillekens · Mar 23, 2012 · f0309a9 · f0309a9
2 parents d2069ce + bf76acf
commit f0309a9
Show file tree

Hide file tree

Showing 2 changed files with 578 additions and 1 deletion.
diff --git a/documentation/manual/en/module_specs/Zend_Mvc-Routing.xml b/documentation/manual/en/module_specs/Zend_Mvc-Routing.xml
@@ -532,7 +532,7 @@ $route = Scheme::factory(array(
         alphanumeric characters; if a segment is optional, it should be
         surrounded by brackets. As an example, "/:foo[/:bar]"
         would match a "/" followed by text and assign it to the
-        key "bar"; if any additional "/" characters are
+        key "foo"; if any additional "/" characters are
         found, any text following the last one will be assigned to the key
         "bar".
       </para>