Merge branch 'main' into patch-2

Author: dawinkweon

.devcontainer/test-custom-devcontainer/devcontainer.json

@@ -2,7 +2,7 @@
 	"name": "test",
 
 	"settings": {
-		"terminal.integrated.shell.linux": "/bin/csh",
+		"terminal.integrated.shell.linux": "/bin/zsh",
 	},
 
 	// Visual Studio Code extensions which help authoring for docs.github.com.

.vscode/settings.json

@@ -3,5 +3,5 @@
     "**/translations": true
   },
   "workbench.editor.enablePreview": false,
-  "workbench.editor.enablePreviewFromQuickOpen": false  
+  "workbench.editor.enablePreviewFromQuickOpen": false
 }

codespaces-settings.json

@@ -0,0 +1 @@
+"isInternal": true

components/ui/MarkdownContent/MarkdownContent.module.scss

@@ -6,6 +6,7 @@
 .markdownBody {
   a {
     text-decoration: underline;
+    text-underline-offset: 25%;
   }
 
   summary {

content/actions/deployment/targeting-different-environments/using-environments-for-deployment.md

@@ -71,6 +71,14 @@ Secrets stored in an environment are only available to workflow jobs that refere
 
 {% data reusables.actions.permissions-statement-environment %}
 
+{% ifversion fpt or ghec %}
+{% note %}
+
+**Note:** To create an environment in a private repository, your organization must use {% data variables.product.prodname_ghe_cloud %}. {% data reusables.enterprise.link-to-ghec-trial %}
+
+{% endnote %}
+{% endif %}
+
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.sidebar-settings %}
 {% data reusables.actions.sidebar-environment %}

content/actions/security-guides/security-hardening-for-github-actions.md

@@ -48,6 +48,12 @@ To help prevent accidental disclosure, {% data variables.product.product_name %}
 - **Consider requiring review for access to secrets**
     - You can use required reviewers to protect environment secrets. A workflow job cannot access environment secrets until approval is granted by a reviewer. For more information about storing secrets in environments or requiring reviews for environments, see "[Encrypted secrets](/actions/reference/encrypted-secrets)" and "[Using environments for deployment](/actions/deployment/using-environments-for-deployment)."
 
+{% warning %}
+
+**Warning**: Any user with write access to your repository has read access to all secrets configured in your repository. Therefore, you should ensure that the credentials being used within workflows have the least privileges required.
+
+{% endwarning %}
+
 ## Using `CODEOWNERS` to monitor changes
 
 You can use the `CODEOWNERS` feature to control how changes are made to your workflow files. For example, if all your workflow files are stored in `.github/workflows`, you can add this directory to the code owners list, so that any proposed changes to these files will first require approval from a designated reviewer.

content/code-security/security-overview/about-the-security-overview.md

@@ -22,7 +22,9 @@ topics:
 shortTitle: About security overview
 ---
 
+{% ifversion ghes < 3.5 or ghae-issue-4554 %}
 {% data reusables.security-center.beta %}
+{% endif %}
 
 ## About the security overview
 

content/code-security/security-overview/filtering-alerts-in-the-security-overview.md

@@ -17,7 +17,9 @@ topics:
 shortTitle: Filtering alerts
 ---
 
+{% ifversion ghes < 3.5 or ghae-issue-4554 %}
 {% data reusables.security-center.beta %}
+{% endif %}
 
 ## About filtering the security overview
 

content/code-security/security-overview/viewing-the-security-overview.md

@@ -17,7 +17,9 @@ topics:
 shortTitle: View the security overview
 ---
 
+{% ifversion ghes < 3.5 or ghae-issue-4554 %}
 {% data reusables.security-center.beta %}
+{% endif %}
 
 ## Viewing the security overview for an organization
 
@@ -43,7 +45,7 @@ shortTitle: View the security overview
 ## Viewing the security overview for an enterprise
 
 {% data reusables.enterprise-accounts.access-enterprise-on-dotcom %}
-1. In the left sidebar, click {% octicon "shield" aria-label="The shield icon" %} **Security**.
+1. In the left sidebar, click {% octicon "shield" aria-label="The shield icon" %} **Code Security**.
 {% endif %}
 
 ## Viewing alerts for a repository

content/desktop/installing-and-configuring-github-desktop/configuring-and-customizing-github-desktop/configuring-a-default-editor.md

@@ -34,6 +34,8 @@ shortTitle: Configure default editor
 - [CodeRunner](https://coderunnerapp.com/)
 - [SlickEdit](https://www.slickedit.com/)
 - [Xcode](https://developer.apple.com/xcode/)
+- [RStudio](https://rstudio.com/)
+- [Nova](https://nova.app/)
 - [Android Studio](https://developer.android.com/studio)
 
 {% endmac %}
@@ -47,10 +49,18 @@ shortTitle: Configure default editor
 - [ColdFusion Builder](https://www.adobe.com/products/coldfusion-builder.html)
 - [Typora](https://typora.io/)
 - [SlickEdit](https://www.slickedit.com/)
+- [JetBrains IntelliJ Idea](https://www.jetbrains.com/idea/)
 - [JetBrains WebStorm](https://www.jetbrains.com/webstorm/)
 - [JetBrains PhpStorm](https://www.jetbrains.com/phpstorm/)
 - [JetBrains Rider](https://www.jetbrains.com/rider/)
+- [JetBrains CLion](https://www.jetbrains.com/clion/)
+- [JetBrains PyCharm](https://www.jetbrains.com/pycharm/)
+- [JetBrains RubyMine](https://www.jetbrains.com/rubymine/)
+- [JetBrains GoLand](https://www.jetbrains.com/go/)
+- [Android Studio](https://developer.android.com/studio)
+- [Brackets](http://brackets.io/)
 - [Notepad++](https://notepad-plus-plus.org/)
+- [RStudio](https://rstudio.com/)
 
 {% endwindows %}