Make --version/--verbose slightly less confusing.

3 files changed, 14 insertions, 18 deletions

diff --git a/Library/Contributions/manpages/brew.1.md b/Library/Contributions/manpages/brew.1.md
index 20df31c2d..3deb40908 100644
--- a/Library/Contributions/manpages/brew.1.md
+++ b/Library/Contributions/manpages/brew.1.md
@@ -3,8 +3,8 @@ brew(1) -- The missing package manager for OS X
 
 ## SYNOPSIS
 
-`brew` [--verbose|-v] command [options] [formula] ...  
-`brew` [--version|-v]
+`brew` --version  
+`brew` [--verbose|-v] command [options] [formula] ...
 
 ## DESCRIPTION
 
@@ -13,8 +13,7 @@ didn't include with OS X.
 
 ## OPTIONS
   * `-v`, `--verbose` command [options] [formula] ...:
-    Prints extra, command-specific debugging information.
-    Note that `brew -v` by itself is the same as `brew --version`.
+    With `--verbose`, many commands print extra debugging information.
 
 ## ESSENTIAL COMMANDS
 
@@ -326,7 +325,7 @@ For the full command list, see the COMMANDS section.
     Display where Homebrew's `.git` directory is located. For standard installs,
     the `prefix` and `repository` are the same directory.
 
-  * `-v`, `--version`:
+  * `--version`:
     Print the version number of brew to standard error and exit.
 
 ## EXTERNAL COMMANDS
diff --git a/bin/brew b/bin/brew
index 51e019e1c..f0b548763 100755
--- a/bin/brew
+++ b/bin/brew
@@ -17,14 +17,11 @@ when '--version'
   puts HOMEBREW_VERSION
   exit 0
 when '-v'
-  if ARGV.length > 1
-    puts "Homebrew #{HOMEBREW_VERSION}"
-    # continue in verbose mode
-    ARGV << ARGV.shift
-  else
-    puts HOMEBREW_VERSION
-    exit 0
-  end
+  puts "Homebrew #{HOMEBREW_VERSION}"
+  # Shift the -v to the end of the parameter list
+  ARGV << ARGV.shift
+  # If no other arguments, just quit here.
+  exit 0 if ARGV.length == 1
 end
 
 case HOMEBREW_PREFIX.to_s when '/', '/usr'
diff --git a/share/man/man1/brew.1 b/share/man/man1/brew.1
index 4c3d591e9..b665c752b 100644
--- a/share/man/man1/brew.1
+++ b/share/man/man1/brew.1
@@ -1,16 +1,16 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BREW" "1" "June 2012" "Homebrew" "brew"
+.TH "BREW" "1" "July 2012" "Homebrew" "brew"
 .
 .SH "NAME"
 \fBbrew\fR \- The missing package manager for OS X
 .
 .SH "SYNOPSIS"
-\fBbrew\fR [\-\-verbose|\-v] command [options] [formula] \.\.\.
+\fBbrew\fR \-\-version
 .
 .br
-\fBbrew\fR [\-\-version|\-v]
+\fBbrew\fR [\-v|\-\-verbose] command [options] [formula] \.\.\.
 .
 .SH "DESCRIPTION"
 Homebrew is the easiest and most flexible way to install the UNIX tools Apple didn\'t include with OS X\.
@@ -19,7 +19,7 @@ Homebrew is the easiest and most flexible way to install the UNIX tools Apple di
 .
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR command [options] [formula] \.\.\.
-Prints extra, command\-specific debugging information\. Note that \fBbrew \-v\fR by itself is the same as \fBbrew \-\-version\fR\.
+With \fB\-\-verbose\fR, many commands print extra debugging information\.
 .
 .SH "ESSENTIAL COMMANDS"
 For the full command list, see the COMMANDS section\.
@@ -363,7 +363,7 @@ Display the location in the cellar where \fIformula\fR is or would be installed\
 Display where Homebrew\'s \fB\.git\fR directory is located\. For standard installs, the \fBprefix\fR and \fBrepository\fR are the same directory\.
 .
 .TP
-\fB\-v\fR, \fB\-\-version\fR
+\fB\-\-version\fR
 Print the version number of brew to standard error and exit\.
 .
 .SH "EXTERNAL COMMANDS"