Skip to content

Commit fdce35a

Browse files
authored
Merge pull request #152913 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents cd595a8 + fa4ee8e commit fdce35a

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

articles/active-directory/hybrid/how-to-connect-selective-password-hash-synchronization.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ To reduce the configuration administrative effort, you should first consider the
3636
> Configuring selective password hash synchronization directly influences password writeback. Password changes or password resets that are initiated in Azure Active Directory write back to on-premises Active Directory only if the user is in scope for password hash synchronization.
3737
3838
### The adminDescription attribute
39-
Both scenarios rely on setting the adminDescription attribute of users to a specific value. This allows the the rules to be applied and is what makes selective PHS work.
39+
Both scenarios rely on setting the adminDescription attribute of users to a specific value. This allows the rules to be applied and is what makes selective PHS work.
4040

4141
|Scenario|adminDescription value|
4242
|-----|-----|
@@ -78,7 +78,7 @@ The following section describes how to enable selective password hash synchroniz
7878
- Set the attribute value, in active directory, that was defined as scoping attribute on the users you want to allow in password hash synchronization.
7979

8080
>[!Important]
81-
>The steps provided to configure selective password hash synchronization will only effect user objects that have
81+
>The steps provided to configure selective password hash synchronization will only affect user objects that have
8282
the attribute **adminDescription** populated in Active Directory with the value of **PHSFiltered**.
8383
>If this attribute is not populated or the value is something other than **PHSFiltered** then these rules will not be applied to the user objects.
8484
@@ -92,7 +92,7 @@ the attribute **adminDescription** populated in Active Directory with the value
9292
3. The first rule will disable password hash sync.
9393
Provide the following name to the new custom rule: **In from AD - User AccountEnabled - Filter Users from PHS**.
9494
Change the precedence value to a number lower than 100 (for example **90** or whichever is the lowest value available in your environment).
95-
Make sure the checkboxes **Enable Password Sync** and **Disabled** are unchecked and c.
95+
Make sure the checkboxes **Enable Password Sync** and **Disabled** are unchecked.
9696
Click **Next**.
9797
![Edit inbound](media/how-to-connect-selective-password-hash-synchronization/exclude-3.png)
9898
4. In **Scoping filter**, click **Add clause**.
@@ -152,7 +152,7 @@ The following is a summary of the actions that will be taken in the steps below:
152152
- Set the attribute value, in active directory, that was defined as scoping attribute on the users you want to allow in password hash synchronization.
153153

154154
>[!Important]
155-
>The steps provided to configure selective password hash synchronization will only effect user objects that have
155+
>The steps provided to configure selective password hash synchronization will only affect user objects that have
156156
the attribute **adminDescription** populated in Active Directory with the value of **PHSIncluded**.
157157
>If this attribute is not populated or the value is something other than **PHSIncluded** then these rules will not be applied to the user objects.
158158

articles/azure-signalr/signalr-resource-faq.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ For new applications, only default and serverless mode should be used. The main
5757

5858
Classic mode is designed for backward compatibility for existing applications so should not be used for new applications.
5959

60-
For more information about service mode in [this doc](concept-service-mode.md).
60+
For more information about service mode, see [Service mode in Azure SignalR Service](concept-service-mode.md).
6161

6262
## Can I send message from client in serverless mode?
6363

6464
You can send message from client if you configure upstream in your SignalR instance. Upstream is a set of endpoints that can receive messages and connection events from SignalR service. If no upstream is configured, messages from client will be ignored.
6565

66-
For more information about upstream see [this doc](concept-upstream.md).
66+
For more information about upstream, see [Upstream settings](concept-upstream.md).
6767

6868
Upstream is currently in public preview.
6969

@@ -82,4 +82,4 @@ You can configure Azure SignalR Service for different service modes: `Classic`,
8282

8383
## Where does my data reside?
8484

85-
Azure SignalR Service works as a data processor service. It won't store any customer content, and data residency is included by design. If you use Azure SignalR Service together with other Azure services, like Azure Storage for diagnostics, see [this white paper](https://azure.microsoft.com/resources/achieving-compliant-data-residency-and-security-with-azure/) for guidance about how to keep data residency in Azure regions.
85+
Azure SignalR Service works as a data processor service. It won't store any customer content, and data residency is included by design. If you use Azure SignalR Service together with other Azure services, like Azure Storage for diagnostics, see [this white paper](https://azure.microsoft.com/resources/achieving-compliant-data-residency-and-security-with-azure/) for guidance about how to keep data residency in Azure regions.

articles/certification/program-requirements-edge-secured-core.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Edge Secured-core is an incremental certification in the Azure Certified Device
4141
|Name|SecuredCore.Encryption.Storage|
4242
|:---|:---|
4343
|Status|Required|
44-
|Description|The purpose of the test to validate that sensitive data can be encrypted on non-volitile storage.|
44+
|Description|The purpose of the test to validate that sensitive data can be encrypted on non-volatile storage.|
4545
|Target Availability|2021|
4646
|Applies To|Any device|
4747
|OS|Agnostic|

articles/container-registry/container-registry-tasks-multi-step.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ steps:
6060
build: -t $Registry/hello-world:$ID .
6161
when: ["-"]
6262
- id: build-tests
63-
build -t $Registry/hello-world-tests ./funcTests
63+
build: -t $Registry/hello-world-tests ./funcTests
6464
when: ["-"]
6565
- id: push
6666
push: ["$Registry/helloworld:$ID"]
@@ -161,4 +161,4 @@ You can find multi-step task reference and examples here:
161161
<!-- LINKS - Internal -->
162162
[az-acr-task-create]: /cli/azure/acr/task#az-acr-task-create
163163
[az-acr-run]: /cli/azure/acr#az-acr-run
164-
[az-acr-task]: /cli/azure/acr/task
164+
[az-acr-task]: /cli/azure/acr/task

articles/virtual-machines/windows/disks-upload-vhd-to-managed-disk-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ To upload your VHD to Azure, you'll need to create an empty managed disk that is
2929

3030
This kind of managed disk has two unique states:
3131

32-
- ReadToUpload, which means the disk is ready to receive an upload but, no [secure access signature](../../storage/common/storage-sas-overview.md) (SAS) has been generated.
32+
- ReadyToUpload, which means the disk is ready to receive an upload but, no [secure access signature](../../storage/common/storage-sas-overview.md) (SAS) has been generated.
3333
- ActiveUpload, which means that the disk is ready to receive an upload and the SAS has been generated.
3434

3535
> [!NOTE]

0 commit comments

Comments
 (0)