Merge branch 'main' into repo-sync

Author: Octomerger

.devcontainer/devcontainer.json

@@ -32,12 +32,5 @@
 	"postCreateCommand": "npm ci && npm run build",
 
 	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
-	"remoteUser": "node",
-
-	// Test hostRequirements setting for machine types - currently undocumented
-	"hostRequirements": {
-		"cpus": 8,
-		"memory": "8gb", // otherwise is bytes - allows for other units like mb, or k
-		"storage": "32gb" // otherwise is bytes - allows for other units like tb, or mb, or k
-	}
+	"remoteUser": "node"
 }

content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications.md

@@ -147,7 +147,8 @@ Email notifications from {% data variables.product.product_location %} contain t
     - There are updates in repositories or team discussions you're watching or in a conversation you're participating in. For more information, see "[About participating and watching notifications](#about-participating-and-watching-notifications)."
     - You gain access to a new repository or you've joined a new team. For more information, see "[Automatic watching](#automatic-watching)."{% ifversion fpt or ghes or ghae-issue-4864 or ghec %}
     - There are new {% data variables.product.prodname_dependabot_alerts %} in your repository. For more information, see "[{% data variables.product.prodname_dependabot_alerts %} notification options](#dependabot-alerts-notification-options)." {% endif %} {% ifversion fpt or ghec %}
-    - There are workflow runs updates on repositories set up with {% data variables.product.prodname_actions %}. For more information, see "[{% data variables.product.prodname_actions %} notification options](#github-actions-notification-options)."{% endif %}
+    - There are workflow runs updates on repositories set up with {% data variables.product.prodname_actions %}. For more information, see "[{% data variables.product.prodname_actions %} notification options](#github-actions-notification-options)."{% endif %}{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5668 %}
+    - There are new deploy keys added to repositories that belong to organizations that you're an owner of. For more information, see "[Organization alerts notification options](#organization-alerts-notification-options)."{% endif %}
 
 ## Automatic watching
 
@@ -218,6 +219,13 @@ Choose how you want to receive workflow run updates for repositories that you ar
 
 {% endif %}
 
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5668 %}
+## Organization alerts notification options 
+
+If you're an organization owner, you'll receive email notifications by default when organization members add new deploy keys to repositories within the organization. You can unsubscribe from these notifications. On the notification settings page, under "Organization alerts", unselect **Email**. 
+
+{% endif %}
+
 {% ifversion fpt or ghes or ghec %}
 ## Managing your notification settings with {% data variables.product.prodname_mobile %}
 

content/authentication/keeping-your-account-and-data-secure/reviewing-your-deploy-keys.md

@@ -23,3 +23,6 @@ shortTitle: Deploy keys
 	![Deploy key list](/assets/images/help/settings/settings-deploy-key-review.png)
 
 For more information, see "[Managing deploy keys](/guides/managing-deploy-keys)."
+
+## Further reading
+- [Configuring notifications](/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications#organization-alerts-notification-options)

content/developers/overview/managing-deploy-keys.md

@@ -185,3 +185,7 @@ This means that you cannot automate the creation of accounts. But if you want to
 [collaborator]: /articles/inviting-collaborators-to-a-personal-repository
 [outside-collaborator]: /articles/adding-outside-collaborators-to-repositories-in-your-organization
 [team]: /articles/adding-organization-members-to-a-team
+
+## Further reading
+- [Configuring notifications](/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications#organization-alerts-notification-options)
+