Merge pull request #5824 from github/repo-sync

repo sync

Author: Octomerger

content/developers/overview/using-ssh-agent-forwarding.md

@@ -149,7 +149,7 @@ $ ssh-add <em>yourkey</em>
 
 {% tip %}
 
-On Mac OS X, `ssh-agent` will "forget" this key, once it gets restarted during reboots. But you can import your SSH keys into Keychain using this command:
+On macOS, `ssh-agent` will "forget" this key, once it gets restarted during reboots. But you can import your SSH keys into Keychain using this command:
 
 ```shell
 $ ssh-add -K <em>yourkey</em>

content/github/authenticating-to-github/checking-for-existing-gpg-keys.md

@@ -15,7 +15,7 @@ topics:
 
 {% note %}
 
-**Note:** GPG does not come installed by default on OS X or Windows. To install GPG command line tools, see [GnuPG's Download page](https://www.gnupg.org/download/).
+**Note:** GPG does not come installed by default on macOS or Windows. To install GPG command line tools, see [GnuPG's Download page](https://www.gnupg.org/download/).
 
 {% endnote %}
 

content/github/authenticating-to-github/recovering-your-ssh-key-passphrase.md

@@ -15,7 +15,7 @@ topics:
 
 {% mac %}
 
-If you [configured your SSH passphrase with the OS X Keychain](/articles/working-with-ssh-key-passphrases#saving-your-passphrase-in-the-keychain), you may be able to recover it.
+If you [configured your SSH passphrase with the macOS keychain](/articles/working-with-ssh-key-passphrases#saving-your-passphrase-in-the-keychain), you may be able to recover it.
 
 1. In Finder, search for the **Keychain Access** app.
    ![Spotlight Search bar](/assets/images/help/setup/keychain-access.png)

content/github/authenticating-to-github/working-with-ssh-key-passphrases.md

@@ -89,7 +89,7 @@ The `ssh-agent` process will continue to run until you log out, shut down your c
 
 ### Saving your passphrase in the keychain
 
-On OS X Leopard through OS X El Capitan, these default private key files are handled automatically:
+On Mac OS X Leopard through OS X El Capitan, these default private key files are handled automatically:
 
 - *.ssh/id_rsa*
 - *.ssh/identity*

content/github/getting-started-with-github/configuring-git-to-handle-line-endings.md

@@ -15,7 +15,7 @@ versions:
 
 Every time you press <kbd>return</kbd> on your keyboard you insert an invisible character called a line ending. Different operating systems handle line endings differently.
 
-When you're collaborating on projects with Git and {% data variables.product.product_name %}, Git might produce unexpected results if, for example, you're working on a Windows machine, and your collaborator has made a change in OS X.
+When you're collaborating on projects with Git and {% data variables.product.product_name %}, Git might produce unexpected results if, for example, you're working on a Windows machine, and your collaborator has made a change in macOS.
 
 You can configure Git to handle line endings automatically so you can collaborate effectively with people who use different operating systems.
 
@@ -25,11 +25,11 @@ The `git config core.autocrlf` command is used to change how Git handles line en
 
 {% mac %}
 
-On OS X, you simply pass `input` to the configuration. For example:
+On macOS, you simply pass `input` to the configuration. For example:
 
 ```shell
 $ git config --global core.autocrlf input
-# Configure Git to ensure line endings in files you checkout are correct for OS X
+# Configure Git to ensure line endings in files you checkout are correct for macOS
 ```
 
 {% endmac %}