update manpage for deps/uses

3 files changed, 24 insertions, 20 deletions

diff --git a/Library/Homebrew/manpages/brew.1.md b/Library/Homebrew/manpages/brew.1.md
index 575132336..80ff46820 100644
--- a/Library/Homebrew/manpages/brew.1.md
+++ b/Library/Homebrew/manpages/brew.1.md
@@ -98,7 +98,7 @@ With `--verbose` or `-v`, many commands print extra debugging information. Note
     The options `--set-name` and `--set-version` each take an argument and allow
     you to explicitly set the name and version of the package you are creating.
 
-  * `deps` [`--1`] [`-n`] [`--union`] [`--tree`] [`--all`] [`--installed`] [`--skip-build`] [`--skip-optional`] <formulae>:
+  * `deps` [`--1`] [`-n`] [`--union`] [`--tree`] [`--all`] [`--installed`] [`--include-build`] [`--include-optional`] [`--skip-recommended`] <formulae>:
     Show dependencies for <formulae>. When given multiple formula arguments,
     show the intersection of dependencies for <formulae>, except when passed
     `--tree`, `--all`, or `--installed`.
@@ -117,9 +117,10 @@ With `--verbose` or `-v`, many commands print extra debugging information. Note
 
     If `--installed` is passed, show dependencies for all installed formulae.
 
-    By default, `deps` shows dependencies for <formulae>. To skip the `:build`
-    type dependencies, pass `--skip-build`. Similarly, pass `--skip-optional`
-    to skip `:optional` dependencies.
+    By default, `deps` shows required and recommended dependencies for
+    <formulae>. To include the `:build` type dependencies, pass `--include-build`.
+    Similarly, pass `--include-optional` to include `:optional` dependencies.
+    To skip `:recommended` type dependencies, pass `--skip-recommended`.
 
   * `desc` <formula>:
     Display <formula>'s name and one-line description.
@@ -496,7 +497,7 @@ With `--verbose` or `-v`, many commands print extra debugging information. Note
     If <formulae> are given, upgrade only the specified brews (but do so even
     if they are pinned; see `pin`, `unpin`).
 
-  * `uses` [`--installed`] [`--recursive`] [`--skip-build`] [`--skip-optional`] [`--devel`|`--HEAD`] <formulae>:
+  * `uses` [`--installed`] [`--recursive`] [`--include-build`] [`--include-optional`] [`--skip-recommended`] [`--devel`|`--HEAD`] <formulae>:
     Show the formulae that specify <formulae> as a dependency. When given
     multiple formula arguments, show the intersection of formulae that use
     <formulae>.
@@ -505,9 +506,10 @@ With `--verbose` or `-v`, many commands print extra debugging information. Note
 
     If `--installed` is passed, only list installed formulae.
 
-    By default, `uses` shows all formulae that specify <formulae> as a dependency.
-    To skip the `:build` type dependencies, pass `--skip-build`. Similarly, pass
-    `--skip-optional` to skip `:optional` dependencies.
+    By default, `uses` shows all formulae that specify <formulae> as a required
+    or recommended dependency. To include the `:build` type dependencies, pass
+    `--include-build`. Similarly, pass `--include-optional` to include `:optional`
+    dependencies. To skip `:recommended` type dependencies, pass `--skip-recommended`.
 
     By default, `uses` shows usages of `formula` by stable builds. To find
     cases where `formula` is used by development or HEAD build, pass
diff --git a/share/doc/homebrew/brew.1.html b/share/doc/homebrew/brew.1.html
index dc7f2a701..1988ce253 100644
--- a/share/doc/homebrew/brew.1.html
+++ b/share/doc/homebrew/brew.1.html
@@ -83,7 +83,7 @@ will thus not add the SHA256 to the formula for you.</p>
 
 <p>The options <code>--set-name</code> and <code>--set-version</code> each take an argument and allow
 you to explicitly set the name and version of the package you are creating.</p></dd>
