Merge pull request #2005 from Calinou/doc-osx-to-macos

Rename OS X to macOS in the documentation
This commit is contained in:
Alexander Neumann 2018-09-25 13:21:28 +02:00
commit 5f8658238c
2 changed files with 2 additions and 2 deletions

View File

@ -174,7 +174,7 @@ locally as a pre-commit hook checks formatting before committing automatically,
just copy this script to `.git/hooks/pre-commit`. just copy this script to `.git/hooks/pre-commit`.
For each pull request, several different systems run the integration tests on 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 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 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 we'll be glad to assist. Having a PR with failing integration tests is nothing

View File

@ -71,7 +71,7 @@ avoid any conflicts:
macOS 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 <http://brew.sh/>`__ package manager: `homebrew <http://brew.sh/>`__ package manager:
.. code-block:: console .. code-block:: console