aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZachary Scott <e@zzak.io>2014-11-09 19:01:38 -0800
committerZachary Scott <e@zzak.io>2014-11-09 19:01:38 -0800
commitcb0ba2f2b144d15e825cf890ea9bc7e322d25349 (patch)
treecc5d4ba56443ee13d6979b768a95da70def4165b
parent049caa9e5a38ed8274a3d40a8b934012a87b464f (diff)
parent30af171af13293aa37bee612ae7b976d3ede0439 (diff)
downloadrails-cb0ba2f2b144d15e825cf890ea9bc7e322d25349.tar.gz
rails-cb0ba2f2b144d15e825cf890ea9bc7e322d25349.tar.bz2
rails-cb0ba2f2b144d15e825cf890ea9bc7e322d25349.zip
Merge pull request #17572 from rishijain/update_docs_10
Fixed grammar about AS::Notifications [ci skip]
-rw-r--r--activesupport/lib/active_support/notifications.rb2
-rw-r--r--railties/lib/rails/commands/destroy.rb2
-rw-r--r--railties/lib/rails/commands/generate.rb2
3 files changed, 5 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/notifications.rb b/activesupport/lib/active_support/notifications.rb
index 325a3d75dc..b9f8e1ab2c 100644
--- a/activesupport/lib/active_support/notifications.rb
+++ b/activesupport/lib/active_support/notifications.rb
@@ -16,7 +16,7 @@ module ActiveSupport
# render text: 'Foo'
# end
#
- # That executes the block first and notifies all subscribers once done.
+ # That first executes the block and then notifies all subscribers once done.
#
# In the example above +render+ is the name of the event, and the rest is called
# the _payload_. The payload is a mechanism that allows instrumenters to pass
diff --git a/railties/lib/rails/commands/destroy.rb b/railties/lib/rails/commands/destroy.rb
index 5479da86a0..ce26cc3fde 100644
--- a/railties/lib/rails/commands/destroy.rb
+++ b/railties/lib/rails/commands/destroy.rb
@@ -1,5 +1,7 @@
require 'rails/generators'
+#if no argument/-h/--help is passed to rails destroy command, then
+#it generates the help associated.
if [nil, "-h", "--help"].include?(ARGV.first)
Rails::Generators.help 'destroy'
exit
diff --git a/railties/lib/rails/commands/generate.rb b/railties/lib/rails/commands/generate.rb
index 351c59c645..926c36b967 100644
--- a/railties/lib/rails/commands/generate.rb
+++ b/railties/lib/rails/commands/generate.rb
@@ -1,5 +1,7 @@
require 'rails/generators'
+#if no argument/-h/--help is passed to rails generate command, then
+#it generates the help associated.
if [nil, "-h", "--help"].include?(ARGV.first)
Rails::Generators.help 'generate'
exit