Skip to content

Commit 74b5368

Browse files
authored
Merge branch 'MicrosoftDocs:main' into main
2 parents f759d15 + a151daa commit 74b5368

19 files changed

+18
-7
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4573,6 +4573,11 @@
45734573
"redirect_url": "/azure/security/benchmarks",
45744574
"redirect_document_id": false
45754575
},
4576+
{
4577+
"source_path_from_root": "/articles/azure-resource-manager/bicep/linter-rule-use-protectedsettings-for-commandtoexecute-secrets.md",
4578+
"redirect_url": "/azure/azure-resource-manager/bicep/linter-rule-protect-commandtoexecute-secrets",
4579+
"redirect_document_id": false
4580+
},
45764581
{
45774582
"source_path_from_root": "/articles/azure-resource-manager/templates/view-resources.md",
45784583
"redirect_url": "/azure/azure-resource-manager/templates/export-template-portal",

articles/active-directory/fundamentals/concept-fundamentals-security-defaults.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Security defaults make it easier to help protect your organization from these id
4242

4343
## Enabling security defaults
4444

45-
If your tenant was created on or after October 22, 2019, security defaults may be enabled in your tenant. To protect all of our users, security defaults are being rolled out to all new tenants at creation.
45+
If your tenant was created on or after October 22, 2019, security defaults may be enabled in your tenant. To protect all of our users, security defaults are being rolled out to all new tenants at creation.
4646

4747
To enable security defaults in your directory:
4848

@@ -175,6 +175,10 @@ You may choose to [disable password expiration](../authentication/concept-sspr-p
175175

176176
For more detailed information about emergency access accounts, see the article [Manage emergency access accounts in Azure AD](../roles/security-emergency-access.md).
177177

178+
### B2B guest users
179+
180+
Any B2B Guest users that access your directory will be subject to the same controls as your organization's users.
181+
178182
### Disabled MFA status
179183

180184
If your organization is a previous user of per-user based Azure AD Multi-Factor Authentication, don't be alarmed to not see users in an **Enabled** or **Enforced** status if you look at the Multi-Factor Auth status page. **Disabled** is the appropriate status for users who are using security defaults or Conditional Access based Azure AD Multi-Factor Authentication.

articles/azure-resource-manager/bicep/bicep-config-linter.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ The following example shows the rules that are available for configuration.
5353
"prefer-unquoted-property-names": {
5454
"level": "warning"
5555
},
56-
"secure-parameter-default": {
56+
"protect-commandtoexecute-secrets": {
5757
"level": "warning"
5858
},
59-
"simplify-interpolation": {
59+
"secure-parameter-default": {
6060
"level": "warning"
6161
},
62-
"protect-commandtoexecute-secrets": {
62+
"simplify-interpolation": {
6363
"level": "warning"
6464
},
6565
"secure-secrets-in-params": {

articles/azure-resource-manager/bicep/toc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,8 @@
384384
href: linter-rule-prefer-interpolation.md
385385
- name: Prefer unquoted property names
386386
href: linter-rule-prefer-unquoted-property-names.md
387+
- name: Protect commandToExecute secrets
388+
href: linter-rule-protect-commandtoexecute-secrets.md
387389
- name: Secure parameter default
388390
href: linter-rule-secure-parameter-default.md
389391
- name: Secure secrets in parameters
@@ -392,8 +394,6 @@
392394
href: linter-rule-simplify-interpolation.md
393395
- name: Use explicit values for module location parameters
394396
href: linter-rule-explicit-values-for-loc-params.md
395-
- name: Use protectedSettings for commandToExecute secrets
396-
href: linter-rule-use-protectedsettings-for-commandtoexecute-secrets.md
397397
- name: Use stable resource identifier
398398
href: linter-rule-use-stable-resource-identifier.md
399399
- name: Use stable VM image

articles/cognitive-services/language-service/custom-named-entity-recognition/includes/language-studio/project-details.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,6 @@ ms.author: aahi
2121

2222
5. You can also retrieve your primary resource key from this page.
2323

24-
:::image type="content" source="../../../custom-text-classification/media/project-details.png" alt-text="A screenshot of the project settings page." lightbox="../../../custom-text-classification/media/project-details.png":::
24+
:::image type="content" source="../../media/project-details.png" alt-text="A screenshot of the project settings page in Language Studio." lightbox="../../media/project-details.png":::
25+
26+
0 Bytes
Loading
-474 KB
Loading

0 commit comments

Comments
 (0)