applied changes suggested in PR

4 files changed, 12 insertions, 15 deletions

diff --git a/Library/Homebrew/dev-cmd/formula.rb b/Library/Homebrew/dev-cmd/formula.rb
index 80008a354..71687dfa7 100644
--- a/Library/Homebrew/dev-cmd/formula.rb
+++ b/Library/Homebrew/dev-cmd/formula.rb
@@ -1,5 +1,5 @@
-#:  * `formula` <formulae>:
-#:    echo location of the specified <formulae> to stdout
+#:  * `formula` <formula>:
+#:    Display the path where <formula> is
 
 require "formula"
 
@@ -8,8 +8,6 @@ module Homebrew
 
   def formula
     raise FormulaUnspecifiedError if ARGV.named.empty?
-    ARGV.resolved_formulae.each do |f|
-      puts "#{f.path}\n"
-    end
+    ARGV.resolved_formulae.each { |f| puts f.path }
   end
 end
diff --git a/completions/zsh/_brew b/completions/zsh/_brew
index 5d3924357..04cf56f70 100644
--- a/completions/zsh/_brew
+++ b/completions/zsh/_brew
@@ -88,7 +88,7 @@ __brew_common_commands() {
     'doctor:audits your installation for common issues'
     'edit:edit a formula'
     'fetch:download formula resources to the cache'
-    'formula:location of formulae'
+    'formula:the path for a formula'
     'gist-logs:generate a gist of the full build logs'
     'home:visit the homepage of a formula or the brew project'
     'info:information about a formula'
@@ -367,6 +367,11 @@ _brew_fetch() {
     '*:formula:__brew_formulae'
 }
 
+# brew formula formula:
+_brew_formula() {
+  __brew_formulae
+}
+
 # brew gist-logs [--new-issue|-n] formula
 _brew_gist_logs() {
   _arguments \
@@ -794,12 +799,6 @@ _brew_vendor_install() {
     '--target'
 }
 
-
-# brew where formulae:
-_brew_where() {
-  __brew_formulae
-}
-
 # the main completion function
 _brew() {
   local curcontext="$curcontext" state state_descr line expl
diff --git a/docs/brew.1.html b/docs/brew.1.html
index 58a1dccca..effb16998 100644
--- a/docs/brew.1.html
+++ b/docs/brew.1.html
@@ -537,7 +537,7 @@ you to explicitly set the name and version of the package you are creating.</p>
 the specified tap.</p></dd>
 <dt class="flush"><code>edit</code></dt><dd><p>Open all of Homebrew for editing.</p></dd>
 <dt><code>edit</code> <var>formula</var></dt><dd><p>Open <var>formula</var> in the editor.</p></dd>
-<dt><code>formula</code> <var>formulae</var></dt><dd><p>echo location of the specified <var>formulae</var> to stdout</p></dd>
+<dt><code>formula</code> <var>formula</var></dt><dd><p>Display the path where <var>formula</var> is</p></dd>
 <dt><code>linkage</code> [<code>--test</code>] [<code>--reverse</code>]  <var>formula-name</var></dt><dd><p>Checks the library links of an installed formula.</p>
 
 <p>Only works on installed formulae. An error is raised if it is run on
diff --git a/manpages/brew.1 b/manpages/brew.1
index 7c151eebd..1d435bf62 100644
--- a/manpages/brew.1
+++ b/manpages/brew.1
@@ -728,8 +728,8 @@ Open all of Homebrew for editing\.
 Open \fIformula\fR in the editor\.
 .
 .TP
-\fBformula\fR \fIformulae\fR
-echo location of the specified \fIformulae\fR to stdout
+\fBformula\fR \fIformula\fR
+Display the path where \fIformula\fR is
 .
 .TP
 \fBlinkage\fR [\fB\-\-test\fR] [\fB\-\-reverse\fR] \fIformula\-name\fR