Skip to content

Commit

Permalink
Trifling typos
Browse files Browse the repository at this point in the history
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
  • Loading branch information
Raphomet authored and spastorino committed Aug 21, 2010
1 parent 82e389e commit 7a090b0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions activesupport/test/core_ext/kernel_test.rb
Expand Up @@ -54,14 +54,14 @@ class << o; @x = 1; end
end
end

class KernelSupressTest < Test::Unit::TestCase
class KernelSuppressTest < Test::Unit::TestCase
def test_reraise
assert_raise(LoadError) do
suppress(ArgumentError) { raise LoadError }
end
end

def test_supression
def test_suppression
suppress(ArgumentError) { raise ArgumentError }
suppress(LoadError) { raise LoadError }
suppress(LoadError, ArgumentError) { raise LoadError }
Expand Down
2 changes: 1 addition & 1 deletion railties/lib/rails/commands/plugin.rb
Expand Up @@ -375,7 +375,7 @@ def options
"Enables updating but does not add a svn:externals entry.") { |v| @method = :checkout }
o.on( "-e", "--export",
"Use svn export to grab the plugin.",
"Exports the plugin, allowing you to check it into your local repository. Does not enable updates, or add an svn:externals entry.") { |v| @method = :export }
"Exports the plugin, allowing you to check it into your local repository. Does not enable updates or add an svn:externals entry.") { |v| @method = :export }
o.on( "-q", "--quiet",
"Suppresses the output from installation.",
"Ignored if -v is passed (rails plugin -v install ...)") { |v| @options[:quiet] = true }
Expand Down
4 changes: 2 additions & 2 deletions railties/lib/rails/generators.rb
Expand Up @@ -218,11 +218,11 @@ def self.help(command = 'generate')
puts "Usage: rails #{command} GENERATOR [args] [options]"
puts
puts "General options:"
puts " -h, [--help] # Print generators options and usage"
puts " -h, [--help] # Print generator's options and usage"
puts " -p, [--pretend] # Run but do not make any changes"
puts " -f, [--force] # Overwrite files that already exist"
puts " -s, [--skip] # Skip files that already exist"
puts " -q, [--quiet] # Supress status output"
puts " -q, [--quiet] # Suppress status output"
puts
puts "Please choose a generator below."
puts
Expand Down

0 comments on commit 7a090b0

Please sign in to comment.