From 40e0016403de9798c951118cd01fd7cf165d3b90 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Sun, 23 Sep 2018 16:12:53 +0200 Subject: [PATCH] Rename OS X to macOS in the documentation macOS is the official name since the release of macOS 10.12 (Sierra). --- CONTRIBUTING.md | 2 +- doc/020_installation.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e38500fb3..54d35590d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -174,7 +174,7 @@ locally as a pre-commit hook checks formatting before committing automatically, just copy this script to `.git/hooks/pre-commit`. For each pull request, several different systems run the integration tests on -Linux, OS X and Windows. We won't merge any code that does not pass all tests +Linux, macOS and Windows. We won't merge any code that does not pass all tests for all systems, so when a tests fails, try to find out what's wrong and fix it. If you need help on this, please leave a comment in the pull request, and we'll be glad to assist. Having a PR with failing integration tests is nothing diff --git a/doc/020_installation.rst b/doc/020_installation.rst index 03afd0603..93285d5c0 100644 --- a/doc/020_installation.rst +++ b/doc/020_installation.rst @@ -71,7 +71,7 @@ avoid any conflicts: macOS ===== -If you are using Mac OS X, you can install restic using the +If you are using macOS, you can install restic using the `homebrew `__ package manager: .. code-block:: console