Merge branch 'main' of github.com:github/docs-internal into update-new-site-tree-deps

Author: sarahs

content/actions/guides/about-continuous-integration.md

@@ -53,6 +53,7 @@ For a definition of common terms, see "[Core concepts for {% data variables.prod
 
 Browse the complete list of CI workflow templates offered by {% data variables.product.product_name %} in the {% if currentVersion == "free-pro-team@latest" %}[actions/starter-workflows](https://github.com/actions/starter-workflows/tree/main/ci) repository{% else %} `actions/starter-workflows` repository on {% data variables.product.product_location %}{% endif %}.
 
+{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" or currentVersion == "github-ae@next" %}
 ### Skipping workflow runs
 
 If you want to temporarily prevent a workflow from being triggered, you can add a skip instruction to the commit message. Workflows that would otherwise be triggered `on: push` or `on: pull_request`, won't be triggered if you add any any of the following strings to the commit message in a push, or the HEAD commit of a pull request:
@@ -72,6 +73,7 @@ You won't be able to merge the pull request if your repository is configured to
 **Note:** Skip instructions only apply to the `push` and `pull_request` events. For example, adding `[skip ci]` to a commit message won't stop a workflow that's triggered `on: pull_request_target` from running.
 
 {% endnote %}
+{% endif %}
 
 ### Notifications for workflow runs
 

content/admin/configuration/about-enterprise-configuration.md

@@ -17,9 +17,7 @@ topics:
 {% endif %}
 
 {% if currentVersion == "github-ae@latest" %}
-The first time you access your enterprise, you will complete an initial configuration to get {% data variables.product.product_name %} ready to use. The initial configuration includes connecting your enterprise with an idP, authenticating with SAML SSO, and configuring policies for repositories and organizations in your enterprise. For more information, see "[Initializing {% data variables.product.prodname_ghe_managed %}](/admin/configuration/initializing-github-ae)."
-
-For users to receive any emails from {% data variables.product.product_name %} after the initial configuration, you must ask {% data variables.contact.github_support %} to configure outbound email support with your SMTP server. For more information, see "[Configuring email for notifications](/admin/configuration/configuring-email-for-notifications)."
+The first time you access your enterprise, you will complete an initial configuration to get {% data variables.product.product_name %} ready to use. The initial configuration includes connecting your enterprise with an identity provider (IdP), authenticating with SAML SSO, configuring policies for repositories and organizations in your enterprise, and configuring SMTP for outbound email. For more information, see "[Initializing {% data variables.product.prodname_ghe_managed %}](/admin/configuration/initializing-github-ae)."
 
 Later, you can use the site admin dashboard and enterprise settings to further configure your enterprise, manage users, organizations and repositories, and set policies that reduce risk and increase quality. 
 
@@ -29,4 +27,4 @@ All enterprises are configured with subdomain isolation and support for TLS 1.2
 ### Further reading
 
 - "[Managing users, organizations, and repositories](/admin/user-management)"
-- "[Setting policies for your enterprise](/admin/policies)"
+- "[Setting policies for your enterprise](/admin/policies)"

content/admin/configuration/initializing-github-ae.md

@@ -103,11 +103,11 @@ Once this is initialized, you can reconfigure any settings after the initializat
  settings to allow incoming emails](/admin/configuration/configuring-email-for-notifications#configuring-dns-and-firewall-settings-to-allow-incoming-emails)."
   !["Enable" checkbox for email settings configuration](/assets/images/enterprise/configuration/ae-enable-email-configure.png)
 3. Complete your email server settings:
-  - In the **Server address** field, type the address of your SMTP server.
-  - In the **Port** field, type the port that your SMTP server uses to send email.
-  - In the **Domain** field, type the domain name that your SMTP server will send with a HELO response, if any.
-  - In the **Authentication** dropdown, choose the type of encryption used by your SMTP server.
-  - In the **No-reply email address** field, type the email address to use in the From and To fields for all notification emails.
+    - In the **Server address** field, type the address of your SMTP server.
+    - In the **Port** field, type the port that your SMTP server uses to send email.
+    - In the **Domain** field, type the domain name that your SMTP server will send with a HELO response, if any.
+    - In the **Authentication** dropdown, choose the type of encryption used by your SMTP server.
+    - In the **No-reply email address** field, type the email address to use in the From and To fields for all notification emails.
 
 4. If you want to discard all incoming emails that are addressed to the no-reply email address, select **Discard email addressed to the no-reply email address**.
   !["Discard" checkbox for email settings configuration](/assets/images/enterprise/configuration/ae-discard-email.png)

content/code-security/supply-chain-security/configuration-options-for-dependency-updates.md

@@ -446,12 +446,12 @@ updates:
 
 #### `rebase-strategy`
 
-By default, {% data variables.product.prodname_dependabot %} automatically rebases open pull requests when it detects conflicts. Use `rebase-strategy` to disable this behavior.
+By default, {% data variables.product.prodname_dependabot %} automatically rebases open pull requests when it detects any changes to the pull request. Use `rebase-strategy` to disable this behavior.
 
 Available rebase strategies
 
 - `disabled` to disable automatic rebasing.
-- `auto` to use the default behavior and rebase open pull requests when conflicts are detected.
+- `auto` to use the default behavior and rebase open pull requests when changes are detected.
 
 {% data reusables.dependabot.option-affects-security-updates %}
 

content/github/developing-online-with-codespaces/index.md

@@ -27,5 +27,4 @@ topics:
 {% link_in_list /managing-gpg-verification-for-codespaces %}
 {% link_in_list /deleting-a-codespace %}
 {% link_in_list /troubleshooting-your-codespace %}
-{% link_in_list /using-codespaces-in-visual-studio-code %}
-{% link_in_list /using-codespaces-in-visual-studio %}
+{% link_in_list /using-codespaces-in-visual-studio-code %}

content/github/developing-online-with-codespaces/using-codespaces-in-visual-studio-code.md

@@ -4,6 +4,7 @@ intro: 'You can develop in your codespace directly in {% data variables.product.
 product: '{% data reusables.gated-features.codespaces %}'
 redirect_from:
   - /github/developing-online-with-codespaces/connecting-to-your-codespace-from-visual-studio-code
+  - /github/developing-online-with-codespaces/using-codespaces-in-visual-studio
 versions:
   free-pro-team: '*'
 topics:
@@ -27,7 +28,7 @@ To develop in a codespace directly in {% data variables.product.prodname_vscode
 
 ### Creating a codespace in {% data variables.product.prodname_vscode %}
 
-After you connect your {% data variables.product.product_name %} account to the {% data variables.product.prodname_vs_codespaces %} extension, you can develop in a codespace that you created on {% data variables.product.product_name %} or in {% data variables.product.prodname_vscode %}.
+After you connect your {% data variables.product.product_name %} account to the {% data variables.product.prodname_github_codespaces %} extension, you can develop in a codespace that you created on {% data variables.product.product_name %} or in {% data variables.product.prodname_vscode %}.
 
 {% data reusables.codespaces.click-remote-explorer-icon-vscode %}
 2. Click the Add icon, then click **Create New Codespace**.

content/github/developing-online-with-codespaces/using-codespaces-in-visual-studio.md

@@ -119,7 +119,6 @@ prodname_security_center: 'Security Center'
 
 # Codespaces
 prodname_codespaces: 'Codespaces'
-prodname_vs_codespaces: 'Visual Studio Codespaces'
 prodname_github_codespaces: 'GitHub Codespaces'
 
 # GitHub resources: blog, jobs, Learning Lab