Skip to content

Commit

Permalink
Merge pull request #6377 from jonchang/fix-typos
Browse files Browse the repository at this point in the history
Fix typos
  • Loading branch information
jonchang committed Aug 19, 2019
2 parents 9812693 + 1a95f1f commit b9a30d1
Show file tree
Hide file tree
Showing 20 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion Library/Homebrew/build.rb
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ def fixopt(f)

# Special case: need to recreate BuildErrors in full
# for proper analytics reporting and error messages.
# BuildErrors are specific to build processses and not other
# BuildErrors are specific to build processes and not other
# children, which is why we create the necessary state here
# and not in Utils.safe_fork.
if error_hash["json_class"] == "BuildError"
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/cmd/missing.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module Homebrew
def missing_args
Homebrew::CLI::Parser.new do
usage_banner <<~EOS
`missing` [<options>] [<formule>]
`missing` [<options>] [<formulae>]
Check the given <formula> for missing dependencies. If no <formula> are
given, check all installed brews.
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/formulary.rb
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def self.resolve(name, spec: nil)
# instead have found the new formula.)
#
# Because of this, the user is referring to this specific formula,
# not any formula targetted by the same alias, so in this context
# not any formula targeted by the same alias, so in this context
# the formula shouldn't be considered outdated if the alias used to
# install it has changed.
f.follow_installed_alias = false
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/os/mac/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def pretty_name
to_sym.to_s.split("_").map(&:capitalize).join(" ")
end

# For OS::Mac::Version compatability
# For OS::Mac::Version compatibility
def requires_nehalem_cpu?
Hardware.oldest_cpu(self) == :nehalem
end
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/rubocops/components_order.rb
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def reorder_components(corrector, node1, node2)
corrector.insert_after(node2.source_range, line_breaks + indentation + node1.source)
else
indentation = " " * (start_column(node2) - line_start_column(node2))
# No line breaks upto version_scheme, order_idx == 8
# No line breaks up to version_scheme, order_idx == 8
line_breaks = (order_idx > 8) ? "\n\n" : "\n"
corrector.insert_before(node2.source_range, node1.source + line_breaks + indentation)
end
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/shims/super/cc
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ class Cmd
paths.map! { |path| prefix + path }
end
# Unlike path_flags, do not prune non-existant directories.
# Unlike path_flags, do not prune non-existent directories.
# formula.lib for example does not yet exist, but should not be pruned.
def rpath_flags(prefix, paths)
paths.uniq.map { |path| prefix + path }
Expand Down
4 changes: 2 additions & 2 deletions Library/Homebrew/test/ENV_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
expect(subject["foo"]).to eq("1")
end

it "appends to a non-existant key" do
it "appends to a non-existent key" do
subject.append "foo", "1"
expect(subject["foo"]).to eq("1")
end
Expand All @@ -93,7 +93,7 @@
expect(subject["foo"]).to eq("1")
end

it "prepends to a non-existant key" do
it "prepends to a non-existent key" do
subject.prepend "foo", "1"
expect(subject["foo"]).to eq("1")
end
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/test/cask/cask_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
end

context "when it is from no known tap" do
it "retuns the cask token" do
it "returns the cask token" do
file = Tempfile.new(%w[tapless-cask .rb])

begin
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/test/cask/cmd/edit_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
}.to raise_error(/Only one Cask can be edited at a time\./)
end

it "raises an exception when the Cask doesnt exist" do
it "raises an exception when the Cask doesn't exist" do
expect {
described_class.run("notacask")
}.to raise_error(Cask::CaskUnavailableError)
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/test/cask/cmd/outdated_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

it_behaves_like "a command that handles invalid options"

