Skip to content

Commit c4f4326

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 1d923d7 + 3a063c5 commit c4f4326

File tree

25 files changed

+98
-69
lines changed

25 files changed

+98
-69
lines changed

articles/active-directory-b2c/conditional-access-identity-protection-overview.md

Lines changed: 2 additions & 2 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: overview
9-
ms.date: 05/28/2021
9+
ms.date: 11/23/2021
1010

1111
ms.author: kengaderdus
1212
author: kengaderdus
@@ -43,7 +43,7 @@ Identity Protection and Conditional Access in Azure AD B2C generally work the sa
4343

4444
- Identity Protection and Conditional Access aren't supported for ROPC server-to-server flows in Azure AD B2C tenants.
4545

46-
- In Azure AD B2C tenants, Identity Protection risk detections are available for local B2C accounts only, and not for social identities like Google or Facebook.
46+
- In Azure AD B2C tenants, Identity Protection risk detections are available for both local and social identities, such as Google or Facebook. For social identities, Conditional Access must be activated. Detection is limited because the social account credentials are managed by the external identity provider.
4747

4848
- In Azure AD B2C tenants, a subset of the Identity Protection risk detections is available. See [Investigate risk with Identity Protection](identity-protection-investigate-risk.md), and [Add Conditional Access to user flows](conditional-access-user-flow.md).
4949

articles/active-directory-b2c/custom-domain.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: CelesteDG
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: how-to
12-
ms.date: 09/15/2021
12+
ms.date: 11/23/2021
1313
ms.author: kengaderdus
1414
ms.subservice: B2C
1515
ms.custom: "b2c-support"
@@ -28,6 +28,10 @@ This article describes how to enable custom domains in your redirect URLs for Az
2828

