From 6ead927500f8122bd3968a0c639e44732dd4d2af Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Wed, 4 Mar 2020 13:14:39 +0000 Subject: [PATCH] cmd/search: tweak documentation text. --- Library/Homebrew/cmd/search.rb | 10 +++++----- docs/Manpage.md | 4 ++-- manpages/brew.1 | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Library/Homebrew/cmd/search.rb b/Library/Homebrew/cmd/search.rb index f40a976e48..61833ca765 100644 --- a/Library/Homebrew/cmd/search.rb +++ b/Library/Homebrew/cmd/search.rb @@ -37,11 +37,11 @@ module Homebrew No online search is performed. EOS switch "--formulae", - description: "List all locally available formulae. "\ - "No online search is performed." + description: "Without , list all locally available formulae (no online search is performed). " \ + "With , search online and locally for formulae." switch "--casks", - description: "List all locally available casks (including tapped ones). "\ - "No online search is performed." + description: "Without , list all locally available casks (including tapped ones, no online " \ + "search is performed). With , search online and locally for casks." switch "--desc", description: "Search for formulae with a description matching and casks with "\ "a name matching ." @@ -68,7 +68,7 @@ module Homebrew if args.remaining.empty? if args.casks? - raise UsageError, "Cannot specify --formulae and --casks without an argument!" if args.formulae? + raise UsageError, "specifying both --formulae and --casks requires an argument!" if args.formulae? puts Formatter.columns(Cask::Cask.to_a.map(&:full_name).sort) else diff --git a/docs/Manpage.md b/docs/Manpage.md index abfbaf73f2..6553ccf42c 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -426,9 +426,9 @@ If no *`text`* is provided, list all locally available formulae (including tappe ones). No online search is performed. * `--formulae`: - List all locally available formulae. No online search is performed. + Without *`text`*, list all locally available formulae (no online search is performed). With *`text`*, search online and locally for formulae. * `--casks`: - List all locally available casks (including tapped ones). No online search is performed. + Without *`text`*, list all locally available casks (including tapped ones, no online search is performed). With *`text`*, search online and locally for casks. * `--desc`: Search for formulae with a description matching *`text`* and casks with a name matching *`text`*. * `--macports`: diff --git a/manpages/brew.1 b/manpages/brew.1 index 66c217dfc4..e3d8cbf9b8 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -549,11 +549,11 @@ If no \fItext\fR is provided, list all locally available formulae (including tap . .TP \fB\-\-formulae\fR -List all locally available formulae\. No online search is performed\. +Without \fItext\fR, list all locally available formulae (no online search is performed)\. With \fItext\fR, search online and locally for formulae\. . .TP \fB\-\-casks\fR -List all locally available casks (including tapped ones)\. No online search is performed\. +Without \fItext\fR, list all locally available casks (including tapped ones, no online search is performed)\. With \fItext\fR, search online and locally for casks\. . .TP \fB\-\-desc\fR