From e18bf1dc49222e25d5a485e876e13fc3e57c6eca Mon Sep 17 00:00:00 2001 From: Robin Dupret Date: Tue, 28 Jul 2015 12:25:39 +0200 Subject: [PATCH] Tiny documentation edits [ci skip] --- actionpack/lib/action_dispatch/http/response.rb | 2 +- .../lib/active_support/core_ext/object/duplicable.rb | 2 +- guides/source/getting_started.md | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb index 37e26faffb..fd92e89231 100644 --- a/actionpack/lib/action_dispatch/http/response.rb +++ b/actionpack/lib/action_dispatch/http/response.rb @@ -201,7 +201,7 @@ module ActionDispatch # :nodoc: # it sets the charset to utf-8. # # response.charset = 'utf-16' # => 'utf-16' - # response.charset = nil # => 'utf-8' + # response.charset = nil # => 'utf-8' def charset=(charset) @charset = charset.nil? ? self.class.default_charset : charset end diff --git a/activesupport/lib/active_support/core_ext/object/duplicable.rb b/activesupport/lib/active_support/core_ext/object/duplicable.rb index 6fc0cb53f0..befa5aee21 100644 --- a/activesupport/lib/active_support/core_ext/object/duplicable.rb +++ b/activesupport/lib/active_support/core_ext/object/duplicable.rb @@ -81,7 +81,7 @@ class BigDecimal # BigDecimals are duplicable: # # BigDecimal.new("1.2").duplicable? # => true - # BigDecimal.new("1.2").dup # => # + # BigDecimal.new("1.2").dup # => # def duplicable? true end diff --git a/guides/source/getting_started.md b/guides/source/getting_started.md index 400383cfb5..dbbedc49ab 100644 --- a/guides/source/getting_started.md +++ b/guides/source/getting_started.md @@ -23,10 +23,12 @@ application from scratch. It does not assume that you have any prior experience with Rails. However, to get the most out of it, you need to have some prerequisites installed: -* The [Ruby](https://www.ruby-lang.org/en/downloads) language version 2.2.2 or newer. -* Right version of [Development Kit](http://rubyinstaller.org/downloads/), if you are using Windows -* The [RubyGems](https://rubygems.org) packaging system, which is installed with Ruby - versions 1.9 and later. To learn more about RubyGems, please read the [RubyGems Guides](http://guides.rubygems.org). +* The [Ruby](https://www.ruby-lang.org/en/downloads) language version 2.2.2 or newer. +* Right version of [Development Kit](http://rubyinstaller.org/downloads/), if you + are using Windows. +* The [RubyGems](https://rubygems.org) packaging system, which is installed with + Ruby by default. To learn more about RubyGems, please read the + [RubyGems Guides](http://guides.rubygems.org). * A working installation of the [SQLite3 Database](https://www.sqlite.org). Rails is a web application framework running on the Ruby programming language.