aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-05-24 14:38:39 -0300
committerRafael França <rafaelmfranca@gmail.com>2016-05-24 14:38:39 -0300
commitc5b766a9a20c9dd5bf09e69a7c508f369c2eeea3 (patch)
treed80c6a886bd88cd478b5a2b9098095ea77249cdc
parente882ce00ab38a5b6c652ac515bde76b86eef4dd7 (diff)
parent41c685608b960780e4a01baf4da1534ac86b73e9 (diff)
downloadrails-c5b766a9a20c9dd5bf09e69a7c508f369c2eeea3.tar.gz
rails-c5b766a9a20c9dd5bf09e69a7c508f369c2eeea3.tar.bz2
rails-c5b766a9a20c9dd5bf09e69a7c508f369c2eeea3.zip
Merge pull request #25130 from xhpwn/master
Improved commands in README with markdown formatting
-rwxr-xr-xci/travis.rb4
-rw-r--r--railties/RDOC_MAIN.rdoc6
2 files changed, 5 insertions, 5 deletions
diff --git a/ci/travis.rb b/ci/travis.rb
index ffeba995de..3faef500f2 100755
--- a/ci/travis.rb
+++ b/ci/travis.rb
@@ -121,8 +121,8 @@ class Build
def env
if activesupport? && !isolated?
# There is a known issue with the listen tests that causes files to be
- # incorrectly GC'ed even when they are still in-use. The current is to
- # only run them in isolation to avoid randomly failing our test suite.
+ # incorrectly GC'ed even when they are still in-use. The current solution
+ # is to only run them in isolation to avoid randomly failing our test suite.
{ 'LISTEN' => '0' }
else
{}
diff --git a/railties/RDOC_MAIN.rdoc b/railties/RDOC_MAIN.rdoc
index 26a25ee9dc..ef9bbf3d7e 100644
--- a/railties/RDOC_MAIN.rdoc
+++ b/railties/RDOC_MAIN.rdoc
@@ -35,17 +35,17 @@ can read more about Action Pack in its {README}[link:files/actionpack/README_rdo
1. Install \Rails at the command prompt if you haven't yet:
- gem install rails
+ $ gem install rails
2. At the command prompt, create a new \Rails application:
- rails new myapp
+ $ rails new myapp
where "myapp" is the application name.
3. Change directory to +myapp+ and start the web server:
- cd myapp; rails server
+ $ cd myapp; rails server
Run with <tt>--help</tt> or <tt>-h</tt> for options.