From ccbbe6756f6a0e1da0f244474bd5518dbc56e093 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Tue, 19 Jun 2018 13:40:25 +0200 Subject: [PATCH 1/2] Remove `brew cask search` from documentation. --- Library/Homebrew/manpages/brew-cask.1.md | 4 ++-- manpages/brew-cask.1 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/manpages/brew-cask.1.md b/Library/Homebrew/manpages/brew-cask.1.md index fcded40158..8897635edf 100644 --- a/Library/Homebrew/manpages/brew-cask.1.md +++ b/Library/Homebrew/manpages/brew-cask.1.md @@ -75,7 +75,7 @@ names, and other aspects of this manual are still subject to change. dependencies. `--require-sha` will abort installation if the Cask does not have a checksum defined. - is usually the ID of a Cask as returned by `brew cask search`, + is usually the ID of a Cask, but see [OTHER WAYS TO SPECIFY A CASK][] for variations. * `list` or `ls` [-1] [--versions] [ ... ]: @@ -231,7 +231,7 @@ the Homebrew command: Most Homebrew-Cask commands can accept a Cask token as an argument. As described above, the argument can take the form of: - * A token as returned by `brew cask search`, e.g. `google-chrome` + * A simple token, e.g. `google-chrome` Homebrew-Cask also accepts three other forms in place of plain tokens: diff --git a/manpages/brew-cask.1 b/manpages/brew-cask.1 index 4e5c10ea9b..7c62d9496c 100644 --- a/manpages/brew-cask.1 +++ b/manpages/brew-cask.1 @@ -78,7 +78,7 @@ Display information about the given Cask\. Install the given Cask\. With \fB\-\-force\fR, re\-install even if the Cask appears to be already present\. With \fB\-\-skip\-cask\-deps\fR, skip any Cask dependencies\. \fB\-\-require\-sha\fR will abort installation if the Cask does not have a checksum defined\. . .IP -\fItoken\fR is usually the ID of a Cask as returned by \fBbrew cask search\fR, but see \fIOTHER WAYS TO SPECIFY A CASK\fR for variations\. +\fItoken\fR is usually the ID of a Cask, but see \fIOTHER WAYS TO SPECIFY A CASK\fR for variations\. . .TP \fBlist\fR or \fBls\fR [\-1] [\-\-versions] [ \fItoken\fR \.\.\. ] @@ -255,7 +255,7 @@ brew update Most Homebrew\-Cask commands can accept a Cask token as an argument\. As described above, the argument can take the form of: . .IP "\(bu" 4 -A token as returned by \fBbrew cask search\fR, e\.g\. \fBgoogle\-chrome\fR +A simple token, e\.g\. \fBgoogle\-chrome\fR . .IP "" 0 . From fcd75877c56428e889756b847bcde5cd2f6b6afe Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Tue, 19 Jun 2018 13:48:23 +0200 Subject: [PATCH 2/2] Update `brew search` help. --- Library/Homebrew/cmd/search.rb | 6 +++--- docs/Manpage.md | 6 +++--- manpages/brew.1 | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Library/Homebrew/cmd/search.rb b/Library/Homebrew/cmd/search.rb index 3914b455a5..5459a5b83c 100644 --- a/Library/Homebrew/cmd/search.rb +++ b/Library/Homebrew/cmd/search.rb @@ -5,10 +5,10 @@ #: * `search` [`--desc`] (|`/``/`): #: Perform a substring search of formula names for . If is #: surrounded with slashes, then it is interpreted as a regular expression. -#: The search for is extended online to some popular taps. +#: The search for is extended online to official taps. #: -#: If `--desc` is passed, browse available packages matching including a -#: description for each. +#: If `--desc` is passed, search formulae with a description matching and +#: casks with a name matching . #: #: * `search` (`--debian`|`--fedora`|`--fink`|`--macports`|`--opensuse`|`--ubuntu`) : #: Search for in the given package manager's list. diff --git a/docs/Manpage.md b/docs/Manpage.md index fe58e52db5..4666a3999f 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -406,10 +406,10 @@ With `--verbose` or `-v`, many commands print extra debugging information. Note * `search` [`--desc`] (`text`|`/``text``/`): Perform a substring search of formula names for `text`. If `text` is surrounded with slashes, then it is interpreted as a regular expression. - The search for `text` is extended online to some popular taps. + The search for `text` is extended online to official taps. - If `--desc` is passed, browse available packages matching `text` including a - description for each. + If `--desc` is passed, search formulae with a description matching `text` and + casks with a name matching `text`. * `search` (`--debian`|`--fedora`|`--fink`|`--macports`|`--opensuse`|`--ubuntu`) `text`: Search for `text` in the given package manager's list. diff --git a/manpages/brew.1 b/manpages/brew.1 index ee8c04b94a..01e4263ead 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -419,10 +419,10 @@ Display all locally available formulae for brewing (including tapped ones)\. No . .TP \fBsearch\fR [\fB\-\-desc\fR] (\fItext\fR|\fB/\fR\fItext\fR\fB/\fR) -Perform a substring search of formula names for \fItext\fR\. If \fItext\fR is surrounded with slashes, then it is interpreted as a regular expression\. The search for \fItext\fR is extended online to some popular taps\. +Perform a substring search of formula names for \fItext\fR\. If \fItext\fR is surrounded with slashes, then it is interpreted as a regular expression\. The search for \fItext\fR is extended online to official taps\. . .IP -If \fB\-\-desc\fR is passed, browse available packages matching \fItext\fR including a description for each\. +If \fB\-\-desc\fR is passed, search formulae with a description matching \fItext\fR and casks with a name matching \fItext\fR\. . .TP \fBsearch\fR (\fB\-\-debian\fR|\fB\-\-fedora\fR|\fB\-\-fink\fR|\fB\-\-macports\fR|\fB\-\-opensuse\fR|\fB\-\-ubuntu\fR) \fItext\fR