Skip to content

Commit 541e66d

Browse files
authored
Merge pull request #190723 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents ff72254 + efec835 commit 541e66d

File tree

119 files changed

+1188
-1092
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+1188
-1092
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43933,6 +43933,11 @@
4393343933
"source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-group-policy.md",
4393443934
"redirect_url": "/azure/governance/policy/how-to/guest-configuration-create",
4393543935
"redirect_document_id": false
43936+
},
43937+
{
43938+
"source_path_from_root": "/articles/virtual-desktop/compare-virtual-desktop-windows-365.md",
43939+
"redirect_url": "/azure/virtual-desktop/overview",
43940+
"redirect_document_id": false
4393643941
}
4393743942
]
4393843943
}

articles/active-directory-b2c/claimsschema.md

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: CelesteDG
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: reference
11-
ms.date: 02/16/2022
11+
ms.date: 03/06/2022
1212
ms.author: kengaderdus
1313
ms.subservice: B2C
1414
ms.custom: "b2c-support"
@@ -127,7 +127,7 @@ The **Mask** element contains the following attributes:
127127
| `Type` | Yes | The type of the claim mask. Possible values: `Simple` or `Regex`. The `Simple` value indicates that a simple text mask is applied to the leading portion of a string claim. The `Regex` value indicates that a regular expression is applied to the string claim as whole. If the `Regex` value is specified, an optional attribute must also be defined with the regular expression to use. |
128128
| `Regex` | No | If **`Type`** is set to `Regex`, specify the regular expression to use.
129129

