aboutsummaryrefslogtreecommitdiffstats
path: root/railties/guides/source
diff options
context:
space:
mode:
Diffstat (limited to 'railties/guides/source')
-rw-r--r--railties/guides/source/initialization.textile2
-rw-r--r--railties/guides/source/routing.textile4
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/guides/source/initialization.textile b/railties/guides/source/initialization.textile
index fea0185c4c..7df4f8f719 100644
--- a/railties/guides/source/initialization.textile
+++ b/railties/guides/source/initialization.textile
@@ -2642,7 +2642,7 @@ The method +find_with_root_flag+ is defined on +Rails::Engine+ (the superclass o
root = File.exist?("#{root_path}/#{flag}") ? root_path : default
raise "Could not find root path for #{self}" unless root
- RUBY_PLATFORM =~ /(:?mswin|mingw)/ ?
+ RUBY_PLATFORM =~ /mswin|mingw/ ?
Pathname.new(root).expand_path : Pathname.new(root).realpath
end
</ruby>
diff --git a/railties/guides/source/routing.textile b/railties/guides/source/routing.textile
index 32b1e30502..7ac5bc8d3a 100644
--- a/railties/guides/source/routing.textile
+++ b/railties/guides/source/routing.textile
@@ -609,10 +609,10 @@ resources :photos, :path_names => { :new => 'make', :edit => 'change' }
This would cause the routing to recognize URLs such as
-<pre>
+<plain>
/photos/make
/photos/1/change
-</pre>
+</plain>
NOTE: The actual action names aren't changed by this option. The two URLs shown would still route to the new and edit actions.