aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorPrathamesh Sonpatki <csonpatki@gmail.com>2013-05-04 20:08:58 +0530
committerPrathamesh Sonpatki <csonpatki@gmail.com>2013-05-04 20:08:58 +0530
commitad692f351658fc421c4edeb7ddcb81db3f612826 (patch)
treeef95254c12942af6db4c0d87da81a1bb913bec23 /guides
parent92a9ffd8586468d8e954051cb9c6dd6a83df9f92 (diff)
downloadrails-ad692f351658fc421c4edeb7ddcb81db3f612826.tar.gz
rails-ad692f351658fc421c4edeb7ddcb81db3f612826.tar.bz2
rails-ad692f351658fc421c4edeb7ddcb81db3f612826.zip
dir -> directory
Diffstat (limited to 'guides')
-rw-r--r--guides/source/4_0_release_notes.md2
-rw-r--r--guides/source/initialization.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/4_0_release_notes.md b/guides/source/4_0_release_notes.md
index 50a3c6fabc..6619586d40 100644
--- a/guides/source/4_0_release_notes.md
+++ b/guides/source/4_0_release_notes.md
@@ -85,7 +85,7 @@ Please refer to the [Changelog](https://github.com/rails/rails/blob/master/railt
* New test locations `test/models`, `test/helpers`, `test/controllers`, and `test/mailers`. Corresponding rake tasks added as well. ([Pull Request](https://github.com/rails/rails/pull/7878))
-* Your app's executables now live in the `bin/` dir. Run `rake rails:update:bin` to get `bin/bundle`, `bin/rails`, and `bin/rake`.
+* Your app's executables now live in the `bin/` directory. Run `rake rails:update:bin` to get `bin/bundle`, `bin/rails`, and `bin/rake`.
* Threadsafe on by default
diff --git a/guides/source/initialization.md b/guides/source/initialization.md
index 72d56b7feb..9fcd530183 100644
--- a/guides/source/initialization.md
+++ b/guides/source/initialization.md
@@ -114,7 +114,7 @@ If we used `s` rather than `server`, Rails will use the `aliases` defined in the
```ruby
when 'server'
- # Change to the application's path if there is no config.ru file in current dir.
+ # Change to the application's path if there is no config.ru file in current directory.
# This allows us to run `rails server` from other directories, but still get
# the main config.ru and properly set the tmp directory.
Dir.chdir(File.expand_path('../../', APP_PATH)) unless File.exists?(File.expand_path("config.ru"))