Skip to content

Commit 1fee199

Browse files
authored
Merge pull request #202531 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents a63edfb + 7051e59 commit 1fee199

File tree

5 files changed

+22
-3
lines changed

5 files changed

+22
-3
lines changed

articles/active-directory-b2c/add-password-reset-policy.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,8 @@ Declare your claims in the [claims schema](claimsschema.md). Open the extensions
130130
</BuildingBlocks> -->
131131
```
132132

133-
A claims transformation technical profile initiates the **isForgotPassword** claim. The technical profile is referenced later. When invoked, it sets the value of the **isForgotPassword** claim to `true`. Find the **ClaimsProviders** element. If the element doesn't exist, add it. Then add the following claims provider:
133+
### Add the technical profiles
134+
A claims transformation technical profile accesses the `isForgotPassword` claim. The technical profile is referenced later. When it's invoked, it sets the value of the `isForgotPassword` claim to `true`. Find the **ClaimsProviders** element (if the element doesn't exist, create it), and then add the following claims provider:
134135

135136
```xml
136137
<!--
@@ -151,6 +152,9 @@ A claims transformation technical profile initiates the **isForgotPassword** cla
151152
<Item Key="setting.forgotPasswordLinkOverride">ForgotPasswordExchange</Item>
152153
</Metadata>
153154
</TechnicalProfile>
155+
<TechnicalProfile Id="LocalAccountWritePasswordUsingObjectId">
156+
<UseTechnicalProfileForSessionManagement ReferenceId="SM-AAD" />
157+
</TechnicalProfile>
154158
</TechnicalProfiles>
155159
</ClaimsProvider>
156160
<!--
@@ -159,6 +163,8 @@ A claims transformation technical profile initiates the **isForgotPassword** cla
159163

160164
The **SelfAsserted-LocalAccountSignin-Email** technical profile **setting.forgotPasswordLinkOverride** defines the password reset claims exchange that executes in your user journey.
161165

166+
The **LocalAccountWritePasswordUsingObjectId** technical profile **UseTechnicalProfileForSessionManagement** `SM-AAD` session manager is required for the user to preform subsequent logins successfully under [SSO](./custom-policy-reference-sso.md) conditions.
167+
162168
### Add the password reset sub journey
163169

164170
The user can now sign in, sign up, and perform password reset in your user journey. To better organize the user journey, you can use a [sub journey](subjourneys.md) to handle the password reset flow.

articles/active-directory-b2c/configure-authentication-sample-spa-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ In your own environment, if your SPA app uses MSAL.js 1.3 or earlier and the imp
101101

102102
1. In the left menu, under **Manage**, select **Authentication**.
103103

104-
1. Under **Implicit grant and hybrid flows**, select both the **Access tokens (used for implicit flows)** and **D tokens (used for implicit and hybrid flows)** check boxes.
104+
1. Under **Implicit grant and hybrid flows**, select both the **Access tokens (used for implicit flows)** and **ID tokens (used for implicit and hybrid flows)** check boxes.
105105

106106
1. Select **Save**.
107107

articles/azure-netapp-files/azure-netapp-files-resize-capacity-pools-or-volumes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ For information about monitoring a volume’s capacity, see [Monitor the capacit
2222

2323
## Resize the capacity pool using the Azure portal
2424

25-
You can change the capacity pool size in 1-TiB increments or decrements. However, the capacity pool size cannot be smaller than 4 TiB. Resizing the capacity pool changes the purchased Azure NetApp Files capacity.
25+
You can change the capacity pool size in 1-TiB increments or decrements. However, the capacity pool size cannot be smaller than the sum of the capacity of the volumes hosted in the pool, with a minimum of 4TiB. Resizing the capacity pool changes the purchased Azure NetApp Files capacity.
2626

2727
1. From the NetApp Account view, go to **Capacity pools**, and click the capacity pool that you want to resize.
2828
2. Right-click the capacity pool name or click the "…" icon at the end of the capacity pool row to display the context menu. Click **Resize**.

articles/connectors/connectors-native-http.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,16 @@ For example, if you're working in Visual Studio Code, follow these steps:
155155
}
156156
```
157157

158+
> [!NOTE]
159+
>
160+
> To find the thumbprint, follow these steps:
161+
>
162+
> 1. On your logic app resource menu, under **Settings**, select **TLS/SSL settings** > **Private Key Certificates (.pfx)** or **Public Key Certificates (.cer)**.
163+
>
164+
> 2. Find the certificate that you want to use, and copy the thumbprint.
165+
>
166+
> For more information, review [Find the thumbprint - Azure App Service](../app-service/configure-ssl-certificate-in-code.md#find-the-thumbprint).
167+
158168
For more information, review the following documentation:
159169

160170
* [Edit host and app settings for logic apps in single-tenant Azure Logic Apps](../logic-apps/edit-app-settings-host-settings.md#manage-app-settings)

articles/storage/blobs/secure-file-transfer-protocol-support-how-to.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,9 @@ You can use any SFTP client to securely connect and then transfer files. The fol
247247
> [!div class="mx-imgBorder"]
248248
> ![Connect with Open SSH](./media/secure-file-transfer-protocol-support-how-to/ssh-connect-and-transfer.png)
249249
250+
> [!NOTE]
251+
> The SFTP username is `storage_account_name`.`username`. In the example above the `storage_account_name` is "contoso4" and the `username` is "contosouser." The combined username becomes `contoso4.contosouser` for the SFTP command.
252+
250253
> [!NOTE]
251254
> You might be prompted to trust a host key. During the public preview, valid host keys are published [here](secure-file-transfer-protocol-host-keys.md).
252255

0 commit comments

Comments
 (0)