-<dt><code>deps</code> [<code>--1</code>] [<code>-n</code>] [<code>--union</code>] [<code>--tree</code>] [<code>--all</code>] [<code>--installed</code>] [<code>--skip-build</code>] [<code>--skip-optional</code>] <var>formulae</var></dt><dd><p>Show dependencies for <var>formulae</var>. When given multiple formula arguments,
+<dt><code>deps</code> [<code>--1</code>] [<code>-n</code>] [<code>--union</code>] [<code>--tree</code>] [<code>--all</code>] [<code>--installed</code>] [<code>--include-build</code>] [<code>--include-optional</code>] [<code>--skip-recommended</code>] <var>formulae</var></dt><dd><p>Show dependencies for <var>formulae</var>. When given multiple formula arguments,
 show the intersection of dependencies for <var>formulae</var>, except when passed
 <code>--tree</code>, <code>--all</code>, or <code>--installed</code>.</p>
 
@@ -101,9 +101,10 @@ instead of the intersection.</p>
 
 <p>If <code>--installed</code> is passed, show dependencies for all installed formulae.</p>
 
-<p>By default, <code>deps</code> shows dependencies for <var>formulae</var>. To skip the <code>:build</code>
-type dependencies, pass <code>--skip-build</code>. Similarly, pass <code>--skip-optional</code>
-to skip <code>:optional</code> dependencies.</p></dd>
+<p>By default, <code>deps</code> shows required and recommended dependencies for
+<var>formulae</var>. To include the <code>:build</code> type dependencies, pass <code>--include-build</code>.
+Similarly, pass <code>--include-optional</code> to include <code>:optional</code> dependencies.
+To skip <code>:recommended</code> type dependencies, pass <code>--skip-recommended</code>.</p></dd>
 <dt><code>desc</code> <var>formula</var></dt><dd><p>Display <var>formula</var>'s name and one-line description.</p></dd>
 <dt><code>desc</code> [<code>-s</code>|<code>-n</code>|<code>-d</code>] <var>pattern</var></dt><dd><p>Search both name and description (<code>-s</code>), just the names (<code>-n</code>), or just  the
 descriptions (<code>-d</code>) for <code>&lt;pattern></code>. <code>&lt;pattern></code> is by default interpreted
@@ -375,7 +376,7 @@ source. This is useful for creating patches for the software.</p></dd>
 
 <p>If <var>formulae</var> are given, upgrade only the specified brews (but do so even
 if they are pinned; see <code>pin</code>, <code>unpin</code>).</p></dd>
-<dt><code>uses</code> [<code>--installed</code>] [<code>--recursive</code>] [<code>--skip-build</code>] [<code>--skip-optional</code>] [<code>--devel</code>|<code>--HEAD</code>] <var>formulae</var></dt><dd><p>Show the formulae that specify <var>formulae</var> as a dependency. When given
+<dt><code>uses</code> [<code>--installed</code>] [<code>--recursive</code>] [<code>--include-build</code>] [<code>--include-optional</code>] [<code>--skip-recommended</code>] [<code>--devel</code>|<code>--HEAD</code>] <var>formulae</var></dt><dd><p>Show the formulae that specify <var>formulae</var> as a dependency. When given
 multiple formula arguments, show the intersection of formulae that use
 <var>formulae</var>.</p>
 
@@ -383,9 +384,10 @@ multiple formula arguments, show the intersection of formulae that use
 
 <p>If <code>--installed</code> is passed, only list installed formulae.</p>
 
-<p>By default, <code>uses</code> shows all formulae that specify <var>formulae</var> as a dependency.
-To skip the <code>:build</code> type dependencies, pass <code>--skip-build</code>. Similarly, pass
-<code>--skip-optional</code> to skip <code>:optional</code> dependencies.</p>
+<p>By default, <code>uses</code> shows all formulae that specify <var>formulae</var> as a required
+or recommended dependency. To include the <code>:build</code> type dependencies, pass
+<code>--include-build</code>. Similarly, pass <code>--include-optional</code> to include <code>:optional</code>
+dependencies. To skip <code>:recommended</code> type dependencies, pass <code>--skip-recommended</code>.</p>
 
 <p>By default, <code>uses</code> shows usages of <code>formula</code> by stable builds. To find
 cases where <code>formula</code> is used by development or HEAD build, pass
diff --git a/share/man/man1/brew.1 b/share/man/man1/brew.1
index f51bafb9c..897ba2acd 100644
--- a/share/man/man1/brew.1
+++ b/share/man/man1/brew.1
@@ -108,7 +108,7 @@ If \fB\-\-no\-fetch\fR is passed, Homebrew will not download \fIURL\fR to the ca
 The options \fB\-\-set\-name\fR and \fB\-\-set\-version\fR each take an argument and allow you to explicitly set the name and version of the package you are creating\.
 .
 .TP
