Skip to content

Commit 7726556

Browse files
authored
Merge pull request #194186 from MicrosoftDocs/main
Merge Main to Live, 4 AM
2 parents 4914937 + 7088128 commit 7726556

File tree

565 files changed

+1039
-675
lines changed

Some content is hidden

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

565 files changed

+1039
-675
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39058,6 +39058,11 @@
3905839058
"redirect_url": "/azure/cognitive-services/Speech-Service/speech-devices",
3905939059
"redirect_document_id": false
3906039060
},
39061+
{
39062+
"source_path_from_root": "/articles/cognitive-services/Speech-Service/index-conversation-scenarios.yml",
39063+
"redirect_url": "/azure/cognitive-services/Speech-Service/call-center-transcription.md",
39064+
"redirect_document_id": false
39065+
},
3906139066
{
3906239067
"source_path_from_root": "/articles/cognitive-services/Speech-Service/keyword-recognition-region-support.md",
3906339068
"redirect_url": "/azure/cognitive-services/Speech-Service/regions",

articles/active-directory/conditional-access/concept-condition-filters-for-devices.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Use filter for devices in Conditional Access to enhance security po
44
ms.service: active-directory
55
ms.subservice: conditional-access
66
ms.topic: conceptual
7-
ms.date: 02/28/2022
7+
ms.date: 04/05/2022
88
ms.author: joflore
99
author: MicrosoftGuyJFlo
1010
manager: karenhoran
@@ -135,11 +135,11 @@ The filter for devices condition in Conditional Access evaluates policy based on
135135
| Include/exclude mode with positive operators (Equals, StartsWith, EndsWith, Contains, In) and use of any attributes | Unregistered device | No |
136136
| Include/exclude mode with positive operators (Equals, StartsWith, EndsWith, Contains, In) and use of attributes excluding extensionAttributes1-15 | Registered device | Yes, if criteria are met |
137137
| Include/exclude mode with positive operators (Equals, StartsWith, EndsWith, Contains, In) and use of attributes including extensionAttributes1-15 | Registered device managed by Intune | Yes, if criteria are met |
138-
| Include/exclude mode with positive operators (Equals, StartsWith, EndsWith, Contains, In) and use of attributes including extensionAttributes1-15 | Registered device not managed by Intune | Yes, if criteria are met and if device is compliant or Hybrid Azure AD joined |
138+
| Include/exclude mode with positive operators (Equals, StartsWith, EndsWith, Contains, In) and use of attributes including extensionAttributes1-15 | Registered device not managed by Intune | Yes, if criteria are met. When extensionAttributes1-15 are used, the policy will apply if device is compliant or Hybrid Azure AD joined |
139139
| Include/exclude mode with negative operators (NotEquals, NotStartsWith, NotEndsWith, NotContains, NotIn) and use of any attributes | Unregistered device | Yes |
140140
| Include/exclude mode with negative operators (NotEquals, NotStartsWith, NotEndsWith, NotContains, NotIn) and use of any attributes excluding extensionAttributes1-15 | Registered device | Yes, if criteria are met |
141141
| Include/exclude mode with negative operators (NotEquals, NotStartsWith, NotEndsWith, NotContains, NotIn) and use of any attributes including extensionAttributes1-15 | Registered device managed by Intune | Yes, if criteria are met |
142-
| Include/exclude mode with negative operators (NotEquals, NotStartsWith, NotEndsWith, NotContains, NotIn) and use of any attributes including extensionAttributes1-15 | Registered device not managed by Intune | Yes, if criteria are met and if device is compliant or Hybrid Azure AD joined |
142+
| Include/exclude mode with negative operators (NotEquals, NotStartsWith, NotEndsWith, NotContains, NotIn) and use of any attributes including extensionAttributes1-15 | Registered device not managed by Intune | Yes, if criteria are met. When extensionAttributes1-15 are used, the policy will apply if device is compliant or Hybrid Azure AD joined |
143143

144144
## Next steps
145145

articles/active-directory/conditional-access/concept-conditional-access-conditions.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: conditional-access
88
ms.topic: conceptual
9-
ms.date: 03/10/2022
9+
ms.date: 04/05/2022
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
@@ -43,7 +43,7 @@ Azure AD Conditional Access supports the following device platforms:
4343
- iOS
4444
- Windows
4545
- macOS
46-
- Linux (Preview)
46+
- Linux
4747

4848
If you block legacy authentication using the **Other clients** condition, you can also set the device platform condition.
4949

@@ -189,7 +189,7 @@ By selecting **Other clients**, you can specify a condition that affects apps th
189189
## Device state (preview)
190190

191191
> [!CAUTION]
192-
> **This preview feature has being deprecated.** Customers should use **Filter for devices** condition in Conditional Access to satisfy scenarios, previously achieved using device state (preview) condition.
192+
> **This preview feature has been deprecated.** Customers should use **Filter for devices** condition in Conditional Access to satisfy scenarios, previously achieved using device state (preview) condition.
193193
194194
The device state condition was used to exclude devices that are hybrid Azure AD joined and/or devices marked as compliant with a Microsoft Intune compliance policy from an organization's Conditional Access policies.
195195

articles/active-directory/saas-apps/meta-networks-connector-provisioning-tutorial.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,10 @@ This section guides you through the steps to configure the Azure AD provisioning
149149
|Attribute|Type|Supported for filtering|Required by Meta Networks Connector|
150150
|---|---|---|---|
151151
|userName|String|✓|✓
152+
|active|Boolean||
153+
|phonenumbers[type eq "work"].value|String||
152154
|name.givenName|String||✓
153155
|name.familyName|String||✓
154-
|active|Boolean||
155-
|phonenumbers[type eq "work"].value|String||
156156

157157
> [!NOTE]
158158
> phonenumbers value should be in E164 format. For example +16175551212
@@ -189,8 +189,10 @@ Once you've configured provisioning, use the following resources to monitor your
189189

190190
* Use the [provisioning logs](../reports-monitoring/concept-provisioning-logs.md) to determine which users have been provisioned successfully or unsuccessfully
191191
* Check the [progress bar](../app-provisioning/application-provisioning-when-will-provisioning-finish-specific-user.md) to see the status of the provisioning cycle and how close it is to completion
192-
* If the provisioning configuration seems to be in an unhealthy state, the application will go into quarantine. Learn more about quarantine states [here](../app-provisioning/application-provisioning-quarantine-status.md).
192+
* If the provisioning configuration seems to be in an unhealthy state, the application will go into quarantine. Learn more about quarantine states [here](../app-provisioning/application-provisioning-quarantine-status.md).
193193

194+
## Change Log
195+
04/06/2022 - Added support for **phoneNumbers[type eq "work"].value**. Removed support for **emails[type eq "work"].value** and **manager** . **name.givenName** and **name.familyName** made required attributes.
194196

195197
## More resources
196198

articles/api-management/get-started-create-service-instance-cli.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ description: Create a new Azure API Management service instance by using the Azu
44
author: dlepow
55
ms.service: api-management
66
ms.topic: quickstart
7-
ms.custom: mode-api, devx-track-azurecli
8-
ms.date: 09/10/2020
7+
ms.custom: mode-api, devx-track-azurecli, devdivchpfy22
8+
ms.date: 03/29/2022
99
ms.author: danlep
1010
ms.devlang: azurecli
1111
---
1212

1313
# Quickstart: Create a new Azure API Management service instance by using the Azure CLI
1414

15-
Azure API Management (APIM) helps organizations publish APIs to external, partner, and internal developers to unlock the potential of their data and services. API Management provides the core competencies to ensure a successful API program through developer engagement, business insights, analytics, security, and protection. APIM enables you to create and manage modern API gateways for existing backend services hosted anywhere. For more information, see the [Overview](api-management-key-concepts.md).
15+
Azure API Management (APIM) helps organizations publish APIs to external, partner, and internal developers to unlock the potential of their data and services. API Management provides the core competencies to ensure a successful API program through developer engagement, business insights, analytics, security, and protection. APIM lets you create and manage modern API gateways for existing backend services hosted anywhere. For more information about APIM, see the [Overview](api-management-key-concepts.md).
1616

1717
This quickstart describes the steps for creating a new API Management instance using [az apim](/cli/azure/apim) commands in the Azure CLI.
1818

@@ -24,7 +24,7 @@ This quickstart describes the steps for creating a new API Management instance u
2424

2525
## Create a resource group
2626

27-
Azure API Management instances, like all Azure resources, must be deployed into a resource group. Resource groups allow you to organize and manage related Azure resources.
27+
Azure API Management instances, like all Azure resources, must be deployed into a resource group. Resource groups let you organize and manage related Azure resources.
2828

2929
First, create a resource group named *myResourceGroup* in the Central US location with the following [az group create](/cli/azure/group#az-group-create) command:
3030

@@ -34,9 +34,9 @@ az group create --name myResourceGroup --location centralus
3434

3535
## Create a new service
3636

37-
Now that you have a resource group, you can create an API Management service instance. Create one by using the [az apim create](/cli/azure/apim#az-apim-create) command and provide a service name and publisher details. The service name must be unique within Azure.
37+
Now that you have a resource group, you can create an API Management service instance. Create one by using the [az apim create](/cli/azure/apim#az-apim-create) command and provide a service name and publisher details. The service name must be unique within Azure.
3838

39-
In the following example, *myapim* is used for the service name. Update the name to a unique value. Also update the name of the API publisher's organization and the email address to receive notifications.
39+
In the following example, *myapim* is used for the service name. Update the name to a unique value. Also update the name of the API publisher's organization and the email address to receive notifications.
4040

4141
```azurecli-interactive
4242
az apim create --name myapim --resource-group myResourceGroup \
@@ -75,7 +75,7 @@ When your API Management service instance is online, you're ready to use it. Sta
7575

7676
## Clean up resources
7777

78-
When no longer needed, you can use the [az group delete](/cli/azure/group#az-group-delete) command to remove the resource group and the API Management service instance.
78+
You can use the [az group delete](/cli/azure/group#az-group-delete) command to remove the resource group and the API Management service instance when they aren't needed.
7979

8080
```azurecli-interactive
8181
az group delete --name myResourceGroup

articles/api-management/powershell-create-service-instance.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ documentationcenter: ''
66
author: dlepow
77
ms.service: api-management
88
ms.topic: quickstart
9-
ms.custom: mvc, devx-track-azurepowershell, mode-api
10-
ms.date: 09/14/2020
9+
ms.custom: mvc, devx-track-azurepowershell, mode-api, devdivchpfy22
10+
ms.date: 03/30/2022
1111
ms.author: danlep
1212
---
1313

1414
# Quickstart: Create a new Azure API Management service instance by using PowerShell
1515

16-
Azure API Management (APIM) helps organizations publish APIs to external, partner, and internal developers to unlock the potential of their data and services. API Management provides the core competencies to ensure a successful API program through developer engagement, business insights, analytics, security, and protection. APIM enables you to create and manage modern API gateways for existing backend services hosted anywhere. For more information, see the [Overview](api-management-key-concepts.md).
16+
Azure API Management (APIM) helps organizations publish APIs to external, partner, and internal developers to unlock the potential of their data and services. API Management provides the core competencies to ensure a successful API program through developer engagement, business insights, analytics, security, and protection. APIM lets you create and manage modern API gateways for existing backend services hosted anywhere. For more information, see the [Overview](api-management-key-concepts.md).
1717

1818
This quickstart describes the steps for creating a new API Management instance by using Azure PowerShell cmdlets.
1919

@@ -39,19 +39,19 @@ New-AzResourceGroup -Name myResourceGroup -Location WestUS
3939

4040
Now that you have a resource group, you can create an API Management service instance. Create one by using [New-AzApiManagement](/powershell/module/az.apimanagement/new-azapimanagement) and provide a service name and publisher details. The service name must be unique within Azure.
4141

42-
In the following example, *myapim* is used for the service name. Update the name to a unique value. Also update the organization name of the API publisher and the admin email address to receive notifications.
42+
In the following example, *myapim* is used for the service name. Update the name to a unique value. Also, update the organization name of the API publisher and the admin email address to receive notifications.
4343

4444
By default, the command creates the instance in the Developer tier, an economical option to evaluate Azure API Management. This tier isn't for production use. For more information about scaling the API Management tiers, see [upgrade and scale](upgrade-and-scale.md).
4545

4646
> [!NOTE]
47-
> This is a long-running operation. It can take between 30 and 40 minutes to create and activate an API Management service in this tier.
47+
> This is a long-running action. It can take between 30 and 40 minutes to create and activate an API Management service in this tier.
4848
4949
```azurepowershell-interactive
5050
New-AzApiManagement -Name "myapim" -ResourceGroupName "myResourceGroup" `
5151
-Location "West US" -Organization "Contoso" -AdminEmail "[email protected]"
5252
```
5353

54-
When the command returns, run [Get-AzApiManagement](/powershell/module/az.apimanagement/get-azapimanagement) to view the properties of the Azure API Management service. After activation, the provisioning status is Succeeded and the service instance has several associated URLs. For example:
54+
When the command returns, run [Get-AzApiManagement](/powershell/module/az.apimanagement/get-azapimanagement) to view the properties of the Azure API Management service. After activation, the setting up status is Succeeded and the service instance has several associated URLs. For example:
5555

5656
```azurepowershell-interactive
5757
Get-AzApiManagement -Name "myapim" -ResourceGroupName "myResourceGroup"

articles/app-service/configure-language-nodejs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ az webapp config appsettings list --name <app-name> --resource-group <resource-g
2828
To show all supported Node.js versions, navigate to `https://<sitename>.scm.azurewebsites.net/api/diagnostics/runtime` or run the following command in the [Cloud Shell](https://shell.azure.com):
2929

3030
```azurecli-interactive
31-
az webapp list-runtimes --os windows | grep node
31+
az webapp list-runtimes --os windows | grep NODE
3232
```
3333

3434
::: zone-end

articles/azure-fluid-relay/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
href: how-tos/test-automation.md
4141
- name: 'How to: Delete a Fluid container'
4242
href: how-tos/container-deletion.md
43+
- name: 'How to: Validate a User Created a Document'
44+
href: how-tos/validate-document-creator.md
4345
- name: Reference
4446
items:
4547
- name: API documentation

articles/azure-fluid-relay/how-tos/azure-function-token-provider.md

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const key = "myTenantKey";
4545
const httpTrigger: AzureFunction = async function (context: Context, req: HttpRequest): Promise<void> {
4646
// tenantId, documentId, userId and userName are required parameters
4747
const tenantId = (req.query.tenantId || (req.body && req.body.tenantId)) as string;
48-
const documentId = (req.query.documentId || (req.body && req.body.documentId)) as string;
48+
const documentId = (req.query.documentId || (req.body && req.body.documentId)) as string | undefined;
4949
const userId = (req.query.userId || (req.body && req.body.userId)) as string;
5050
const userName = (req.query.userName || (req.body && req.body.userName)) as string;
5151
const scopes = (req.query.scopes || (req.body && req.body.scopes)) as ScopeType[];
@@ -66,14 +66,6 @@ const httpTrigger: AzureFunction = async function (context: Context, req: HttpRe
6666
return;
6767
}
6868

69-
if (!documentId) {
70-
context.res = {
71-
status: 400,
72-
body: "No documentId provided in query params"
73-
};
74-
return;
75-
}
76-
7769
let user = { name: userName, id: userId };
7870

7971
// Will generate the token and returned by an ITokenProvider implementation to use with the AzureClient.
@@ -159,3 +151,4 @@ export class AzureFunctionTokenProvider implements ITokenProvider {
159151

160152
- [Add custom data to an auth token](connect-fluid-azure-service.md#adding-custom-data-to-tokens)
161153
- [How to: Deploy Fluid applications using Azure Static Web Apps](deploy-fluid-static-web-apps.md)
154+
- [How to: Validate a User Created a Document](validate-document-creator.md)

0 commit comments

Comments
 (0)