2929
You can enable custom domains for Azure AD B2C by using [Azure Front Door](https://azure.microsoft.com/services/frontdoor/). Azure Front Door is a global entry point that uses the Microsoft global edge network to create fast, secure, and widely scalable web applications. You can render Azure AD B2C content behind Azure Front Door, and then configure an option in Azure Front Door to deliver the content via a custom domain in your application's URL.
3030

31+
Watch this video to learn about Azure AD B2C custom domain.
32+
33+
>[!Video https://www.youtube.com/embed/mVNB59VK-DQ]
34+
3135
The following diagram illustrates Azure Front Door integration:
3236

3337
1. From an application, a user selects the sign-in button, which takes them to the Azure AD B2C sign-in page. This page specifies a custom domain name.

articles/active-directory/devices/hybrid-azuread-join-federated-domains.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Hybrid Azure AD join requires devices to have access to the following Microsoft
8282
- `https://autologon.microsoftazuread-sso.com` (If you use or plan to use seamless SSO)
8383

8484
> [!WARNING]
85-
> If your organization uses proxy servers that intercept SSL traffic for scenarios like data loss prevention or Azure AD tenant restrictions, ensure that traffic to 'https://device.login.microsoftonline.com' is excluded from TLS break-and-inspect. Failure to exclude 'https://device.login.microsoftonline.com' may cause interference with client certificate authentication, causing issues with device registration and device-based Conditional Access.
85+
> If your organization uses proxy servers that intercept SSL traffic for scenarios like data loss prevention or Azure AD tenant restrictions, ensure that traffic to these URLs are excluded from TLS break-and-inspect. Failure to exclude these URLs may cause interference with client certificate authentication, cause issues with device registration, and device-based Conditional Access.
8686
8787
Beginning with Windows 10 1803, if the instantaneous hybrid Azure AD join for a federated environment by using AD FS fails, we rely on Azure AD Connect to sync the computer object in Azure AD that's subsequently used to complete the device registration for hybrid Azure AD join. Verify that Azure AD Connect has synced the computer objects of the devices you want to be hybrid Azure AD joined to Azure AD. If the computer objects belong to specific organizational units (OUs), you must also configure the OUs to sync in Azure AD Connect. To learn more about how to sync computer objects by using Azure AD Connect, see [Configure filtering by using Azure AD Connect](../hybrid/how-to-connect-sync-configure-filtering.md#organizational-unitbased-filtering).
8888

articles/active-directory/saas-apps/cisco-webex-provisioning-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Before configuring Cisco Webex for automatic user provisioning with Azure AD, yo
5353

5454
4. In the search box, type **Cisco Webex**, select **Cisco Webex** from result panel then click **Add** button to add the application.
5555

56-
![Cisco Webex in the results list](common/search-new-app.png)
56+
![Cisco Webex in the results list](media/cisco-webex-provisioning-tutorial/search-cisco-app.png)
5757

5858
## Assigning users to Cisco Webex
5959

14.8 KB
Loading

articles/active-directory/verifiable-credentials/get-started-request-api.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ Authorization: Bearer <token>
231231

232232
For the complete code, see one of the following code samples:
233233

234-
- [C#](https://github.com/Azure-Samples/active-directory-verifiable-credentials-dotnet/blob/main/AspNetCoreVerifiableCredentials/IssuerController.cs)
234+
- [C#](https://github.com/Azure-Samples/active-directory-verifiable-credentials-dotnet/blob/main/1-asp-net-core-api-idtokenhint/IssuerController.cs)
235235
- [Node.js](https://github.com/Azure-Samples/active-directory-verifiable-credentials-node/blob/main/1-node-api-idtokenhint/issuer.js)
236236

237237
## Presentation request example
@@ -317,7 +317,7 @@ try
317317
}
318318
```
319319

320-
For the complete code, see the [issuance](https://github.com/Azure-Samples/active-directory-verifiable-credentials-dotnet/blob/main/AspNetCoreVerifiableCredentials/IssuerController.cs) and [presentation](https://github.com/Azure-Samples/active-directory-verifiable-credentials-dotnet/blob/main/AspNetCoreVerifiableCredentials/VerifierController.cs) code on the GitHub repo.
320+
For the complete code, see the [issuance](https://github.com/Azure-Samples/active-directory-verifiable-credentials-dotnet/blob/main/1-asp-net-core-api-idtokenhint/IssuerController.cs) and [presentation](https://github.com/Azure-Samples/active-directory-verifiable-credentials-dotnet/blob/main/1-asp-net-core-api-idtokenhint/IssuerController.cs) code on the GitHub repo.
321321
322322
# [Node.js](#tab/nodejs)
323323

articles/aks/rdp.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,16 @@ This article shows you how to create an RDP connection with an AKS node using th
1818

1919
## Before you begin
2020

21-
This article assumes that you have an existing AKS cluster with a Windows Server node. If you need an AKS cluster, see the article on [creating an AKS cluster with a Windows container using the Azure CLI][aks-windows-cli]. You need the Windows administrator username and password for the Windows Server node you want to troubleshoot. If you don't know them, you can reset them by following [Reset Remote Desktop Services or its administrator password in a Windows VM
22-
](/troubleshoot/azure/virtual-machines/reset-rdp). You also need an RDP client such as [Microsoft Remote Desktop][rdp-mac].
21+
This article assumes that you have an existing AKS cluster with a Windows Server node. If you need an AKS cluster, see the article on [creating an AKS cluster with a Windows container using the Azure CLI][aks-windows-cli]. You need the Windows administrator username and password for the Windows Server node you want to troubleshoot. You also need an RDP client such as [Microsoft Remote Desktop][rdp-mac].
22+
23+
If you need to reset the password you can use `az aks update` to change the password.
24+
25+
```azurecli-interactive
26+
az aks update -g myResourceGroup -n myAKSCluster --windows-admin-password $WINDOWS_ADMIN_PASSWORD
27+
```
28+
29+
If you need to reset both the username and password, see [Reset Remote Desktop Services or its administrator password in a Windows VM
30+
](/troubleshoot/azure/virtual-machines/reset-rdp).
2331

2432
You also need the Azure CLI version 2.0.61 or later installed and configured. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI][install-azure-cli].
2533

articles/azure-functions/functions-bindings-rabbitmq-output.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ Here's JavaScript code:
149149

150150
```javascript
151151
module.exports = function (context, input) {
152-
context.bindings.myQueueItem = input.body;
152+
context.bindings.outputMessage = input.body;
153153
context.done();
154154
};
155155
```

articles/azure-resource-manager/bicep/bicep-functions-scope.md

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Bicep functions - scopes
33
description: Describes the functions to use in a Bicep file to retrieve values about deployment scopes.
44
ms.topic: conceptual
5-
ms.date: 10/18/2021
5+
ms.date: 11/23/2021
66
---
77

88
# Scope functions for Bicep
@@ -13,14 +13,12 @@ This article describes the Bicep functions for getting scope values.
1313

1414
`managementGroup()`
1515

16+
Returns an object with properties from the management group in the current deployment.
17+
1618
`managementGroup(identifier)`
1719

1820
Returns an object used for setting the scope to a management group.
1921

20-
Or
21-
22-
Returns an object with properties from the management group in the current deployment.
23-
2422
Namespace: [az](bicep-functions.md#namespaces-for-functions).
2523

2624
### Remarks
@@ -46,7 +44,7 @@ The following example sets the scope for a module to a management group.
4644
```bicep
4745
param managementGroupIdentifier string
4846
49-
module 'module.bicep' = {
47+
module 'mgModule.bicep' = {
5048
name: 'deployToMG'
5149
scope: managementGroup(managementGroupIdentifier)
5250
}
@@ -115,15 +113,15 @@ output newManagementGroup string = mgName
115113

116114
`resourceGroup()`
117115

118-
`resourceGroup(resourceGroupName)`
116+
Returns an object that represents the current resource group.
119117

120-
`resourceGroup(subscriptionId, resourceGroupName)`
118+
`resourceGroup(resourceGroupName)`
121119

122-
Returns an object used for setting the scope to a resource group.
120+
And
123121

124-
Or
122+
`resourceGroup(subscriptionId, resourceGroupName)`
125123

126-
Returns an object that represents the current resource group.
124+
Return an object used for setting the scope to a resource group.
127125

128126
Namespace: [az](bicep-functions.md#namespaces-for-functions).
129127

@@ -172,7 +170,7 @@ The following example scopes a module to a resource group.
172170
```bicep
173171
param resourceGroupName string
174172
175-
module exampleModule 'module.bicep' = {
173+
module exampleModule 'rgModule.bicep' = {
176174
name: 'exampleModule'
177175
scope: resourceGroup(resourceGroupName)
178176
}
@@ -210,14 +208,12 @@ You can also use the resourceGroup function to apply tags from the resource grou
210208

211209
`subscription()`
212210

211+
Returns details about the subscription for the current deployment.
212+
213213
`subscription(subscriptionId)`
214214

215215
Returns an object used for setting the scope to a subscription.
216216

217-
Or
218-
219-
Returns details about the subscription for the current deployment.
220-
221217
Namespace: [az](bicep-functions.md#namespaces-for-functions).
222218

223219
### Remarks
@@ -254,7 +250,7 @@ When used for getting details about the subscription, the function returns the f
254250
The following example scopes a module to the subscription.
255251

256252
```bicep
257-
module exampleModule 'module.bicep' = {
253+
module exampleModule 'subModule.bicep' = {
258254
name: 'deployToSub'
259255
scope: subscription()
260256
}
@@ -291,7 +287,7 @@ An object used for setting the `scope` property on a [module](modules.md#set-mod
291287
The following example shows a module deployed to the tenant.
292288

293289
```bicep
294-
module exampleModule 'module.bicep' = {
290+
module exampleModule 'tenantModule.bicep' = {
295291
name: 'deployToTenant'
296292
scope: tenant()
297293
}

articles/cognitive-services/Speech-Service/how-to-configure-rhel-centos-7.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: How to configure RHEL/CentOS 7 - Speech service
2+
title: How to configure RHEL/CentOS for C++ - Speech service
33
titleSuffix: Azure Cognitive Services
44
description: Learn how to configure RHEL/CentOS 7 so that the Speech SDK can be used.
55
services: cognitive-services
@@ -12,11 +12,11 @@ ms.date: 04/02/2020
1212
ms.author: pankopon
1313
---
1414

15-
# Configure RHEL/CentOS 7 for Speech SDK
15+
# Configure RHEL/CentOS for C++
1616

1717
To use the Speech SDK for C++ development on Red Hat Enterprise Linux (RHEL) 8 x64 and CentOS 8 x64, update the C++ compiler and the shared C++ runtime library on your system.
1818

19-
### 1. General setup
19+
## Install dependencies
2020

2121
First install all general dependencies:
2222

@@ -30,7 +30,7 @@ sudo yum install -y alsa-lib dotnet-sdk-2.1 java-1.8.0-openjdk-devel openssl
3030
sudo yum install -y gstreamer1 gstreamer1-plugins-base gstreamer1-plugins-good gstreamer1-plugins-bad-free gstreamer1-plugins-ugly-free
3131
```
3232

33-
### 2. C/C++ compiler and runtime libraries
33+
## C/C++ compiler and runtime libraries
3434

3535
Install the prerequisite packages with this command:
3636

@@ -52,7 +52,7 @@ sudo make install-strip
5252

5353
If the updated compiler and libraries need to be deployed on several machines, you can simply copy them from under `/usr/local` to other machines. If only the runtime libraries are needed then the files in `/usr/local/lib64` will be enough.
5454

55-
### 3. Environment settings
55+
## Environment settings
5656

5757
Run the following commands to complete the configuration:
5858

@@ -69,7 +69,6 @@ export LD_LIBRARY_PATH=/usr/local/lib64:$LD_LIBRARY_PATH
6969
export PATH=/usr/local/bin:$PATH
7070
hash -r # reset cached paths in the current shell session just in case
7171
export LD_LIBRARY_PATH=/path/to/extracted/SpeechSDK-Linux-<version>/lib/x64:$LD_LIBRARY_PATH
72-
7372
```
7473

7574
## Next steps

0 commit comments

Comments
 (0)