We use formulae as the plural of formula.

author: Mike McQuaid 2013-01-26 13:16:55 +0000
committer: Mike McQuaid 2013-01-26 13:16:55 +0000
commit: 21f1efcba65e036fcbc57da26af9bbd35a36e2d4 (patch)
tree: 6dfdf59241dbda9dcabc4be9a4a05afd3aba7192
parent: bb8c22c90d9fe97a42f9524ad82d951782450c77 (diff)
download: brew-21f1efcba65e036fcbc57da26af9bbd35a36e2d4.tar.bz2
7 files changed, 15 insertions, 15 deletions
diff --git a/Library/Contributions/brew_zsh_completion.zsh b/Library/Contributions/brew_zsh_completion.zsh
index eb742d924..cabd73420 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 068fb21df..f94809c9d 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 435a4abfa..5c55c05fa 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
     <html>
     <head>
-      <title>Installed Formulas</title>
+      <title>Installed formulae</title>
       #{css_style}
     </head>
     <body>
@@ -190,7 +190,7 @@ get '/installed' do
     <ul>
   HTML
 
-  installed_formulas.each do |formula|
+  installed_formulae.each do |formula|
     s << "<li>#{link_to_formula(formula.name)}</li>"
   end
 
diff --git a/Library/Contributions/cmds/brew-services.rb b/Library/Contributions/cmds/brew-services.rb
index 143ba5743..4891ae510 100755
--- a/Library/Contributions/cmds/brew-services.rb
+++ b/Library/Contributions/cmds/brew-services.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby -w
 
-# brew-services(1) - Easily start and stop formulas via launchctl
+# brew-services(1) - Easily start and stop formulae via launchctl
 # ===============================================================
 #
 # ## SYNOPSIS
@@ -13,7 +13,7 @@
 #
 # ## DESCRIPTION
 #
-# Integrates homebrew formulas with MacOS X' `launchctl` manager. Services
+# Integrates homebrew formulae with MacOS X' `launchctl` manager. Services
 # can either be added to `/Library/LaunchDaemons` or `~/Library/LaunchAgents`.
 # Basically items added to `/Library/LaunchDaemons` are started at boot,
 # those in `~/Library/LaunchAgents` at login.
@@ -45,12 +45,12 @@
 #
 # ## SYNTAX
 #
-# Several existing formulas (like mysql, nginx) already write custom plist
-# files to the formulas prefix. Most of these implement `#startup_plist`
+# Several existing formulae (like mysql, nginx) already write custom plist
+# files to the formulae prefix. Most of these implement `#startup_plist`
 # which then in turn returns a neat-o plist file as string.
 #
 # `brew services` operates on `#startup_plist` as well and requires
-# supporting formulas to implement it. This method should either string
+# supporting formulae to implement it. This method should either string
 # containing the generated XML file, or return a `Pathname` instance which
 # points to a plist template, or a hash like:
 #
@@ -130,7 +130,7 @@ module ServicesCli
     def usage(code = 0)
       puts "usage: [sudo] #{bin} [--help] <command> [<formula>]"
       puts
-      puts "Small wrapper around `launchctl` for supported formulas, commands available:"
+      puts "Small wrapper around `launchctl` for supported formulae, commands available:"
       puts "   cleanup Get rid of stale services and unused plists"
       puts "   list    List all services managed by `#{bin}`"
       puts "   restart Gracefully restart selected service"
diff --git a/Library/Contributions/manpages/brew.1.md b/Library/Contributions/manpages/brew.1.md
index 9e996b85a..150288c1b 100644
--- a/Library/Contributions/manpages/brew.1.md
+++ b/Library/Contributions/manpages/brew.1.md
@@ -291,7 +291,7 @@ With `--verbose`, many commands print extra debugging information.
     If <formulae> are given, upgrade only the specified brews.
 
   * `uses [--installed] [--recursive]` <formula>:
-    Show the formulas that specify <formula> as a dependency.
+    Show the formulae that specify <formula> as a dependency.
 
     Use `--recursive` to resolve more than one level of dependencies.
 
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index b78434b91..37a946173 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -219,7 +219,7 @@ class Formula
     stage do
       begin
         patch
-        # we allow formulas to do anything they want to the Ruby process
+        # we allow formulae to do anything they want to the Ruby process
         # so load any deps before this point! And exit asap afterwards
         yield self
       rescue RuntimeError, SystemCallError => e
diff --git a/share/man/man1/brew.1 b/share/man/man1/brew.1
index 870efb313..14a259895 100644
--- a/share/man/man1/brew.1
+++ b/share/man/man1/brew.1
@@ -324,7 +324,7 @@ If \fIformulae\fR are given, upgrade only the specified brews\.
 .
 .TP
 \fBuses [\-\-installed] [\-\-recursive]\fR \fIformula\fR
-Show the formulas that specify \fIformula\fR as a dependency\.
+Show the formulae that specify \fIformula\fR as a dependency\.
 .
 .IP
 Use \fB\-\-recursive\fR to resolve more than one level of dependencies\.
author	Mike McQuaid	2013-01-26 13:16:55 +0000
committer	Mike McQuaid	2013-01-26 13:16:55 +0000
commit	21f1efcba65e036fcbc57da26af9bbd35a36e2d4 (patch)
tree	6dfdf59241dbda9dcabc4be9a4a05afd3aba7192
parent	bb8c22c90d9fe97a42f9524ad82d951782450c77 (diff)
download	brew-21f1efcba65e036fcbc57da26af9bbd35a36e2d4.tar.bz2