aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathon D. Jones <jonathon_d_jones@yahoo.com>2011-03-03 18:11:01 -0500
committerJonathon D. Jones <jonathon_d_jones@yahoo.com>2011-03-03 18:11:01 -0500
commitfcade9f4d20295a197675c8632d10edd5ca66c79 (patch)
tree62df86edbb302da9f85d0f5c205e20754cbc3111
parent108561f1cb73c0f600db6cad10b7cf03bf90f09f (diff)
parentf44e0e82717062b3043a9ce65a8274f338817c83 (diff)
downloadrails-fcade9f4d20295a197675c8632d10edd5ca66c79.tar.gz
rails-fcade9f4d20295a197675c8632d10edd5ca66c79.tar.bz2
rails-fcade9f4d20295a197675c8632d10edd5ca66c79.zip
Merge remote branch 'origin/master'
-rw-r--r--railties/guides/source/routing.textile2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/guides/source/routing.textile b/railties/guides/source/routing.textile
index d214031b31..c447fd911a 100644
--- a/railties/guides/source/routing.textile
+++ b/railties/guides/source/routing.textile
@@ -391,7 +391,7 @@ NOTE: You can't use +namespace+ or +:module+ with a +:controller+ path segment.
match ':controller(/:action(/:id))', :controller => /admin\/[^\/]+/
</ruby>
-TIP: By default dynamic segments don't accept dots - this is because the dot is used as a separator for formatted routes. If you need to use a dot within a dynamic segment add a constraint which overrides this - for example +:id => /[^\/]+/+ allows anything except a slash.
+TIP: By default dynamic segments don't accept dots - this is because the dot is used as a separator for formatted routes. If you need to use a dot within a dynamic segment add a constraint which overrides this - for example +:id => /[^\/]<plus>/+ allows anything except a slash.
h4. Static Segments