From df79659045004dd09ac9514f497094ace3a9a4b4 Mon Sep 17 00:00:00 2001 From: Xu Cheng Date: Sat, 16 Apr 2016 00:22:04 +0800 Subject: [PATCH] update manpage for deps/uses --- Library/Homebrew/manpages/brew.1.md | 18 ++++++++++-------- share/doc/homebrew/brew.1.html | 18 ++++++++++-------- share/man/man1/brew.1 | 8 ++++---- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/Library/Homebrew/manpages/brew.1.md b/Library/Homebrew/manpages/brew.1.md index 575132336f..80ff46820a 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`] : + * `deps` [`--1`] [`-n`] [`--union`] [`--tree`] [`--all`] [`--installed`] [`--include-build`] [`--include-optional`] [`--skip-recommended`] : Show dependencies for . When given multiple formula arguments, show the intersection of dependencies for , 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 . 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 + . 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` : Display 's name and one-line description. @@ -496,7 +497,7 @@ With `--verbose` or `-v`, many commands print extra debugging information. Note If 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`] : + * `uses` [`--installed`] [`--recursive`] [`--include-build`] [`--include-optional`] [`--skip-recommended`] [`--devel`|`--HEAD`] : Show the formulae that specify as a dependency. When given multiple formula arguments, show the intersection of formulae that use . @@ -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 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 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 dc7f2a7019..1988ce253a 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.

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

Show dependencies for formulae. When given multiple formula arguments, +

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.

@@ -101,9 +101,10 @@ instead of the intersection.

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.

desc [-s|-n|-d] pattern

Search both name and description (-s), just the names (-n), or just the descriptions (-d) for <pattern>. <pattern> is by default interpreted @@ -375,7 +376,7 @@ source. This is useful for creating patches for the software.

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

Show the formulae that specify formulae as a dependency. When given +

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.

@@ -383,9 +384,10 @@ multiple formula arguments, show the intersection of formulae that use

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/man/man1/brew.1 b/share/man/man1/brew.1 index f51bafb9c1..897ba2acd5 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\.