diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-03-04 19:26:17 -0300 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2016-03-04 19:26:17 -0300 |
| commit | 54286878c637e976223e06c4c78877d00112add1 (patch) | |
| tree | a34c89e0dccfa815f367dae5f67a2fa434011ed5 | |
| parent | d6d98680120a049f2a7226214a40fa7ecdd178be (diff) | |
| parent | 56ed162bf37a505707455055e24ae40d98d9741b (diff) | |
| download | rails-54286878c637e976223e06c4c78877d00112add1.tar.gz rails-54286878c637e976223e06c4c78877d00112add1.tar.bz2 rails-54286878c637e976223e06c4c78877d00112add1.zip | |
Merge pull request #24064 from rubys/guides_puma3_start
Match Puma 3 startup messages [ci skip]
| -rw-r--r-- | guides/source/command_line.md | 7 | ||||
| -rw-r--r-- | guides/source/debugging_rails_applications.md | 7 | ||||
| -rw-r--r-- | guides/source/initialization.md | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/guides/source/command_line.md b/guides/source/command_line.md index e865a02cbd..62d742fc28 100644 --- a/guides/source/command_line.md +++ b/guides/source/command_line.md @@ -65,11 +65,12 @@ $ bin/rails server => Booting Puma => Rails 5.0.0 application starting in development on http://0.0.0.0:3000 => Run `rails server -h` for more startup options -=> Ctrl-C to shutdown server -Puma 2.15.3 starting... -* Min threads: 0, max threads: 16 +Puma starting in single mode... +* Version 3.0.2 (ruby 2.3.0-p0), codename: Plethora of Penguin Pinatas +* Min threads: 5, max threads: 5 * Environment: development * Listening on tcp://localhost:3000 +Use Ctrl-C to stop ``` With just three commands we whipped up a Rails server listening on port 3000. Go to your browser and open [http://localhost:3000](http://localhost:3000), you will see a basic Rails app running. diff --git a/guides/source/debugging_rails_applications.md b/guides/source/debugging_rails_applications.md index faf475c294..877c87e9fa 100644 --- a/guides/source/debugging_rails_applications.md +++ b/guides/source/debugging_rails_applications.md @@ -314,11 +314,12 @@ For example: => Booting Puma => Rails 5.0.0 application starting in development on http://0.0.0.0:3000 => Run `rails server -h` for more startup options -=> Ctrl-C to shutdown server -Puma 2.15.3 starting... -* Min threads: 0, max threads: 16 +Puma starting in single mode... +* Version 3.0.2 (ruby 2.3.0-p0), codename: Plethora of Penguin Pinatas +* Min threads: 5, max threads: 5 * Environment: development * Listening on tcp://localhost:3000 +Use Ctrl-C to stop Started GET "/" for 127.0.0.1 at 2014-04-11 13:11:48 +0200 diff --git a/guides/source/initialization.md b/guides/source/initialization.md index 156f9c92b4..b40302bf90 100644 --- a/guides/source/initialization.md +++ b/guides/source/initialization.md @@ -356,8 +356,6 @@ private def print_boot_information ... puts "=> Run `rails server -h` for more startup options" - ... - puts "=> Ctrl-C to shutdown server" unless options[:daemonize] end def create_tmp_directories |