From 21f1efcba65e036fcbc57da26af9bbd35a36e2d4 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sat, 26 Jan 2013 13:16:55 +0000 Subject: [PATCH] We use formulae as the plural of formula. --- Library/Contributions/brew_zsh_completion.zsh | 4 ++-- Library/Contributions/cmds/brew-leaves.rb | 2 +- Library/Contributions/cmds/brew-server | 6 +++--- Library/Contributions/cmds/brew-services.rb | 12 ++++++------ Library/Contributions/manpages/brew.1.md | 2 +- Library/Homebrew/formula.rb | 2 +- share/man/man1/brew.1 | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Library/Contributions/brew_zsh_completion.zsh b/Library/Contributions/brew_zsh_completion.zsh index eb742d9243..cabd734203 100644 --- a/Library/Contributions/brew_zsh_completion.zsh +++ b/Library/Contributions/brew_zsh_completion.zsh @@ -33,7 +33,7 @@ _1st_arguments=( 'list:list files in a formula or not-installed formulae' 'log:git commit log for a formula' 'missing:check all installed formuale for missing dependencies.' - 'outdated:list formulas for which a newer version is available' + 'outdated:list formulae for which a newer version is available' 'prune:remove dead links' 'remove:remove a formula' 'search:search for a formula (/regex/ or string)' @@ -41,7 +41,7 @@ _1st_arguments=( 'unlink:unlink a formula' 'update:freshen up links' 'upgrade:upgrade outdated formulae' - 'uses:show formulas which depend on a formula' + 'uses:show formulae which depend on a formula' ) local expl diff --git a/Library/Contributions/cmds/brew-leaves.rb b/Library/Contributions/cmds/brew-leaves.rb index 068fb21dfa..f94809c9d0 100755 --- a/Library/Contributions/cmds/brew-leaves.rb +++ b/Library/Contributions/cmds/brew-leaves.rb @@ -1,4 +1,4 @@ -# Outputs formulas that are installed but are not a dependency for +# Outputs formulae that are installed but are not a dependency for # any other installed formula. # See: http://github.com/mxcl/homebrew/issues/issue/1438 diff --git a/Library/Contributions/cmds/brew-server b/Library/Contributions/cmds/brew-server index 435a4abfa3..5c55c05fa2 100755 --- a/Library/Contributions/cmds/brew-server +++ b/Library/Contributions/cmds/brew-server @@ -173,7 +173,7 @@ get '/formula/:name' do end -def installed_formulas +def installed_formulae Formula.select{|formula| formula.installed?} end @@ -182,7 +182,7 @@ get '/installed' do s = <<-HTML - Installed Formulas + Installed formulae #{css_style} @@ -190,7 +190,7 @@ get '/installed' do