-\fBdeps\fR [\fB\-\-1\fR] [\fB\-n\fR] [\fB\-\-union\fR] [\fB\-\-tree\fR] [\fB\-\-all\fR] [\fB\-\-installed\fR] [\fB\-\-skip\-build\fR] [\fB\-\-skip\-optional\fR] \fIformulae\fR
+\fBdeps\fR [\fB\-\-1\fR] [\fB\-n\fR] [\fB\-\-union\fR] [\fB\-\-tree\fR] [\fB\-\-all\fR] [\fB\-\-installed\fR] [\fB\-\-include\-build\fR] [\fB\-\-include\-optional\fR] [\fB\-\-skip\-recommended\fR] \fIformulae\fR
 Show dependencies for \fIformulae\fR\. When given multiple formula arguments, show the intersection of dependencies for \fIformulae\fR, except when passed \fB\-\-tree\fR, \fB\-\-all\fR, or \fB\-\-installed\fR\.
 .
 .IP
@@ -130,7 +130,7 @@ If \fB\-\-all\fR is passed, show dependencies for all formulae\.
 If \fB\-\-installed\fR is passed, show dependencies for all installed formulae\.
 .
 .IP
-By default, \fBdeps\fR shows dependencies for \fIformulae\fR\. To skip the \fB:build\fR type dependencies, pass \fB\-\-skip\-build\fR\. Similarly, pass \fB\-\-skip\-optional\fR to skip \fB:optional\fR dependencies\.
+By default, \fBdeps\fR shows required and recommended dependencies for \fIformulae\fR\. To include the \fB:build\fR type dependencies, pass \fB\-\-include\-build\fR\. Similarly, pass \fB\-\-include\-optional\fR to include \fB:optional\fR dependencies\. To skip \fB:recommended\fR type dependencies, pass \fB\-\-skip\-recommended\fR\.
 .
 .TP
 \fBdesc\fR \fIformula\fR
@@ -527,7 +527,7 @@ If \fB\-\-cleanup\fR is specified then remove previously installed \fIformula\fR
 If \fIformulae\fR are given, upgrade only the specified brews (but do so even if they are pinned; see \fBpin\fR, \fBunpin\fR)\.
 .
 .TP
-\fBuses\fR [\fB\-\-installed\fR] [\fB\-\-recursive\fR] [\fB\-\-skip\-build\fR] [\fB\-\-skip\-optional\fR] [\fB\-\-devel\fR|\fB\-\-HEAD\fR] \fIformulae\fR
+\fBuses\fR [\fB\-\-installed\fR] [\fB\-\-recursive\fR] [\fB\-\-include\-build\fR] [\fB\-\-include\-optional\fR] [\fB\-\-skip\-recommended\fR] [\fB\-\-devel\fR|\fB\-\-HEAD\fR] \fIformulae\fR
 Show the formulae that specify \fIformulae\fR as a dependency\. When given multiple formula arguments, show the intersection of formulae that use \fIformulae\fR\.
 .
 .IP
@@ -537,7 +537,7 @@ Use \fB\-\-recursive\fR to resolve more than one level of dependencies\.
 If \fB\-\-installed\fR is passed, only list installed formulae\.
 .
 .IP
-By default, \fBuses\fR shows all formulae that specify \fIformulae\fR as a dependency\. To skip the \fB:build\fR type dependencies, pass \fB\-\-skip\-build\fR\. Similarly, pass \fB\-\-skip\-optional\fR to skip \fB:optional\fR dependencies\.
+By default, \fBuses\fR shows all formulae that specify \fIformulae\fR as a required or recommended dependency\. To include the \fB:build\fR type dependencies, pass \fB\-\-include\-build\fR\. Similarly, pass \fB\-\-include\-optional\fR to include \fB:optional\fR dependencies\. To skip \fB:recommended\fR type dependencies, pass \fB\-\-skip\-recommended\fR\.
 .
 .IP
 By default, \fBuses\fR shows usages of \fBformula\fR by stable builds\. To find cases where \fBformula\fR is used by development or HEAD build, pass \fB\-\-devel\fR or \fB\-\-HEAD\fR\.