[nongnu] elpa/git-commit 1c16b99ba4 3/3: Update name of Apple's OS

[ELPA Syncer]

branch: elpa/git-commit
commit 1c16b99ba47c8ccd04ac41fccf1853e746d4fd70
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>

    Update name of Apple's OS
---
 docs/magit.org     | 2 +-
 docs/magit.texi    | 8 ++++----
 lisp/magit-diff.el | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/magit.org b/docs/magit.org
index a2b4a99493..1f554189c9 100644
--- a/docs/magit.org
+++ b/docs/magit.org
@@ -8891,7 +8891,7 @@ can push on the command line.
 Detailed setup instructions can be found at
 https://github.com/magit/magit/wiki/Pushing-with-Magit-from-Windows.
 
-*** I am using OS X and SOMETHING works in shell, but not in Magit
+*** I am using macOS and SOMETHING works in shell, but not in Magit
 
 This usually occurs because Emacs doesn't have the same environment
 variables as your shell.  Try installing and configuring
diff --git a/docs/magit.texi b/docs/magit.texi
index 464900a4ec..24b4432d63 100644
--- a/docs/magit.texi
+++ b/docs/magit.texi
@@ -338,7 +338,7 @@ FAQ - Issues and Errors
 * I changed several thousand files at once and now Magit is unusable::
 * I am having problems committing::
 * I am using MS Windows and cannot push with Magit::
-* I am using OS X and SOMETHING works in shell, but not in Magit: I am using 
OS X and SOMETHING works in shell but not in Magit. 
+* I am using macOS and SOMETHING works in shell, but not in Magit: I am using 
macOS and SOMETHING works in shell but not in Magit. 
 * Expanding a file to show the diff causes it to disappear::
 * Point is wrong in the @code{COMMIT_EDITMSG} buffer::
 * The mode-line information isn't always up-to-date::
@@ -10830,7 +10830,7 @@ the value of @code{vc-handled-backends}.
 * I changed several thousand files at once and now Magit is unusable::
 * I am having problems committing::
 * I am using MS Windows and cannot push with Magit::
-* I am using OS X and SOMETHING works in shell, but not in Magit: I am using 
OS X and SOMETHING works in shell but not in Magit. 
+* I am using macOS and SOMETHING works in shell, but not in Magit: I am using 
macOS and SOMETHING works in shell but not in Magit. 
 * Expanding a file to show the diff causes it to disappear::
 * Point is wrong in the @code{COMMIT_EDITMSG} buffer::
 * The mode-line information isn't always up-to-date::
@@ -10875,8 +10875,8 @@ can push on the command line.
 Detailed setup instructions can be found at
 @uref{https://github.com/magit/magit/wiki/Pushing-with-Magit-from-Windows}.
 
-@node I am using OS X and SOMETHING works in shell but not in Magit
-@appendixsubsec I am using OS X and SOMETHING works in shell, but not in Magit
+@node I am using macOS and SOMETHING works in shell but not in Magit
+@appendixsubsec I am using macOS and SOMETHING works in shell, but not in Magit
 
 This usually occurs because Emacs doesn't have the same environment
 variables as your shell.  Try installing and configuring
diff --git a/lisp/magit-diff.el b/lisp/magit-diff.el
index ebaf303dd7..9dbfd3f666 100644
--- a/lisp/magit-diff.el
+++ b/lisp/magit-diff.el
@@ -437,7 +437,7 @@ image, accordingly.  Either the car or the cdr may be nil."
   "Whether to work around a bug which affects display of gravatars.
 
 Gravatar images are spliced into two halves which are then
-displayed on separate lines.  On OS X the splicing has a bug in
+displayed on separate lines.  On macOS the splicing has a bug in
 some Emacs builds, which causes the top and bottom halves to be
 interchanged.  Enabling this option works around this issue by
 interchanging the halves once more, which cancels out the effect