16 files changed, 42 insertions, 42 deletions
diff --git a/share/doc/homebrew/Acceptable-Formulae.md b/share/doc/homebrew/Acceptable-Formulae.md
index 366615ed8..15e800336 100644
--- a/share/doc/homebrew/Acceptable-Formulae.md
+++ b/share/doc/homebrew/Acceptable-Formulae.md
@@ -5,19 +5,19 @@ additional [Interesting Taps & Forks](Interesting-Taps-&-Forks.md) and anyone ca
 own!
 
 ### We try hard to avoid dupes in Homebrew/homebrew
-Stuff that comes with OS X or libraries that are provided by
+Stuff that comes with macOS or libraries that are provided by
 [RubyGems, CPAN or PyPi](Gems,-Eggs-and-Perl-Modules.md)
 should not be duplicated. There are good reasons for this:
 
 * Duplicate libraries regularly break builds
 * Subtle bugs emerge with duplicate libraries, and to a lesser extent,
   duplicate tools
-* We want our formulae to work with what comes with OS X
+* We want our formulae to work with what comes with macOS
 
 There are exceptions:
 
-* OpenSSL - Apple has formally deprecated OpenSSL on OS X in favour of their own Security Framework
-  & consequently the OS X OpenSSL is rarely updated and frequently falls behind important security updates.
+* OpenSSL - Apple has formally deprecated OpenSSL on macOS in favour of their own Security Framework
+  & consequently the macOS OpenSSL is rarely updated and frequently falls behind important security updates.
   Homebrew endeavours to use our shipped OpenSSL as much
    as possible.
 * Programs that a user will regularly interact with directly, like editors and
@@ -32,13 +32,13 @@ There are exceptions:
   Formula         | Reason
   ---             | ---
   ruby, python, perl    | People want newer versions