describe 'without --greedy it ignores the Casks with "vesion latest" or "auto_updates true"' do
describe 'without --greedy it ignores the Casks with "version latest" or "auto_updates true"' do
it "checks all the installed Casks when no token is provided" do
expect {
described_class.run
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/test/formula_validation_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def supports_block_expectations?
end
end

it "cant override the `brew` method" do
it "can't override the `brew` method" do
expect {
formula do
def brew; end
Expand Down
4 changes: 2 additions & 2 deletions Library/Homebrew/test/inreplace_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
describe "#sub!" do
let(:string) { "foo" }

it "replaces the first occurence" do
it "replaces the first occurrence" do
subject.sub!("o", "e")
expect(subject).to eq("feo")
end
Expand All @@ -208,7 +208,7 @@
describe "#gsub!" do
let(:string) { "foo" }

it "replaces the all occurences" do
it "replaces all occurrences" do
subject.gsub!("o", "e") # rubocop:disable Performance/StringReplacement
expect(subject).to eq("fee")
end
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/test/resource_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
expect(subject.download_strategy).to eq(GitDownloadStrategy)
end

it "raises an error if the download strategy class is unkown" do
it "raises an error if the download strategy class is unknown" do
expect { subject.url("foo", using: Class.new) }.to raise_error(TypeError)
end

Expand Down
4 changes: 2 additions & 2 deletions Library/Homebrew/test/tab_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@
expect(subject.tabfile).to eq(f_tab_path)
end

it "can create a Tab for a non-existant Keg" do
it "can create a Tab for a non-existent Keg" do
f.prefix.mkpath

expect(subject.tabfile).to eq(f_tab_path)
Expand Down Expand Up @@ -336,7 +336,7 @@
expect(tab.tabfile).to eq(f_tab_path)
end

it "can create a Tab for a non-existant Formula" do
it "can create a Tab for a non-existent Formula" do
f.prefix.mkpath

tab = described_class.for_formula(f)
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/version/null.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def null?
true
end

# For OS::Mac::Version compatability
# For OS::Mac::Version compatibility
def requires_nehalem_cpu?
false
end
Expand Down
6 changes: 3 additions & 3 deletions completions/fish/brew.fish
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function __fish_brew_opts -d "Only arguments starting with a dash (options)"
string match --all -- '-*' (__fish_brew_args)
end

# This can be used either to get the first argument or to match it against a given list of commmands
# This can be used either to get the first argument or to match it against a given list of commands
#
# Usage examples (for `completion -n '...'`):
# * `__fish_brew_command` returns the command (first arg of brew) or exits with 1
Expand Down Expand Up @@ -59,7 +59,7 @@ function __fish_brew_subcommand -a cmd -d "Helps matching the second argument of
end
end

# This can be used to match any given options agains the given list of arguments:
# This can be used to match any given option against the given list of arguments:
# * to add condition on interdependent options
# * to ddd condition on mutually exclusive options
#
Expand Down Expand Up @@ -390,7 +390,7 @@ __fish_brew_complete_arg 'install upgrade' -l keep-tmp -d "Keep temp fi
__fish_brew_complete_arg 'install upgrade' -l build-bottle -d "Prepare the formula for eventual bottling during installation"
__fish_brew_complete_arg 'install upgrade' -s i -l interactive -d "Download and patch formula, then open a shell"
__fish_brew_complete_arg 'install upgrade; and __fish_brew_opt -i --interactive' -s g -l git -d "Create a Git repository for working on patches"
# fomrula installtion options are listed after the formula name:
# formula installation options are listed after the formula name:
__fish_brew_complete_arg 'install;
and [ (count (__fish_brew_args)) -ge 2 ];
and not string match --quiet -- "-*" (__fish_brew_args)[-1]
Expand Down
2 changes: 1 addition & 1 deletion completions/zsh/_brew
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ _brew_audit() {
_arguments \
'(--new-formula)--strict[run additional checks including RuboCop style checks]' \
'(--new-formula)--online[run slower checks that require a network connection]' \
'(--online --strict)--new-formula[check if a new formula is eligable for Homebrew. Implies --strict and --online]' \
'(--online --strict)--new-formula[check if a new formula is eligible for Homebrew. Implies --strict and --online]' \
'--display-cop-names[include RuboCop cop name for each violation in the output]' \
'--display-filename[prefix every line of output with the name of the file or formula being audited]' \
'*:formula:__brew_formulae'
Expand Down
2 changes: 1 addition & 1 deletion docs/Manpage.md
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ Show the `git log` for the given *`formula`*.

Migrate renamed packages to new name, where *`formula`* are old names of packages.

### `missing` [*`options`*] [*`formule`*]
### `missing` [*`options`*] [*`formulae`*]

Check the given *`formula`* for missing dependencies. If no *`formula`* are given,
check all installed brews.
Expand Down
2 changes: 1 addition & 1 deletion manpages/brew-cask.1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
.TH "BREW\-CASK" "1" "July 2019" "Homebrew" "brew-cask"
.TH "BREW\-CASK" "1" "August 2019" "Homebrew" "brew-cask"
.
.SH "NAME"
\fBbrew\-cask\fR \- a friendly binary installer for macOS
Expand Down
4 changes: 2 additions & 2 deletions manpages/brew.1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
.TH "BREW" "1" "July 2019" "Homebrew" "brew"
.TH "BREW" "1" "August 2019" "Homebrew" "brew"
.
.SH "NAME"
\fBbrew\fR \- The missing package manager for macOS
Expand Down Expand Up @@ -412,7 +412,7 @@ Output only one commit\.
.SS "\fBmigrate\fR [\fIoptions\fR] \fIformula\fR"
Migrate renamed packages to new name, where \fIformula\fR are old names of packages\.
.
.SS "\fBmissing\fR [\fIoptions\fR] [\fIformule\fR]"
.SS "\fBmissing\fR [\fIoptions\fR] [\fIformulae\fR]"
Check the given \fIformula\fR for missing dependencies\. If no \fIformula\fR are given, check all installed brews\.
.
.P
Expand Down

0 comments on commit b9a30d1

Please sign in to comment.