Skip to content

Commit

Permalink
Merge pull request #8575 from dtrodrigues/typo-fixes
Browse files Browse the repository at this point in the history
minor typo fixes
  • Loading branch information
dtrodrigues authored Sep 2, 2020
2 parents 8604cdb + d400b15 commit f5b71af
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Library/Homebrew/cmd/update-report.rb
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def update_report
print "\a"

# Use an extra newline and bold to avoid this being missed.
ohai "Homebrew has enabled anonymous aggregate formulae and cask analytics."
ohai "Homebrew has enabled anonymous aggregate formula and cask analytics."
puts <<~EOS
#{Tty.bold}Read the analytics documentation (and how to opt-out) here:
#{Formatter.url("https://docs.brew.sh/Analytics")}#{Tty.reset}
Expand Down
4 changes: 2 additions & 2 deletions Library/Homebrew/description_cache_store.rb
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def update_from_report!(report)
renamings.map(&:first))
end

# Use an array of formulae names to update the `DescriptionCacheStore`.
# Use an array of formula names to update the `DescriptionCacheStore`.
#
# @param formula_names [Array] the formulae to update
# @return [nil]
Expand All @@ -69,7 +69,7 @@ def update_from_formula_names!(formula_names)
end
end

# Use an array of formulae names to delete them from the `DescriptionCacheStore`.
# Use an array of formula names to delete them from the `DescriptionCacheStore`.
#
# @param formula_names [Array] the formulae to delete
# @return [nil]
Expand Down
8 changes: 4 additions & 4 deletions docs/Acceptable-Formulae.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,16 @@ don’t want those things in Homebrew. Encourage upstream projects to build and
### Stuff that builds a GUI by default (but doesn't have to)
Make it build a command-line tool or a library by default and, if the GUI is useful and would be widely used, also build the GUI. Don’t build X11/XQuartz GUIs as they are a bad user experience on macOS.

### Stuff that doesn't build with the latest, stable Xcode's Clang
### Stuff that doesn't build with the latest, stable Xcode Clang
Clang is the default C/C++ compiler on macOS (and has been for a long time). Software that doesn't build with it hasn't been adequately ported to macOS.

### Stuff that requires heavy manual pre/post-install intervention
We're a package manager so we want to do things like resolve dependencies and set up applications for our users. If things require too much manual intervention then they aren't useful in a package manager.

## Stuff that requires vendored versions of homebrew formulae
Homebrew formula should avoid having multiple, separate, upstream projects bundled together in a single package to avoid having shipping outdated/insecure versions of software that is already a formula.
## Stuff that requires vendored versions of Homebrew formulae
Homebrew formulae should avoid having multiple, separate, upstream projects bundled together in a single package to avoid shipping outdated/insecure versions of software that is already a formula.

For more info see [Debian](https://www.debian.org/doc/debian-policy/ch-source.html#s-embeddedfiles) and [Fedora's](https://docs.fedoraproject.org/en-US/packaging-guidelines/#bundling) stance on this.
For more info see [Debian's](https://www.debian.org/doc/debian-policy/ch-source.html#s-embeddedfiles) and [Fedora's](https://docs.fedoraproject.org/en-US/packaging-guidelines/#bundling) stances on this.

### Sometimes there are exceptions
Even if all criteria are met we may not accept the formula.
Expand Down
2 changes: 1 addition & 1 deletion docs/Homebrew-on-Linux.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Instructions for a supported install of Homebrew on Linux are on the [homepage](

The installation script installs Homebrew to `/home/linuxbrew/.linuxbrew` using *sudo* if possible and in your home directory at `~/.linuxbrew` otherwise. Homebrew does not use *sudo* after installation. Using `/home/linuxbrew/.linuxbrew` allows the use of more binary packages (bottles) than installing in your personal home directory.

Follow the *Next steps* instructions to add Homebrew to your `PATH` and to your bash shell profile script, either `~/.profile` on Debian/Ubuntu or `~/.bash_profile` on CentOS/Fedora/RedHat.
Follow the *Next steps* instructions to add Homebrew to your `PATH` and to your bash shell profile script, either `~/.profile` on Debian/Ubuntu or `~/.bash_profile` on CentOS/Fedora/Red Hat.

```sh
test -d ~/.linuxbrew && eval $(~/.linuxbrew/bin/brew shellenv)
Expand Down

0 comments on commit f5b71af

Please sign in to comment.