-  bash            | OS X's bash is stuck at 3.2 because newer versions are licensed under GPLv3
+  bash            | macOS's bash is stuck at 3.2 because newer versions are licensed under GPLv3
   zsh             | This was a mistake, but it’s too late to remove it
   emacs, vim      | [Too popular to move to dupes](https://github.com/Homebrew/homebrew/pull/21594#issuecomment-21968819)
   subversion      | Originally added for 10.5, but people want the latest version
-  libcurl         | Some formulae require a newer version than OS X provides
-  openssl         | OS X's openssl is deprecated & outdated.
-  libxml2         | Historically, OS X's libxml2 has been buggy
+  libcurl         | Some formulae require a newer version than macOS provides
+  openssl         | macOS's openssl is deprecated & outdated.
+  libxml2         | Historically, macOS's libxml2 has been buggy
 
 We also maintain [a tap](https://github.com/Homebrew/homebrew-dupes) that
 contains many duplicates not otherwise found in Homebrew.
@@ -104,7 +104,7 @@ Please trust that we need to use our discretion based on our experience
 running a package manager.
 
 ### Stuff that builds an .app
-Don’t make your formula build an `.app` (native OS X Application); we
+Don’t make your formula build an `.app` (native macOS Application); we
 don’t want those things in Homebrew (but
 [Homebrew Cask](https://github.com/caskroom/homebrew-cask) does).
 Make it build a command-line tool or a library.
diff --git a/share/doc/homebrew/Analytics.md b/share/doc/homebrew/Analytics.md
index 1346e767b..83386b3ee 100644
--- a/share/doc/homebrew/Analytics.md
+++ b/share/doc/homebrew/Analytics.md
@@ -5,12 +5,12 @@ Homebrew has begun gathering anonymous aggregate user behaviour analytics and re
 Homebrew is provided free of charge and run entirely by volunteers in their spare time. As a result, we do not have the resources to do detailed user studies of Homebrew users to decide on how best to design future features and prioritise current work. Anonymous aggregate user analytics allow us to prioritise fixes and features based on how, where and when people use Homebrew. For example:
 
 - if a formula is widely used and is failing often it will enable us to prioritise fixing that formula over others.
-- collecting the OS version allows us to decide what versions of OS X to prioritise and support and identify build failures that occur only on single versions.
+- collecting the OS version allows us to decide what versions of macOS to prioritise and support and identify build failures that occur only on single versions.
 
 ## What?
 Homebrew's analytics record some shared information for every event:
 
-- The Homebrew user agent e.g. `Homebrew/0.9.9 (Macintosh; Intel Mac OS X 10.11.4) curl/7.43.0`
+- The Homebrew user agent e.g. `Homebrew/0.9.9 (Macintosh; Intel macOS 10.12.0) curl/7.43.0`
 - The Google Analytics version i.e. `1` (https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#v)
 - The Homebrew analytics tracking ID e.g. `UA-75654628-1` (https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#tid)
 - A Homebrew analytics user ID e.g. `1BAB65CC-FE7F-4D8C-AB45-B7DB5A6BA9CB`. This is generated by `uuidgen` and stored in the repository-specific Git configuration variable `homebrew.analyticsuuid` within `$(brew --repository)/.git/config`. This does not allow us to track individual users but does enable us to accurately measure user counts vs. event counts (https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#cid)
@@ -22,8 +22,8 @@ Homebrew's analytics record some shared information for every event:
 Homebrew's analytics records the following different events:
 
 - a `screenview` hit type with the official Homebrew command you have run (with arguments stripped) e.g. `brew list` (not `brew list foo` or any external commands except `bundle` and `services`)
-- an `event` hit type with the `install` event category, the Homebrew formula from a non-private GitHub tap you have requested to install and any used options e.g. `wget --with-pcre` as the action and an event label e.g. `Mac OS X 10.11, non-/usr/local, CI` to indicate the OS version, non-standard installation location and invocation as part of CI. This allows us to identify formulae that need fixed and where more easily.
-- an `event` hit type with the `BuildError` event category, the Homebrew formula that failed to install e.g. `wget` as the action and an event label e.g. `Mac OS X 10.11`
+- an `event` hit type with the `install` event category, the Homebrew formula from a non-private GitHub tap you have requested to install and any used options e.g. `wget --with-pcre` as the action and an event label e.g. `macOS 10.12, non-/usr/local, CI` to indicate the OS version, non-standard installation location and invocation as part of CI. This allows us to identify formulae that need fixed and where more easily.
+- an `event` hit type with the `BuildError` event category, the Homebrew formula that failed to install e.g. `wget` as the action and an event label e.g. `macOS 10.12`
 - an `exception` hit type with the `exception` event category, exception description of the exception name e.g. `FormulaUnavailableError` and whether the exception was fatal e.g. `1`
 
 You can also view all the information that is sent by Homebrew's analytics by setting `HOMEBREW_ANALYTICS_DEBUG=1` in your environment. Please note this will also stop any analytics being sent.
diff --git a/share/doc/homebrew/Bottles.md b/share/doc/homebrew/Bottles.md
index a72ba51ed..196b36e1f 100644
--- a/share/doc/homebrew/Bottles.md
+++ b/share/doc/homebrew/Bottles.md
@@ -56,7 +56,7 @@ Optionally contains the rebuild version of the bottle.
 Sometimes bottles may need be updated without bumping the version of the formula e.g. a new patch was applied. In that case the rebuild will have a value of 1 or more.
 
 ### `sha256`
-Contains the SHA-256 of bottle for a particular version of OS X.
+Contains the SHA-256 of bottle for a particular version of macOS.
 
 ## Formula DSL
 Additionally there is a method available in the formula DSL.
diff --git a/share/doc/homebrew/Common-Issues.md b/share/doc/homebrew/Common-Issues.md
index 70da99345..320ad6d89 100644
--- a/share/doc/homebrew/Common-Issues.md
+++ b/share/doc/homebrew/Common-Issues.md
@@ -10,7 +10,7 @@ You cloned with git, and your git configuration is set to use Windows line endin
 
 
 ### Ruby `bad interpreter: /usr/bin/ruby`
-You don't have a `/usr/bin/ruby` or it is not executable. It's not recommended to let this persist, you'd be surprised how many .apps, tools and scripts expect your OS X provided files and directories to be *unmodified* since OS X was installed.
+You don't have a `/usr/bin/ruby` or it is not executable. It's not recommended to let this persist, you'd be surprised how many .apps, tools and scripts expect your macOS provided files and directories to be *unmodified* since macOS was installed.
 
 ### `brew update` complains about untracked working tree files
 After running `brew update`, you receive a git error warning about untracked files or local changes that would be overwritten by a checkout or merge, followed by a list of files inside your Homebrew installation.
@@ -38,7 +38,7 @@ invalid multibyte escape: /^\037\235/
 
 In the past, Homebrew assumed that `/usr/bin/ruby` was Ruby 1.8. On OS X 10.9, it is now Ruby 2.0. There are various incompatibilities between the two versions, so if you upgrade to OS X 10.9 while using a sufficiently old version of Homebrew, you will encounter errors.
 
-The incompatibilities have been addressed in more recent versions of Homebrew, and it does not make assumptions about `/usr/bin/ruby`, instead it uses the executable inside OS X's Ruby framework or a vendored Ruby.
+The incompatibilities have been addressed in more recent versions of Homebrew, and it does not make assumptions about `/usr/bin/ruby`, instead it uses the executable inside MacOS's Ruby framework or a vendored Ruby.
 
 To recover from this situation, do the following:
 
@@ -118,14 +118,14 @@ Don't follow the advice here but fix by using
 `Language::Python.setup_install_args` in the formula as described in
 [Python for Formula Authors](Python-for-Formula-Authors.md).
 
-### Upgrading OS X
+### Upgrading macOS
 
-Upgrading OS X can cause errors like the following:
+Upgrading macOS can cause errors like the following:
 
 - `dyld: Library not loaded: /usr/local/opt/icu4c/lib/libicui18n.54.dylib`
 - `configure: error: Cannot find libz`
 
-Following an OS X upgrade it may be necessary to reinstall the Xcode Command Line Tools and `brew upgrade` all installed formula:
+Following an macOS upgrade it may be necessary to reinstall the Xcode Command Line Tools and `brew upgrade` all installed formula:
 
 ```bash
 xcode-select --install
diff --git a/share/doc/homebrew/FAQ.md b/share/doc/homebrew/FAQ.md
index 3c703692d..2f6d4f9ea 100644
--- a/share/doc/homebrew/FAQ.md
+++ b/share/doc/homebrew/FAQ.md
@@ -71,7 +71,7 @@ Be careful as this is a destructive operation.
 Which is usually: `~/Library/Caches/Homebrew`
 
 ### My Mac `.app`s don’t find `/usr/local/bin` utilities!
-GUI apps on OS X don’t have `/usr/local/bin` in their `PATH` by default.
+GUI apps on macOS don’t have `/usr/local/bin` in their `PATH` by default.
 If you’re on Mountain Lion, you can fix this by running
 `launchctl setenv PATH "/usr/local/bin:$PATH"`. [More details
 here](https://stackoverflow.com/questions/135688/setting-environment-variables-in-os-x/5444960#5444960),
diff --git a/share/doc/homebrew/Formula-Cookbook.md b/share/doc/homebrew/Formula-Cookbook.md
index 56d566809..876a6645f 100644
--- a/share/doc/homebrew/Formula-Cookbook.md
+++ b/share/doc/homebrew/Formula-Cookbook.md
@@ -88,7 +88,7 @@ Check the package’s `README`. Does the package install with `./configure`, `cm
 
 ## Check for dependencies
 
-The `README` probably tells you about dependencies and Homebrew or OS X probably already has them. You can check for Homebrew dependencies with `brew search`. Some common dependencies that OS X comes with:
+The `README` probably tells you about dependencies and Homebrew or macOS probably already has them. You can check for Homebrew dependencies with `brew search`. Some common dependencies that macOS comes with:
 
 * `libexpat`
 * `libGL`
@@ -394,7 +394,7 @@ end
 
 Make sure you modify `s`! This block ignores the returned value.
 
-`inreplace` should be used instead of patches when it is patching something that will never be accepted upstream e.g. make the software’s build system respect Homebrew’s installation hierarchy. If it's something that affects both Homebrew and MacPorts (i.e. OS X specific) it should be turned into an upstream submitted patch instead.
+`inreplace` should be used instead of patches when it is patching something that will never be accepted upstream e.g. make the software’s build system respect Homebrew’s installation hierarchy. If it's something that affects both Homebrew and MacPorts (i.e. macOS specific) it should be turned into an upstream submitted patch instead.
 
 If you need modify variables in a `Makefile`, rather than using `inreplace`, pass them as arguments to `make`:
 
diff --git a/share/doc/homebrew/Gems,-Eggs-and-Perl-Modules.md b/share/doc/homebrew/Gems,-Eggs-and-Perl-Modules.md
index 3f2159bc8..dfbdc224f 100644
--- a/share/doc/homebrew/Gems,-Eggs-and-Perl-Modules.md
+++ b/share/doc/homebrew/Gems,-Eggs-and-Perl-Modules.md
@@ -1,5 +1,5 @@
 # Gems, Eggs and Perl Modules
-On a fresh OS X installation there are three empty directories for
+On a fresh macOS installation there are three empty directories for
 add-ons available to all users:
 
     /Library/Ruby
@@ -42,7 +42,7 @@ about the paths. Note, a brewed Python still searches for modules in
 ### With system’s Python
 _This is only recommended if you **don't** use a brewed Python._
 
-On OS X, any [Python version X.Y also searches in
+On macOS, any [Python version X.Y also searches in
 `~/Library/Python/X.Y/lib/python/site-packages` for
 modules](https://docs.python.org/2/install/index.html#inst-alt-install-user).
 That dir might not yet exist, but you can create it:
diff --git a/share/doc/homebrew/Homebrew-and-Python.md b/share/doc/homebrew/Homebrew-and-Python.md
index 7bb05343c..5b8676dbc 100644
--- a/share/doc/homebrew/Homebrew-and-Python.md
+++ b/share/doc/homebrew/Homebrew-and-Python.md
@@ -3,7 +3,7 @@
 
 This page describes how Python is handled in Homebrew for users. See [Python for Formula Authors](Python-for-Formula-Authors.md) for advice on writing formulae to install packages written in Python.
 
-Homebrew should work with any [CPython](https://stackoverflow.com/questions/2324208/is-there-any-difference-between-cpython-and-python) and defaults to the OS X system Python.
+Homebrew should work with any [CPython](https://stackoverflow.com/questions/2324208/is-there-any-difference-between-cpython-and-python) and defaults to the macOS system Python.
 
 Homebrew provides formulae to brew a more up-to-date Python 2.7.x (and 3.x).
 
diff --git a/share/doc/homebrew/How-to-build-software-outside-Homebrew-with-Homebrew-keg-only-dependencies.md b/share/doc/homebrew/How-to-build-software-outside-Homebrew-with-Homebrew-keg-only-dependencies.md
index c22979f22..f71c75164 100644
--- a/share/doc/homebrew/How-to-build-software-outside-Homebrew-with-Homebrew-keg-only-dependencies.md
+++ b/share/doc/homebrew/How-to-build-software-outside-Homebrew-with-Homebrew-keg-only-dependencies.md
@@ -14,7 +14,7 @@ This is because Homebrew keeps it locked inside its individual prefix, rather th
 
 A number of people in this situation are either forcefully linking `keg_only` tools with `brew link --force` or moving default system utilities out of the `$PATH` and replacing them with manually-created symlinks to the Homebrew-provided tool.
 
-*Please* do not remove OS X native tools and forcefully replace them with symlinks back to the Homebrew-provided tool. Doing so can and likely will cause significant breakage when attempting to build software.
+*Please* do not remove macOS native tools and forcefully replace them with symlinks back to the Homebrew-provided tool. Doing so can and likely will cause significant breakage when attempting to build software.
 
 `brew link --force` creates a warning in `brew doctor` to let both you and maintainers know that link exists and could be causing issues. If you’ve linked something and there’s no problems at all? Feel free to ignore the `brew doctor` error.
 
diff --git a/share/doc/homebrew/Installation.md b/share/doc/homebrew/Installation.md
index 8c7892846..be9f7ca91 100644
--- a/share/doc/homebrew/Installation.md
+++ b/share/doc/homebrew/Installation.md
@@ -49,7 +49,7 @@ supported on a best-effort basis. For 10.4 and 10.5, see
 <a name="3"><sup>3</sup></a> Most formulae require a compiler. A handful
 require a full Xcode installation. You can install Xcode, the CLT, or both;
 Homebrew supports all three configurations. Downloading Xcode may require an
-Apple Developer account on older versions of OS X. Sign up for free
+Apple Developer account on older versions of Mac OS X. Sign up for free
 [here](https://developer.apple.com/register/index.action).
 
 <a name="4"><sup>4</sup></a> The one-liner installation method found on
diff --git a/share/doc/homebrew/Interesting-Taps-&-Forks.md b/share/doc/homebrew/Interesting-Taps-&-Forks.md
index 5a9c0d7ea..d23277b15 100644
--- a/share/doc/homebrew/Interesting-Taps-&-Forks.md
+++ b/share/doc/homebrew/Interesting-Taps-&-Forks.md
@@ -4,7 +4,7 @@ Homebrew has the capability to add (and remove) multiple taps to your local inst
 
 ## Main Taps
 
-*   [homebrew/apache](https://github.com/Homebrew/homebrew-apache): A tap for Apache modules, extending OS X's built-in Apache. These brews may require unconventional additional setup, as explained in the caveats.
+*   [homebrew/apache](https://github.com/Homebrew/homebrew-apache): A tap for Apache modules, extending macOS's built-in Apache. These brews may require unconventional additional setup, as explained in the caveats.
 
 *   [homebrew/boneyard](https://github.com/Homebrew/homebrew-boneyard): Formulae from other official taps, primarily (homebrew/core) are not deleted, they are moved here.
 
@@ -50,7 +50,7 @@ You can be added as a maintainer for one of the Homebrew organization taps and a
 
 *   [petere/postgresql](https://github.com/petere/homebrew-postgresql): Allows installing multiple PostgreSQL versions in parallel.
 
-*   [titanous/gnuradio](https://github.com/titanous/homebrew-gnuradio):  GNU Radio and friends running on OS X.
+*   [titanous/gnuradio](https://github.com/titanous/homebrew-gnuradio):  GNU Radio and friends running on macOS.
 
 ## Interesting Forks
 
diff --git a/share/doc/homebrew/Maintainer-Guidelines.md b/share/doc/homebrew/Maintainer-Guidelines.md
index 6ecf690db..d83118642 100644
--- a/share/doc/homebrew/Maintainer-Guidelines.md
+++ b/share/doc/homebrew/Maintainer-Guidelines.md
@@ -11,7 +11,7 @@ Maybe you were looking for the [Formula Cookbook](Formula-Cookbook.md)?
 This is all that really matters:
 - Ensure the name seems reasonable.
 - Add aliases.
-- Ensure it is not an unreasonable dupe of anything that comes with OS X.
+- Ensure it is not an unreasonable dupe of anything that comes with macOS.
 - Ensure it is not a library that can be installed with
   [gem](https://en.wikipedia.org/wiki/RubyGems),
   [cpan](https://en.wikipedia.org/wiki/Cpan) or
@@ -92,8 +92,8 @@ implemented!).
 
 ### Duplicates
 The main repository avoids duplicates as much as possible. The exception is
-libraries that OS X provides but have bugs, and the bugs are fixed in a
-newer version. Or libraries that OS X provides, but they are too old for
+libraries that macOS provides but have bugs, and the bugs are fixed in a
+newer version. Or libraries that macOS provides, but they are too old for
 some other formula. The rest should be in the `homebrew/dupes` tap.
 
 Still determine if it possible to avoid the duplicate. Be thorough. Duped
@@ -104,7 +104,7 @@ If it duplicates anything ask another maintainer first. Some dupes are okay,
 some can cause subtle issues we don’t want to have to deal with in the future.
 
 Dupes we have allowed:
--   `libxml` \<— OS X version is old and buggy
+-   `libxml` \<— macOS version is old and buggy
 -   `libpng` \<— Ditto
 
 #### Add comments
diff --git a/share/doc/homebrew/Prose-Style-Guidelines.md b/share/doc/homebrew/Prose-Style-Guidelines.md
index a06a628e7..8c4f1d1f0 100644
--- a/share/doc/homebrew/Prose-Style-Guidelines.md
+++ b/share/doc/homebrew/Prose-Style-Guidelines.md
@@ -75,7 +75,7 @@ We prefer:
  * When abbreviating, introduce the abbreviation with the first usage in any document
 * Some abbreviations (near-universally understood among our user base) are fine, though.
  * "Mac" is fine; "Macintosh" isn't necessary
-* "OS X", not "OSX" or "MacOS"
+* "macOS" for all versions, "OS X" or "Mac OS X" when describing specific older versions
 * "RuboCop", not "Rubocop"
 * A pull request is made "on" a repository; that repository is "at" a URL
 
diff --git a/share/doc/homebrew/Troubleshooting.md b/share/doc/homebrew/Troubleshooting.md
index 31682a7bf..4fc77d6cd 100644
--- a/share/doc/homebrew/Troubleshooting.md
+++ b/share/doc/homebrew/Troubleshooting.md
@@ -23,4 +23,4 @@ brew gist-logs <formula>
 0. Upload debugging information to a [Gist](https://gist.github.com):
   - If you had a formula error: run `brew gist-logs <formula>` (where `<formula>` is the name of the formula that failed to build).
   - If you encountered a non-formula bug: upload the output of `brew config` and `brew doctor` to a new [Gist](https://gist.github.com).
-1. [Create a new issue](https://github.com/Homebrew/homebrew-core/issues/new) titled "\<formula name> failed to build on 10.x", where `<formula name>` is the name of the formula that failed to build, and `10.x` is the version of OS X you are using and including the link output by `brew gist-logs`
+1. [Create a new issue](https://github.com/Homebrew/homebrew-core/issues/new) titled "\<formula name> failed to build on 10.x", where `<formula name>` is the name of the formula that failed to build, and `10.x` is the version of macOS you are using and including the link output by `brew gist-logs`
diff --git a/share/doc/homebrew/Xcode.md b/share/doc/homebrew/Xcode.md
index 9af12b6ab..98c5c6347 100644
--- a/share/doc/homebrew/Xcode.md
+++ b/share/doc/homebrew/Xcode.md
@@ -3,7 +3,7 @@
 Homebrew supports and recommends the latest Xcode and/or Command Line
 Tools available for your platform:
 
- OS X  | Xcode | Command Line Tools
+ macOS  | Xcode | Command Line Tools
  ----- | ----- | ----------------------------
  10.6  | 3.2.6 | N/A
  10.7  | 4.6.3 | April 2013
diff --git a/share/doc/homebrew/brew.1.html b/share/doc/homebrew/brew.1.html
index 25be33ef3..6948b3f93 100644
--- a/share/doc/homebrew/brew.1.html
+++ b/share/doc/homebrew/brew.1.html
@@ -1,7 +1,7 @@
 <div class='mp'>
 <h2 id="NAME">NAME</h2>
 <p class="man-name">
-  <code>brew</code> - <span class="man-whatis">The missing package manager for OS X</span>
+  <code>brew</code> - <span class="man-whatis">The missing package manager for macOS</span>
 </p>
 
 <h2 id="SYNOPSIS">SYNOPSIS</h2>
@@ -12,7 +12,7 @@
 <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
 <p>Homebrew is the easiest and most flexible way to install the UNIX tools Apple
-didn't include with OS X.</p>
+didn't include with macOS.</p>
 
 <h2 id="ESSENTIAL-COMMANDS">ESSENTIAL COMMANDS</h2>
 
@@ -128,7 +128,7 @@ checksum of a previously cached version no longer matches.</p>
 bottle.</p>
 
 <p>If <code>--force-bottle</code> is passed, download a bottle if it exists for the current
-version of OS X, even if it would not be used during installation.</p></dd>
+version of macOS, even if it would not be used during installation.</p></dd>
 <dt><code>gist-logs</code> [<code>--new-issue</code>|<code>-n</code>] <var>formula</var></dt><dd><p>Upload logs for a failed build of <var>formula</var> to a new Gist.</p>
 
 <p><var>formula</var> is usually the name of the formula to install, but it can be specified
@@ -217,7 +217,7 @@ be linked or which would be deleted by <code>brew link --overwrite</code>, but w
 actually link or delete any files.</p>
 
 <p>If <code>--force</code> is passed, Homebrew will allow keg-only formulae to be linked.</p></dd>
-<dt><code>linkapps</code> [<code>--local</code>] [<var>formulae</var>]</dt><dd><p>Find installed formulae that provide <code>.app</code>-style OS X apps and symlink them
+<dt><code>linkapps</code> [<code>--local</code>] [<var>formulae</var>]</dt><dd><p>Find installed formulae that provide <code>.app</code>-style macOS apps and symlink them
 into <code>/Applications</code>, allowing for easier access.</p>
 
 <p>If no <var>formulae</var> are provided, all of them will have their apps symlinked.</p>
@@ -462,7 +462,7 @@ name of the file or formula being audited, to make the output easy to grep.</p>
 
 <p><code>audit</code> exits with a non-zero status if any errors are found. This is useful,
 for instance, for implementing pre-commit hooks.</p></dd>
-<dt><code>bottle</code> [<code>--verbose</code>] [<code>--no-rebuild</code>] [<code>--keep-old</code>] [<code>--skip-relocation</code>] [<code>--root-url=&lt;root_url></code>]:</dt><dd><p></p></dd>
+<dt><code>bottle</code> [<code>--verbose</code>] [<code>--no-rebuild</code>] [<code>--keep-old</code>] [<code>--skip-relocation</code>] [<code>--root-url=&lt;root_url></code>] [<code>--force-core-tap</code>]:</dt><dd><p></p></dd>
 <dt><code>bottle</code> <code>--merge</code> [<code>--no-commit</code>] [<code>--keep-old</code>] [<code>--write</code>]:</dt><dd><p></p>
 
 <p>Generate a bottle (binary package) from a formula installed with
@@ -696,7 +696,7 @@ a Homebrew-built Subversion if installed, or the system-provided binary.</p>
 <p>Set this to force Homebrew to use a particular <code>svn</code> binary.</p></dd>
 <dt><code>HOMEBREW_TEMP</code></dt><dd><p>If set, instructs Homebrew to use <code>HOMEBREW_TEMP</code> as the temporary directory
 for building packages. This may be needed if your system temp directory and
-Homebrew Prefix are on different volumes, as OS X has trouble moving
+Homebrew Prefix are on different volumes, as macOS has trouble moving
 symlinks across volumes when the target does not yet exist.</p>
 
 <p>This issue typically occurs when using FileVault or custom SSD