diff --git a/content/about/features.md b/content/about/features.md
index 437308578..7b3c34611 100644
--- a/content/about/features.md
+++ b/content/about/features.md
@@ -14,7 +14,7 @@ toc: true
 ## General
 
 * [Extremely fast][] build times (< .7 ms per page)
-* Completely cross platform, with [easy installation][install] on Mac OSX, Linux, Windows, and more
+* Completely cross platform, with [easy installation][install] on macOS, Linux, Windows, and more
 * Renders changes on the fly with [LiveReload][] as you develop
 * [Powerful theming][]
 * [Host your site anywhere][hostanywhere]
diff --git a/content/contribute/development.md b/content/contribute/development.md
index 17c20ab00..d4a2ef2bf 100644
--- a/content/contribute/development.md
+++ b/content/contribute/development.md
@@ -61,7 +61,7 @@ You can print the `GOPATH` with `echo $GOPATH`. You should see a non-empty strin
 
 ### Installing Go with Homebrew
 
-If you are a Mac OSX user and have [Homebrew](https://brew.sh/) installed on your machine, installing Go is as simple as the following command:
+If you are a macOS user and have [Homebrew](https://brew.sh/) installed on your machine, installing Go is as simple as the following command:
 
 {{% code file="install-go.sh" %}}
 ```bash
diff --git a/content/getting-started/installing.md b/content/getting-started/installing.md
index 9784b71a3..cc95ef23c 100644
--- a/content/getting-started/installing.md
+++ b/content/getting-started/installing.md
@@ -1,13 +1,13 @@
 ---
 title: Install Hugo
 linktitle: Install Hugo
-description: Install Hugo on Mac OSX, Windows, Linux, FreeBSD, and on any machine where the Go compiler tool chain can run.
+description: Install Hugo on macOS, Windows, Linux, FreeBSD, and on any machine where the Go compiler tool chain can run.
 date: 2016-11-01
 publishdate: 2016-11-01
 lastmod: 2017-02-20
 categories: [getting started]
 authors: ["Michael Henderson"]
-tags: [install,fundamentals,pc,windows,linux,mac,osx,binary,tarball]
+tags: [install,fundamentals,pc,windows,linux,macos,binary,tarball]
 weight: 30
 draft: false
 aliases: [/tutorials/installing-on-windows/,/tutorials/installing-on-mac/,/overview/installing/,/getting-started/install,/install/]
@@ -18,7 +18,7 @@ Hugo is written in [Golang](https://golang.org/) with support for multiple platf
 
 Hugo currently provides pre-built binaries for the following:
 
-* <i class="icon-apple"></i> OS X (Darwin) for x64, i386, and ARM architectures
+* <i class="icon-apple"></i> macOS (Darwin) for x64, i386, and ARM architectures
 * <i class="icon-windows"></i> Windows
 * <i class="icon-linux"></i> Linux
 * <i class="icon-freebsd"></i> FreeBSD
@@ -33,9 +33,9 @@ Download the appropriate version for your platform from [Hugo Releases][releases
 
 Ideally, you should install it somewhere in your `PATH` for easy use. `/usr/local/bin` is the most probable location.
 
-### OS X (Homebrew)
+### macOS (Homebrew)
 
-If you are on OS X and using [Homebrew][brew], you can install Hugo with the following one-liner:
+If you are on macOS and using [Homebrew][brew], you can install Hugo with the following one-liner:
 
 {{% code file="install-with-homebrew.sh" %}}
 ```bash
@@ -43,7 +43,7 @@ brew update && brew install hugo
 ```
 {{% /code %}}
 
-For more detailed explanations, read the installation guides that follow for installing on Mac OS X and Windows.
+For more detailed explanations, read the installation guides that follow for installing on macOS and Windows.
 
 ### Windows (Chocolatey)
 
@@ -80,7 +80,7 @@ You may run `go get` with the `-u` option to update Hugo's dependencies:
 go get -u -v github.com/spf13/hugo
 ```
 
-## <i class="icon-apple"></i>OS X
+## <i class="icon-apple"></i>macOS
 
 ### Assumptions
 
diff --git a/content/troubleshooting/accented-characters-in-urls.md b/content/troubleshooting/accented-characters-in-urls.md
index 7bc2eeab7..666e4fb0c 100644
--- a/content/troubleshooting/accented-characters-in-urls.md
+++ b/content/troubleshooting/accented-characters-in-urls.md
@@ -26,7 +26,7 @@ toc: true
 
 ## Solution
 
-Are you a Mac OS X user? If so, you are likely a victim of HFS Plus file system's insistence to store the "é" (U+00E9) character in Normal Form Decomposed (NFD) mode, i.e. as "e" + "  ́" (U+0065 U+0301).
+Are you a macOS user? If so, you are likely a victim of HFS Plus file system's insistence to store the "é" (U+00E9) character in Normal Form Decomposed (NFD) mode, i.e. as "e" + "  ́" (U+0065 U+0301).
 
 `le-carr%C3%A9` is actually correct, `%C3%A9` being the UTF-8 version of U+00E9 as expected by the web server. The problem is that OS X turns [U+00E9] into [U+0065 U+0301], and thus `le-carr%C3%A9` no longer works.  Instead, only `le-carre%CC%81` ending with `e%CC%81` would match that [U+0065 U+0301] at the end.