[pull] main from github:main

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**.

data/variables/product.yml

@@ -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