diff options
| author | Larry Gilbert | 2015-06-07 11:49:41 -0700 |
|---|---|---|
| committer | Dominyk Tiller | 2015-06-10 17:44:00 +0100 |
| commit | 69b629b041ccc285ee53def870f2da7e8882536b (patch) | |
| tree | 4bc792ab9834b218d70c5652f5e5775a58cbe35a /Library/Homebrew | |
| parent | a631ae19836bbe130983bf7070bbb5858a8a44c6 (diff) | |
| download | brew-69b629b041ccc285ee53def870f2da7e8882536b.tar.bz2 | |
Various edits for punctuation, grammar, spelling, etc.
Closes Homebrew/homebrew#40478.
Signed-off-by: Dominyk Tiller <dominyktiller@gmail.com>
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/cmd/audit.rb | 12 | ||||
| -rw-r--r-- | Library/Homebrew/manpages/brew.1.md | 4 | ||||
| -rw-r--r-- | Library/Homebrew/tap_constants.rb | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/Library/Homebrew/cmd/audit.rb b/Library/Homebrew/cmd/audit.rb index 3334b6bfe..8d129cde5 100644 --- a/Library/Homebrew/cmd/audit.rb +++ b/Library/Homebrew/cmd/audit.rb @@ -195,12 +195,12 @@ class FormulaAuditor full_name = formula.full_name if @@aliases.include? name - problem "Formula name is conflicted with existed aliases." + problem "Formula name conflicts with existing aliases." return end if !formula.core_formula? && Formula.core_names.include?(name) - problem "Formula name is conflicted with existed core formula." + problem "Formula name conflicts with existing core formula." return end @@ -217,7 +217,7 @@ class FormulaAuditor same_name_tap_formulae.delete(full_name) if same_name_tap_formulae.size > 0 - problem "Formula name is conflicted with #{same_name_tap_formulae.join ", "}" + problem "Formula name conflicts with #{same_name_tap_formulae.join ", "}" end end @@ -355,7 +355,7 @@ class FormulaAuditor end # Freedesktop is complicated to handle - It has SSL/TLS, but only on certain subdomains. - # To enable https Freedesktop change the url from http://project.freedesktop.org/wiki to + # To enable https Freedesktop change the URL from http://project.freedesktop.org/wiki to # https://wiki.freedesktop.org/project_name. # "Software" is redirected to https://wiki.freedesktop.org/www/Software/project_name if homepage =~ %r[^http://((?:www|nice|libopenraw|liboil|telepathy|xorg)\.)?freedesktop\.org/(?:wiki/)?] @@ -511,7 +511,7 @@ class FormulaAuditor if line =~ /# if this fails, try separate make\/make install steps/ problem "Please remove default template comments" end - if line =~ /# The url of the archive/ + if line =~ /# The URL of the archive/ problem "Please remove default template comments" end if line =~ /## Naming --/ @@ -848,7 +848,7 @@ class ResourceAuditor end if version.to_s =~ /_\d+$/ - problem "version #{version} should not end with a underline and a number" + problem "version #{version} should not end with an underline and a number" end end diff --git a/Library/Homebrew/manpages/brew.1.md b/Library/Homebrew/manpages/brew.1.md index e328ff9fd..998e277ff 100644 --- a/Library/Homebrew/manpages/brew.1.md +++ b/Library/Homebrew/manpages/brew.1.md @@ -144,7 +144,7 @@ Note that these flags should only appear after a command. If `--HEAD` or `--devel` is passed, fetch that version instead of the stable version. - If `-v` is passed, do a verbose VCS checkout, if the url represents a CVS. + If `-v` is passed, do a verbose VCS checkout, if the URL represents a CVS. This is useful for seeing if an existing VCS cache has been updated. If `--force` is passed, remove a previously cached version and re-fetch. @@ -236,7 +236,7 @@ Note that these flags should only appear after a command. * `ln`, `link [--overwrite] [--dry-run] [--force]` <formula>: Symlink all of <formula>'s installed files into the Homebrew prefix. This - is done automatically when you install formula, but can be useful for DIY + is done automatically when you install formulae but can be useful for DIY installations. If `--overwrite` is passed, Homebrew will delete files which already exist in diff --git a/Library/Homebrew/tap_constants.rb b/Library/Homebrew/tap_constants.rb index 4392f5f92..afc14db73 100644 --- a/Library/Homebrew/tap_constants.rb +++ b/Library/Homebrew/tap_constants.rb @@ -1,10 +1,10 @@ # match expressions when taps are given as ARGS, e.g. someuser/sometap HOMEBREW_TAP_ARGS_REGEX = %r{^([\w-]+)/(homebrew-)?([\w-]+)$} -# match taps' formula, e.g. someuser/sometap/someformula +# match taps' formulae, e.g. someuser/sometap/someformula HOMEBREW_TAP_FORMULA_REGEX = %r{^([\w-]+)/([\w-]+)/([\w+-.]+)$} -# match taps' directory path, e.g. HOMEBREW_LIBRARY/Taps/someuser/sometap +# match taps' directory paths, e.g. HOMEBREW_LIBRARY/Taps/someuser/sometap HOMEBREW_TAP_DIR_REGEX = %r{#{Regexp.escape(HOMEBREW_LIBRARY.to_s)}/Taps/([\w-]+)/([\w-]+)} -# match taps' formula path, e.g. HOMEBREW_LIBRARY/Taps/someuser/sometap/someformula +# match taps' formula paths, e.g. HOMEBREW_LIBRARY/Taps/someuser/sometap/someformula HOMEBREW_TAP_PATH_REGEX = Regexp.new(HOMEBREW_TAP_DIR_REGEX.source + %r{/(.*)}.source) # match the default brew-cask tap e.g. Caskroom/cask HOMEBREW_CASK_TAP_FORMULA_REGEX = %r{^(Caskroom)/(cask)/([\w+-.]+)$} |
