merge r25088 to release-1.12

git-svn-id: http://framework.zend.com/svn/framework/standard/branches/release-1.12@25089 44c647ce-9c0f-0410-b52a-842ac1e357ba

documentation/manual/de/module_specs/Zend_Application-AvailableResources-Router.xml

@@ -21,13 +21,20 @@
         </para>
 
         <programlisting language="ini"><![CDATA[
-resources.router.routes.route_id.route = "/login"
-resources.router.routes.route_id.defaults.module = "user"
-resources.router.routes.route_id.defaults.controller = "login"
-resources.router.routes.route_id.defaults.action = "index"
+resources.router.routes.route_id.route               = "/login"
+resources.router.routes.route_id.defaults.module     = "admin"
+resources.router.routes.route_id.defaults.controller = "user"
+resources.router.routes.route_id.defaults.action     = "login"
 
 ; Optional kann ein Chain Name Separator gesetzt werden:
 resources.router.chainNameSeparator = "_"
+
+; Beispiel mit Parameter
+resources.router.routes.route_id.route               = "/user/:user_id"
+resources.router.routes.route_id.defaults.module     = "admin"
+resources.router.routes.route_id.defaults.controller = "user"
+resources.router.routes.route_id.defaults.action     = "edit"
+resources.router.routes.route_id.reqs.user_id        = "^\d+$"
 ]]></programlisting>
 
         <para>

documentation/manual/en/module_specs/Zend_Application-AvailableResources-Router.xml

@@ -20,13 +20,20 @@
         </para>
 
         <programlisting language="ini"><![CDATA[
-resources.router.routes.route_id.route = "/login"
-resources.router.routes.route_id.defaults.module = "user"
-resources.router.routes.route_id.defaults.controller = "login"
-resources.router.routes.route_id.defaults.action = "index"
+resources.router.routes.route_id.route               = "/login"
+resources.router.routes.route_id.defaults.module     = "admin"
+resources.router.routes.route_id.defaults.controller = "user"
+resources.router.routes.route_id.defaults.action     = "login"
 
 ; Optionally you can also set a Chain Name Separator:
 resources.router.chainNameSeparator = "_"
+
+; Example with parameter
+resources.router.routes.route_id.route               = "/user/:user_id"
+resources.router.routes.route_id.defaults.module     = "admin"
+resources.router.routes.route_id.defaults.controller = "user"
+resources.router.routes.route_id.defaults.action     = "edit"
+resources.router.routes.route_id.reqs.user_id        = "^\d+$"
 ]]></programlisting>
 
         <para>For more information on the Chain Name Separator, please see