diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8499e901ff..43f7a9e4be 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,7 +2,7 @@
Thank you for investing your time in contributing to our project! Any contribution you make will be reflected on [docs.github.com](https://docs.github.com/en) :sparkles:.
-Read our [Code of Coduct](./CODE_OF_CONDUCT.md) to keep our community approachable and respectable.
+Read our [Code of Conduct](./CODE_OF_CONDUCT.md) to keep our community approachable and respectable.
In this guide you will get an overview of the contribution workflow from opening an issue, creating a PR, reviewing, and merging the PR.
@@ -10,7 +10,7 @@ Use the table of contents icon 
3.1 or ghae-next %}gho_16C7e42F292c6912E7710c838347Ae178B4a{% else %}e72e16c7e42f292c6912e7710c838347ae178b4a{% endif %}&token_type=bearer
+```
+access_token={% ifversion fpt or ghes > 3.1 or ghae-next %}gho_16C7e42F292c6912E7710c838347Ae178B4a{% else %}e72e16c7e42f292c6912e7710c838347ae178b4a{% endif %}&scope=repo%2Cgist&token_type=bearer
+```
-You can also receive the content in different formats depending on the Accept
-header:
+{% data reusables.apps.oauth-auth-vary-response %}
- Accept: application/json
- {"access_token":"{% ifversion fpt or ghes > 3.1 or ghae-next %}gho_16C7e42F292c6912E7710c838347Ae178B4a{% else %}e72e16c7e42f292c6912e7710c838347ae178b4a{% endif %}", "scope":"repo,gist", "token_type":"bearer"}
+```json
+Accept: application/json
+{
+ "access_token":"{% ifversion fpt or ghes > 3.1 or ghae-next %}gho_16C7e42F292c6912E7710c838347Ae178B4a{% else %}e72e16c7e42f292c6912e7710c838347ae178b4a{% endif %}",
+ "scope":"repo,gist",
+ "token_type":"bearer"
+}
+```
- Accept: application/xml
-
- bearer
- repo,gist
- {% ifversion fpt or ghes > 3.1 or ghae-next %}gho_16C7e42F292c6912E7710c838347Ae178B4a{% else %}e72e16c7e42f292c6912e7710c838347ae178b4a{% endif %}
-
+```xml
+Accept: application/xml
+
+ bearer
+ repo,gist
+ {% ifversion fpt or ghes > 3.1 or ghae-next %}gho_16C7e42F292c6912E7710c838347Ae178B4a{% else %}e72e16c7e42f292c6912e7710c838347ae178b4a{% endif %}
+
+```
### 3. Use the access token to access the API
@@ -138,27 +147,35 @@ Name | Type | Description
#### Response
-{% ifversion fpt %}
- ```JSON
- {
- "device_code": "3584d83530557fdd1f46af8289938c8ef79f9dc5",
- "user_code": "WDJB-MJHT",
- "verification_uri": "https://github.com/login/device",
- "expires_in": 900,
- "interval": 5
- }
- ```
-{% else %}
- ```JSON
- {
- "device_code": "3584d83530557fdd1f46af8289938c8ef79f9dc5",
- "user_code": "WDJB-MJHT",
- "verification_uri": "http(s)://[hostname]/login/device",
- "expires_in": 900,
- "interval": 5
- }
- ```
-{% endif %}
+By default, the response takes the following form:
+
+```
+device_code=3584d83530557fdd1f46af8289938c8ef79f9dc5&expires_in=900&interval=5&user_code=WDJB-MJHT&verification_uri=https%3A%2F%{% data variables.product.product_url %}%2Flogin%2Fdevice
+```
+
+{% data reusables.apps.oauth-auth-vary-response %}
+
+```json
+Accept: application/json
+{
+ "device_code": "3584d83530557fdd1f46af8289938c8ef79f9dc5",
+ "user_code": "WDJB-MJHT",
+ "verification_uri": "{% data variables.product.oauth_host_code %}/login/device",
+ "expires_in": 900,
+ "interval": 5
+}
+```
+
+```xml
+Accept: application/xml
+
+ 3584d83530557fdd1f46af8289938c8ef79f9dc5
+ WDJB-MJHT
+ {% data variables.product.oauth_host_code %}/login/device
+ 900
+ 5
+
+```
#### Response parameters
@@ -196,14 +213,32 @@ Name | Type | Description
#### Response
+By default, the response takes the following form:
+
+```
+access_token={% ifversion fpt or ghes > 3.1 or ghae-next %}gho_16C7e42F292c6912E7710c838347Ae178B4a{% else %}e72e16c7e42f292c6912e7710c838347ae178b4a{% endif %}&token_type=bearer&scope=repo%2Cgist
+```
+
+{% data reusables.apps.oauth-auth-vary-response %}
+
```json
+Accept: application/json
{
"access_token": "{% ifversion fpt or ghes > 3.1 or ghae-next %}gho_16C7e42F292c6912E7710c838347Ae178B4a{% else %}e72e16c7e42f292c6912e7710c838347ae178b4a{% endif %}",
"token_type": "bearer",
- "scope": "user"
+ "scope": "repo,gist"
}
```
+```xml
+Accept: application/xml
+
+ {% ifversion fpt or ghes > 3.1 or ghae-next %}gho_16C7e42F292c6912E7710c838347Ae178B4a{% else %}e72e16c7e42f292c6912e7710c838347ae178b4a{% endif %}
+ bearer
+ gist,repo
+
+```
+
### Rate limits for the device flow
When a user submits the verification code on the browser, there is a rate limit of 50 submissions in an hour per application.
diff --git a/content/get-started/getting-started-with-git/associating-text-editors-with-git.md b/content/get-started/getting-started-with-git/associating-text-editors-with-git.md
index d27042af7b..82fb135e9d 100644
--- a/content/get-started/getting-started-with-git/associating-text-editors-with-git.md
+++ b/content/get-started/getting-started-with-git/associating-text-editors-with-git.md
@@ -60,6 +60,7 @@ shortTitle: Associate text editors
## Using Atom as your editor
1. Install [Atom](https://atom.io/). For more information, see "[Installing Atom](https://flight-manual.atom.io/getting-started/sections/installing-atom/)" in the Atom documentation.
+{% data reusables.command_line.open_the_multi_os_terminal %}
3. Type this command:
```shell
$ git config --global core.editor "atom --wait"
diff --git a/content/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md b/content/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md
index 5a0979aed5..84e3c40071 100644
--- a/content/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md
+++ b/content/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md
@@ -23,16 +23,7 @@ If your enterprise is uses {% data variables.product.prodname_emus %}, your memb
{% data reusables.saml.about-linked-identities %}
-If your enterprise is uses {% data variables.product.prodname_emus %}, you will not be able to deprovision or remove user accounts from the enterprise on {% data variables.product.product_name %}. Any changes you need to make to your enterprise's {% data variables.product.prodname_managed_users %} should be made through your IdP.
-
-{% warning %}
-
-**Warning:** For organizations using SCIM:
-- Revoking a linked user identity on {% data variables.product.product_name %} will also remove the SAML and SCIM metadata. As a result, the identity provider will not be able to synchronize or deprovision the linked user identity.
-- An admin must revoke a linked identity through the identity provider.
-- To revoke a linked identity and link a different account through the identity provider, an admin can remove and re-assign the user to the {% data variables.product.product_name %} application. For more information, see your identity provider's docs.
-
-{% endwarning %}
+If your enterprise uses {% data variables.product.prodname_emus %}, you will not be able to deprovision or remove user accounts from the enterprise on {% data variables.product.product_name %}. Any changes you need to make to your enterprise's {% data variables.product.prodname_managed_users %} should be made through your IdP.
{% data reusables.identity-and-permissions.revoking-identity-team-sync %}
diff --git a/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md b/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md
index 241f12b23d..6fac15b475 100644
--- a/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md
+++ b/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md
@@ -23,7 +23,19 @@ You can view and revoke each member's linked identity, active sessions, and auth
## Viewing and revoking a linked identity
-{% data reusables.saml.about-linked-identities %}
+{% data reusables.saml.about-linked-identities %}
+
+When available, the entry will include SCIM data. For more information, see "[About SCIM](/organizations/managing-saml-single-sign-on-for-your-organization/about-scim)."
+
+{% warning %}
+
+**Warning:** For organizations using SCIM:
+- Revoking a linked user identity on {% data variables.product.product_name %} will also remove the SAML and SCIM metadata. As a result, the identity provider will not be able to synchronize or deprovision the linked user identity.
+- An admin must revoke a linked identity through the identity provider.
+- To revoke a linked identity and link a different account through the identity provider, an admin can remove and re-assign the user to the {% data variables.product.product_name %} application. For more information, see your identity provider's documentation.
+
+{% endwarning %}
+
{% data reusables.identity-and-permissions.revoking-identity-team-sync %}
diff --git a/content/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization.md b/content/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization.md
index dc490fdbb9..8733b1d3cb 100644
--- a/content/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization.md
+++ b/content/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization.md
@@ -49,6 +49,8 @@ To search for specific events, use the `action` qualifier in your query. Actions
| [`enterprise`](#enterprise-category-actions) | Contains activities related to enterprise settings. | {% endif %}
| [`hook`](#hook-category-actions) | Contains all activities related to webhooks.
| [`integration_installation_request`](#integration_installation_request-category-actions) | Contains all activities related to organization member requests for owners to approve integrations for use in the organization. |
+| [`ip_allow_list`](#ip_allow_list) | Contains activitites related to enabling or disabling the IP allow list for an organization.
+| [`ip_allow_list_entry`](#ip_allow_list_entry) | Contains activities related to the creation, deletion, and editing of an IP allow list entry for an organization.
| [`issue`](#issue-category-actions) | Contains activities related to deleting an issue. {% ifversion fpt %}
| [`marketplace_agreement_signature`](#marketplace_agreement_signature-category-actions) | Contains all activities related to signing the {% data variables.product.prodname_marketplace %} Developer Agreement.
| [`marketplace_listing`](#marketplace_listing-category-actions) | Contains all activities related to listing apps in {% data variables.product.prodname_marketplace %}.{% endif %}{% ifversion fpt or ghes > 3.0 %}
@@ -335,6 +337,23 @@ An overview of some of the most common actions that are recorded as events in th
| `create` | Triggered when an organization member requests that an organization owner install an integration for use in the organization.
| `close` | Triggered when a request to install an integration for use in an organization is either approved or denied by an organization owner, or canceled by the organization member who opened the request.
+### `ip_allow_list` category actions
+
+| Action | Description
+|------------------|-------------------
+| `enable` | Triggered when an IP allow list was enabled for an organization.
+| `disable` | Triggered when an IP allow list was disabled for an organization.
+| `enable_for_installed_apps` | Triggered when an IP allow list was enabled for installed {% data variables.product.prodname_github_apps %}.
+| `disable_for_installed_apps` | Triggered when an IP allow list was disabled for installed {% data variables.product.prodname_github_apps %}.
+
+### `ip_allow_list_entry` category actions
+
+| Action | Description
+|------------------|-------------------
+| `create` | Triggered when an IP address was added to an IP allow list.
+| `update` | Triggered when an IP address or its description was changed.
+| `destroy` | Triggered when an IP address was deleted from an IP allow list.
+
### `issue` category actions
| Action | Description
diff --git a/content/repositories/archiving-a-github-repository/backing-up-a-repository.md b/content/repositories/archiving-a-github-repository/backing-up-a-repository.md
index 8346b22105..b20d4b0156 100644
--- a/content/repositories/archiving-a-github-repository/backing-up-a-repository.md
+++ b/content/repositories/archiving-a-github-repository/backing-up-a-repository.md
@@ -35,7 +35,7 @@ When you clone a repository or wiki, only Git data, such as project files and co
- [Projects](/rest/reference/projects#list-repository-projects)
{% endif %}
-Once you have {% ifversion ghes or ghae %}a local version of all the content you want to back up, you can create a zip archive and {% else %}downloaded your archive, you can {% endif %}copy it to an external hard drive and/or upload it to a cloud-based backup service such as [Google Drive](https://www.google.com/drive/) or [Dropbox](https://www.dropbox.com/).
+Once you have {% ifversion ghes or ghae %}a local version of all the content you want to back up, you can create a zip archive and {% else %}downloaded your archive, you can {% endif %}copy it to an external hard drive and/or upload it to a cloud-based backup or storage service such as [Azure Blob Storage](https://docs.microsoft.com/en-us/azure/storage/blobs/storage-blobs-overview/), [Google Drive](https://www.google.com/drive/) or [Dropbox](https://www.dropbox.com/).
{% ifversion fpt %}
## Third-party backup tools
diff --git a/data/reusables/apps/oauth-auth-vary-response.md b/data/reusables/apps/oauth-auth-vary-response.md
new file mode 100644
index 0000000000..b76fef614b
--- /dev/null
+++ b/data/reusables/apps/oauth-auth-vary-response.md
@@ -0,0 +1 @@
+You can also receive the response in different formats if you provide the format in the `Accept` header. For example, `Accept: application/json` or `Accept: application/xml`:
diff --git a/data/reusables/saml/about-linked-identities.md b/data/reusables/saml/about-linked-identities.md
index f879d16402..25747fe629 100644
--- a/data/reusables/saml/about-linked-identities.md
+++ b/data/reusables/saml/about-linked-identities.md
@@ -1,3 +1,3 @@
-You can view the single sign-on identity that a member has linked to their {% data variables.product.product_name %} account. When available, the entry will include SCIM data. For more information, see "[About SCIM](/organizations/managing-saml-single-sign-on-for-your-organization/about-scim)."
+You can view the single sign-on identity that a member has linked to their {% data variables.product.product_name %} account.
If a member links the wrong identity to their {% data variables.product.product_name %} account, you can revoke the linked identity to allow the member to try again.