130-
The following example configures a **PhoneNumber** claim with the `Simple` mask:
130+
The following example configures a **PhoneNumber** claim with the `Simple` mask. For more samples, check out the [Claim simple mask live demo](https://github.com/azure-ad-b2c/unit-tests/tree/main/claims#simple-mask).
131131

132132
```xml
133133
<ClaimType Id="PhoneNumber">
@@ -142,7 +142,7 @@ The Identity Experience Framework renders the phone number while hiding the firs
142142

143143
![Phone number claim shown in browser with first six digits masked by Xs](./media/claimsschema/mask.png)
144144

145-
The following example configures a **AlternateEmail** claim with the `Regex` mask:
145+
The following example configures a **AlternateEmail** claim with the `Regex` mask. For more samples, check out the [Regex mask live demo](https://github.com/azure-ad-b2c/unit-tests/tree/main/claims#regex-mask).
146146

147147
```xml
148148
<ClaimType Id="AlternateEmail">
@@ -157,7 +157,6 @@ The Identity Experience Framework renders only the first letter of the email add
157157

158158
![Email claim shown in browser with characters masked by asterisks](./media/claimsschema/mask-regex.png)
159159

160-
161160
### Restriction
162161

163162
The **Restriction** element may contain the following attribute:
@@ -185,7 +184,7 @@ The **Enumeration** element contains the following attributes:
185184
|Value | Yes | The claim value that is associated with selecting this option. |
186185
| SelectByDefault | No | Indicates whether or not this option should be selected by default in the UI. Possible values: True or False. |
187186

188-
The following example configures a **city** dropdown list claim with a default value set to `New York`:
187+
The following example configures a **city** dropdown list claim with a default value set to `New York`. For more samples, check out the [Claim restriction enumeration live demo](https://github.com/azure-ad-b2c/unit-tests/tree/main/claims#restriction-enumeration).
189188

190189
```xml
191190
<ClaimType Id="city">
@@ -390,7 +389,6 @@ The **Readonly** user input type is used to provide a readonly field to display
390389
</ClaimType>
391390
```
392391

393-
394392
#### Paragraph
395393

396394
The **Paragraph** user input type is used to provide a field that shows text only in a paragraph tag. For example, &lt;p&gt;text&lt;/p&gt;. A **Paragraph** user input type `OutputClaim` of self-asserted technical profile, must set the `Required` attribute `false` (default).
@@ -404,10 +402,5 @@ The **Paragraph** user input type is used to provide a field that shows text onl
404402
<AdminHelpText>A claim responsible for holding response messages to send to the relying party</AdminHelpText>
405403
<UserHelpText>A claim responsible for holding response messages to send to the relying party</UserHelpText>
406404
<UserInputType>Paragraph</UserInputType>
407-
<Restriction>
408-
<Enumeration Text="B2C_V1_90001" Value="You cannot sign in because you are a minor" />
409-
<Enumeration Text="B2C_V1_90002" Value="This action can only be performed by gold members" />
410-
<Enumeration Text="B2C_V1_90003" Value="You have not been enabled for this operation" />
411-
</Restriction>
412405
</ClaimType>
413406
```

articles/active-directory-b2c/localization.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manager: CelesteDG
77
ms.service: active-directory
88
ms.workload: identity
99
ms.topic: reference
10-
ms.date: 01/21/2022
10+
ms.date: 03/06/2022
1111
ms.author: kengaderdus
1212
ms.subservice: B2C
1313
ms.custom: "b2c-support"
@@ -110,24 +110,26 @@ The **Item** element contains the following attributes:
110110
| Value | Yes | The string claim value associated with selecting this option. |
111111
| SelectByDefault | No | Indicates whether or not this option should be selected by default in the UI. Possible values: True or False. |
112112

113-
The following example shows the use of the **LocalizedCollections** element. It contains two **LocalizedCollection** elements, one for English and another one for Spanish. Both set the **Restriction** collection of the claim `Gender` with a list of items for English and Spanish.
113+
The following example shows the use of the **LocalizedCollections** element. It contains two **LocalizedCollection** elements, one for English and another one for Spanish. Both set the **Restriction** collection of the claim `Gender` with a list of items for English and Spanish. For more samples, check out the [Claim restriction enumeration live demo](https://github.com/azure-ad-b2c/unit-tests/tree/main/claims#restriction-enumeration).
114114

115115
```xml
116116
<LocalizedResources Id="api.selfasserted.en">
117-
<LocalizedCollections>
118-
<LocalizedCollection ElementType="ClaimType" ElementId="Gender" TargetCollection="Restriction">
117+
<LocalizedCollections>
118+
<LocalizedCollection ElementType="ClaimType" ElementId="Gender" TargetCollection="Restriction">
119119
<Item Text="Female" Value="F" />
120120
<Item Text="Male" Value="M" />
121121
</LocalizedCollection>
122-
</LocalizedCollections>
122+
</LocalizedCollections>
123+
</LocalizedResources>
123124

124125
<LocalizedResources Id="api.selfasserted.es">
125126
<LocalizedCollections>
126127
<LocalizedCollection ElementType="ClaimType" ElementId="Gender" TargetCollection="Restriction">
127128
<Item Text="Femenino" Value="F" />
128129
<Item Text="Masculino" Value="M" />
129130
</LocalizedCollection>
130-
</LocalizedCollections>
131+
</LocalizedCollections>
132+
</LocalizedResources>
131133
```
132134

133135
### LocalizedStrings

articles/active-directory/governance/create-access-review.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,8 @@ For more information, see [License requirements](access-reviews-overview.md#lice
157157
## Create a multi-stage access review (preview)
158158

159159
A multi-stage review allows the administrator to define two or three sets of reviewers to complete a review one after another. In a single-stage review, all reviewers make a decision within the same period and the last reviewer to make a decision "wins". In a multi-stage review, two or three independent sets of reviewers make a decision within their own stage, and the next stage doesn't happen until a decision is made in the previous stage. Multi-stage reviews can be used to reduce the burden on later-stage reviewers, allow for escalation of reviewers, or have independent groups of reviewers agree on decisions.
160+
> [!WARNING]
161+
> Data of users included in multi-stage access reviews are a part of the audit record at the start of the review. Administrators may delete the data at any time by deleting the multi-stage access review series.
160162
161163
1. After you have selected the resource and scope of your review, move on to the **Reviews** tab.
162164

articles/aks/supported-kubernetes-versions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ For the past release history, see [Kubernetes](https://en.wikipedia.org/wiki/Kub
200200
| 1.20 | Dec-08-20 | Jan 2021 | Mar 2021 | 1.23 GA |
201201
| 1.21 | Apr-08-21 | May 2021 | Jul 2021 | 1.24 GA |
202202
| 1.22 | Aug-04-21 | Sept 2021 | Dec 2021 | 1.25 GA |
203-
| 1.23 | Dec 2021 | Jan 2022 | Mar 2022 | 1.26 GA |
203+
| 1.23 | Dec 2021 | Jan 2022 | Apr 2022 | 1.26 GA |
204204
| 1.24 | Apr-22-22 | May 2022 | Jul 2022 | 1.27 GA
205205
| 1.25 | Aug 2022 | Sept 2022 | Nov 2022 | 1.28 GA
206206

articles/api-management/configure-custom-domain.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,9 @@ Choose the steps according to the [domain certificate](#domain-certificate-optio
161161
* Configure a CNAME record for your custom domain.
162162
* When using API Management's free, managed certificate, also configure a TXT record to establish your ownership of the domain.
163163

164+
> [!NOTE]
165+
> The free certificate is issued by DigiCert. For some domains, you must explicitly allow DigiCert as a certificate issuer by creating a [CAA domain record](https://wikipedia.org/wiki/DNS_Certification_Authority_Authorization) with the value: `0 issue digicert.com`.
166+
164167
### CNAME record
165168

166169
Configure a CNAME record that points from your custom domain name (for example, `api.contoso.com`) to your API Management service hostname (for example, `<apim-service-name>.azure-api.net`). A CNAME record is more stable than an A-record in case the IP address changes. For more information, see [IP addresses of Azure API Management](api-management-howto-ip-addresses.md#changes-to-the-ip-addresses) and the [API Management FAQ](./api-management-faq.yml#how-can-i-secure-the-connection-between-the-api-management-gateway-and-my-back-end-services-).

articles/automation/add-user-assigned-identity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ If you don't have an Azure subscription, create a [free account](https://azure.m
2424

2525
- A user-assigned managed identity. For instructions, see [Create a user-assigned managed identity](../active-directory/managed-identities-azure-resources/how-to-manage-ua-identity-portal.md#create-a-user-assigned-managed-identity).
2626

27-
- The user-assigned managed identity and the target Azure resources that your runbook manages using that identity must be in the same Azure subscription.
27+
- The user-assigned managed identity and the target Azure resources that your runbook manages using that identity can be in different Azure subscriptions.
2828

2929
- The latest version of Azure Account modules. Currently this is 2.2.8. (See [Az.Accounts](https://www.powershellgallery.com/packages/Az.Accounts/) for details about this version.)
3030

articles/azure-monitor/logs/manage-cost-storage.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.service: azure-monitor
1111
ms.workload: na
1212
ms.tgt_pltfrm: na
1313
ms.topic: conceptual
14-
ms.date: 02/18/2022
14+
ms.date: 03/05/2022
1515
ms.author: bwren
1616
ms.custom: devx-track-azurepowershell
1717
---
@@ -659,13 +659,13 @@ Here is the pricing tier recommendation query:
659659

660660
```kusto
661661
// Set these parameters before running query.
662-
// For Pay-As-You-Go (per-GB) pricing details, see https://azure.microsoft.com/pricing/details/monitor/.
662+
// For Pay-As-You-Go (per-GB) and commitment tier pricing details, see https://azure.microsoft.com/pricing/details/monitor/.
663663
// You can see your per-node costs in your Azure usage and charge data. For more information, see https://docs.microsoft.com/en-us/azure/cost-management-billing/understand/download-azure-daily-usage.
664664
let daysToEvaluate = 7; // Enter number of previous days to analyze (reduce if the query is taking too long)
665665
let workspaceHasSecurityCenter = false; // Specify if the workspace has Defender for Cloud (formerly known as Azure Security Center)
666-
let PerNodePrice = 15.; // Enter your monthly price per monitored nodes
667-
let PerNodeOveragePrice = 2.30; // Enter your price per GB for data overage in the Per Node pricing tier
668-
let PerGBPrice = 2.30; // Enter your price per GB in the Pay-as-you-go pricing tier
666+
let PerNodePrice = 15.; // Montly price per monitored node
667+
let PerNodeOveragePrice = 2.30; // Price per GB for data overage in the Per Node pricing tier
668+
let PerGBPrice = 2.30; // Enter the Pay-as-you-go price for your workspace's region (from https://azure.microsoft.com/pricing/details/monitor/)
669669
let CommitmentTier100Price = 196.; // Enter your price for the 100 GB/day commitment tier
670670
let CommitmentTier200Price = 368.; // Enter your price for the 200 GB/day commitment tier
671671
let CommitmentTier300Price = 540.; // Enter your price for the 300 GB/day commitment tier

articles/azure-portal/set-preferences.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ Choose your language and the regional format that will influence how data such a
127127
128128
### Language
129129

130-
Use the drop-down list to select from the list of available languages. This setting controls the language you see for text throughout the Azure portal.
130+
Use the drop-down list to select from the list of available languages. This setting controls the language you see for text throughout the Azure portal. Azure portal supports the following 18 languages in addition to English: Chinese (Simplified), Chinese (Traditional), Czech, Dutch, French, German, Hungarian, Indonesian, Italian, Japanese, Korean, Polish, Portuguese (Brazil), Portuguese (Portugal), Russian, Spanish, Swedish, and Turkish.
131131

132132
### Regional format
133133

articles/bastion/connect-native-client-windows.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.custom: ignite-fall-2021
1313

1414
# Connect to a VM using a native client (Preview)
1515

16-
This article helps you configure your Bastion deployment, and then connect to a VM in the VNet using a native client (SSH or RDP) on your local computer. The native client feature lets you connect to your target VMs via Bastion using Azure CLI, and expands your sign-in options to include local SSH key pair and Azure Active Directory (Azure AD). Additionally with this feature, you can now also upload and download files, depending on the connection type and client.
16+
This article helps you configure your Bastion deployment, and then connect to a VM in the VNet using a native client (SSH or RDP) on your local computer. The native client feature lets you connect to your target VMs via Bastion using Azure CLI, and expands your sign-in options to include local SSH key pair and Azure Active Directory (Azure AD). Additionally with this feature, you can now also upload or download files, depending on the connection type and client.
1717

1818
Your capabilities on the VM when connecting via a native client are dependent on what is enabled on the native client. Controlling access to features such as file transfer via Bastion isn't supported.
1919

@@ -107,7 +107,7 @@ To connect to a Windows VM using native client support, you must have the follow
107107

108108
## <a name="connect"></a>Connect - Windows native client
109109

110-
This section helps you connect to your virtual machine from the native client on a local Windows computer. If you want to upload and download files after connecting, you must use an RDP connection. For more information about file transfers, see [Upload and download files](vm-upload-download-native.md).
110+
This section helps you connect to your virtual machine from the native client on a local Windows computer. If you want to upload and download files after connecting, you must use an RDP connection. For more information about file transfers, see [Upload or download files](vm-upload-download-native.md).
111111

112112
Use the example that corresponds to the type of target VM to which you want to connect.
113113

@@ -212,4 +212,4 @@ This connection supports file upload from the local computer to the target VM. F
212212

213213
## Next steps
214214

215-
[Upload and download files](vm-upload-download-native.md)
215+
[Upload or download files](vm-upload-download-native.md)

0 commit comments

Comments
 (0)