From cc589ca79993e0965997151f07a8dfcc6085fafc Mon Sep 17 00:00:00 2001 From: Amory Meltzer Date: Tue, 5 Jan 2016 09:57:29 -0800 Subject: [PATCH] Attempt clearer language for fetch and resources --- USAGE.md | 4 ++-- doc/CASK_LANGUAGE_REFERENCE.md | 2 +- doc/src/brew-cask.1.md | 7 ++++--- lib/hbc/cli/fetch.rb | 4 ++-- man/man1/brew-cask.1 | 4 ++-- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/USAGE.md b/USAGE.md index 4cc138cd3865a..b68ebc9124afd 100644 --- a/USAGE.md +++ b/USAGE.md @@ -67,12 +67,12 @@ Note that `uninstall --force` is currently imperfect. See the man page for more * `info` — displays information about the given Cask * `list` — with no args, lists installed Casks; given installed Casks, lists staged files -* `fetch` — downloads Cask resources to local cache (with `--force`, re-download even if already cached) +* `fetch` — downloads remote application files for the given Cask to the local cache (with `--force`, re-download even if already cached) * `doctor` — checks for configuration issues * `cleanup` — cleans up cached downloads (with `--outdated`, only cleans old downloads) * `home` — opens the homepage of the given Cask; or with no arguments, the homebrew-cask project page * `update` — a synonym for `brew update` -* `zap` — try to remove *all* files associated with a Cask (including resources which may be shared with other applications) +* `zap` — try to remove *all* files associated with a Cask (may include resources shared with other applications) The following commands are for Cask authors: diff --git a/doc/CASK_LANGUAGE_REFERENCE.md b/doc/CASK_LANGUAGE_REFERENCE.md index 7e6226509bea2..beec9c750bce6 100644 --- a/doc/CASK_LANGUAGE_REFERENCE.md +++ b/doc/CASK_LANGUAGE_REFERENCE.md @@ -833,7 +833,7 @@ The following methods may be called to perform standard tasks: ### Zap Stanza Purpose -The `zap` stanza describes a more complete uninstallation of resources associated with a Cask. The `zap` procedures will never be performed by default, but only if the user invokes the `zap` verb: +The `zap` stanza describes a more complete uninstallation of files associated with a Cask. The `zap` procedures will never be performed by default, but only if the user invokes the `zap` verb: ```bash $ brew cask zap td-toolbelt # also removes org.ruby-lang.installer diff --git a/doc/src/brew-cask.1.md b/doc/src/brew-cask.1.md index 25eac0d0d2e89..c515c27e716a9 100644 --- a/doc/src/brew-cask.1.md +++ b/doc/src/brew-cask.1.md @@ -57,8 +57,9 @@ names, and other aspects of this manual are still subject to change. Open the given Cask definition file for editing. * `fetch` [--force] [ ... ]: - Fetch remote resources for the given Cask to the local cache. With - `--force`, force re-download even if the resources are already cached. + Download remote application files for the given Cask to the local + cache. With `--force`, force re-download even if the files are already + cached. * `home` or `homepage` []: Display the homepage associated with a given Cask in a browser. @@ -123,7 +124,7 @@ names, and other aspects of this manual are still subject to change. files. `zap` actions are variable, depending on the level of detail defined by the Cask author. - **`zap` may remove resources which are shared between applications.** + **`zap` may remove files which are shared between applications.** ## OPTIONS diff --git a/lib/hbc/cli/fetch.rb b/lib/hbc/cli/fetch.rb index 4f2245baf8e4d..d64552ef7f021 100644 --- a/lib/hbc/cli/fetch.rb +++ b/lib/hbc/cli/fetch.rb @@ -5,7 +5,7 @@ def self.run(*args) force = args.include? '--force' cask_tokens.each do |cask_token| - ohai "Fetching resources for Cask #{cask_token}" + ohai "Downloading external files for Cask #{cask_token}" cask = Hbc.load(cask_token) downloaded_path = Hbc::Download.new(cask, force).perform Hbc::Verify.all(cask, downloaded_path) @@ -14,6 +14,6 @@ def self.run(*args) end def self.help - "downloads Cask resources to local cache" + "downloads remote application files to local cache" end end diff --git a/man/man1/brew-cask.1 b/man/man1/brew-cask.1 index 58196d74c0954..0750ca653f421 100644 --- a/man/man1/brew-cask.1 +++ b/man/man1/brew-cask.1 @@ -60,7 +60,7 @@ Open the given Cask definition file for editing\. . .TP \fBfetch\fR [\-\-force] \fItoken\fR [ \fItoken\fR \.\.\. ] -Fetch remote resources for the given Cask to the local cache\. With \fB\-\-force\fR, force re\-download even if the resources are already cached\. +Download remote application files for the given Cask to the local cache\. With \fB\-\-force\fR, force re\-download even if the files are already cached\. . .TP \fBhome\fR or \fBhomepage\fR [\fItoken\fR] @@ -123,7 +123,7 @@ Removes all staged versions of the Cask distribution found under \fB/opt/homebre If the Cask definition contains a \fBzap\fR stanza, performs additional \fBzap\fR actions as defined there, such as removing local preference files\. \fBzap\fR actions are variable, depending on the level of detail defined by the Cask author\. . .IP -\fB\fBzap\fR may remove resources which are shared between applications\.\fR +\fB\fBzap\fR may remove files which are shared between applications\.\fR . .SH "OPTIONS" To make these options persistent, see the ENVIRONMENT section, below\.