aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/commands
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-08-23 01:21:43 +0200
committerXavier Noria <fxn@hashref.com>2010-08-23 01:21:43 +0200
commitb587bfd589cbb4469b9e49bfdd90f033d14adc9a (patch)
treed5fd06c8a1238dca62d3f3b512a6f19b63bc4b0e /railties/lib/rails/commands
parent9992a1a4bff1dd666298866c283ba18832da0914 (diff)
parent8d1ee434da3348089daa497980d1e24837ee8be6 (diff)
downloadrails-b587bfd589cbb4469b9e49bfdd90f033d14adc9a.tar.gz
rails-b587bfd589cbb4469b9e49bfdd90f033d14adc9a.tar.bz2
rails-b587bfd589cbb4469b9e49bfdd90f033d14adc9a.zip
Merge remote branch 'rails/master'
Diffstat (limited to 'railties/lib/rails/commands')
-rw-r--r--railties/lib/rails/commands/plugin.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/commands/plugin.rb b/railties/lib/rails/commands/plugin.rb
index 96b6f9c372..7bb4a1c054 100644
--- a/railties/lib/rails/commands/plugin.rb
+++ b/railties/lib/rails/commands/plugin.rb
@@ -375,7 +375,7 @@ module Commands
"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 }