Skip to content

Commit 24b3924

Browse files
authored
Merge pull request #190948 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 4cc98e4 + f3de2d0 commit 24b3924

File tree

9 files changed

+14
-10
lines changed

9 files changed

+14
-10
lines changed

articles/active-directory/authentication/tutorial-enable-sspr-writeback.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Password policies in the on-premises AD DS environment may prevent password rese
9191
If you update the group policy, wait for the updated policy to replicate, or use the `gpupdate /force` command.
9292

9393
> [!Note]
94-
> For passwords to be changed immediately, *Minimum password age* must be set to 0. However, if users adhere to the on-premises policies, and the *Minimum password age* is set to a value greater than zero, password writeback still works after the on-premises policies are evaluated.
94+
> If you need to allow users to change or reset passwords more than one time per day, *Minimum password age* must be set to 0. Password writeback will work after on-premises password policies are successfully evaluated.
9595
9696
## Enable password writeback in Azure AD Connect
9797

articles/aks/node-auto-repair.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ If AKS identifies an unhealthy node that remains unhealthy for 10 minutes, AKS t
3535

3636
1. Reboot the node.
3737
1. If the reboot is unsuccessful, reimage the node.
38+
1. If the reimage is unsuccessful, redploy the node.
3839

3940
Alternative remediations are investigated by AKS engineers if auto-repair is unsuccessful.
4041

articles/application-gateway/key-vault-certs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ Application Gateway supports certificates referenced in Key Vault via the Role-b
124124
> [!Note]
125125
> Specifying Azure Key Vault certificates that are subject to the role-based access control permission model is not supported via the portal.
126126
127-
In this example, we’ll use PowerShell to reference a new Key Vault certificate.
127+
In this example, we’ll use PowerShell to reference a new Key Vault secret.
128128
```
129129
# Get the Application Gateway we want to modify
130130
$appgw = Get-AzApplicationGateway -Name MyApplicationGateway -ResourceGroupName MyResourceGroup

articles/azure-functions/functions-create-function-linux-custom-image.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ A function app on Azure manages the execution of your functions in your hosting
514514
1. The function can now use this connection string to access the storage account.
515515

516516
> [!NOTE]
517-
> If you publish your custom image to a private container account, you should use environment variables in the Dockerfile for the connection string instead. For more information, see the [ENV instruction](https://docs.docker.com/engine/reference/builder/#env). You should also set the variables `DOCKER_REGISTRY_SERVER_USERNAME` and `DOCKER_REGISTRY_SERVER_PASSWORD`. To use the values, then, you must rebuild the image, push the image to the registry, and then restart the function app on Azure.
517+
> If you publish your custom image to a private container registry, you should use environment variables in the Dockerfile for the connection string instead. For more information, see the [ENV instruction](https://docs.docker.com/engine/reference/builder/#env). You should also set the variables `DOCKER_REGISTRY_SERVER_USERNAME` and `DOCKER_REGISTRY_SERVER_PASSWORD`. To use the values, then, you must rebuild the image, push the image to the registry, and then restart the function app on Azure.
518518

519519
## Verify your functions on Azure
520520

articles/cognitive-services/LUIS/luis-reference-regions.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ A public app is published in all regions so that a user with a supported predect
4545

4646
When you first create our LUIS application, you are required to choose an [authoring region](#luis-authoring-regions). To use the application in runtime, you are required to create a resource in a publishing region.
4747

48-
Your app can only be published to one of its corresponding authoring regions, which are listed in the tables below. If your app is currently in the wrong authoring region, export the app, and import it into the correct authoring region to match the required publishing region.
48+
Every authoring region has corresponding prediction regions that you can publish your application to, which are listed in the tables below. If your app is currently in the wrong authoring region, export the app, and import it into the correct authoring region to match the required publishing region.
49+
4950

5051
## Single data residency
5152

articles/communication-services/concepts/join-teams-meeting.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ Microsoft will indicate to you via the Azure Communication Services API that rec
5050
## Limitations and known issues
5151

5252
- Communication Services users can join a Teams meeting that is scheduled for a Teams channel and use audio and video, but they won't be able to send or receive any chat messages because they aren't members of the channel.
53+
- Communication Services users can join a Teams meeting and use video, but they won't be able to apply background effects.
5354
- Communication Services users may join a Teams webinar, but the presenter and attendee roles aren't currently enforced, thus Communication Services users could perform actions not intended for attendees, such as screen sharing, turning their camera on/off, or unmuting themselves, if your application provides UX for those actions.
5455
- When using Microsoft Graph to [list the participants in a Teams meeting](/graph/api/call-list-participants), details for Communication Services users are not currently included.
5556
- PowerPoint presentations aren't rendered for Communication Services users.

articles/dns/dns-zones-records.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ The zone serial number in the SOA record isn't updated automatically when change
9494

9595
TXT records are used to map domain names to arbitrary text strings. They're used in multiple applications, in particular related to email configuration, such as the [Sender Policy Framework (SPF)](https://en.wikipedia.org/wiki/Sender_Policy_Framework) and [DomainKeys Identified Mail (DKIM)](https://en.wikipedia.org/wiki/DomainKeys_Identified_Mail).
9696

97-
The DNS standards permit a single TXT record to contain multiple strings, each of which may be up to 254 characters in length. Where multiple strings are used, they are concatenated by clients and treated as a single string.
97+
The DNS standards permit a single TXT record to contain multiple strings, each of which may be up to 255 characters in length. Where multiple strings are used, they are concatenated by clients and treated as a single string.
9898

99-
When calling the Azure DNS REST API, you need to specify each TXT string separately. When using the Azure portal, PowerShell or CLI interfaces you should specify a single string per record, which is automatically divided into 254-character segments if necessary.
99+
When calling the Azure DNS REST API, you need to specify each TXT string separately. When using the Azure portal, PowerShell or CLI interfaces you should specify a single string per record, which is automatically divided into 255-character segments if necessary.
100100

101101
The multiple strings in a DNS record shouldn't be confused with the multiple TXT records in a TXT record set. A TXT record set can contain multiple records, *each of which* can contain multiple strings. Azure DNS supports a total string length of up to 1024 characters in each TXT record set (across all records combined).
102102

@@ -139,4 +139,4 @@ The following default limits apply when using Azure DNS:
139139
## Next steps
140140

141141
* To start using Azure DNS, learn how to [create a DNS zone](./dns-getstarted-portal.md) and [create DNS records](./dns-getstarted-portal.md).
142-
* To migrate an existing DNS zone, learn how to [import and export a DNS zone file](dns-import-export.md).
142+
* To migrate an existing DNS zone, learn how to [import and export a DNS zone file](dns-import-export.md).

articles/expressroute/expressroute-qos.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ The following table provides a list of DSCP markings used by Microsoft Teams and
3232

3333
* You should classify the workloads and mark the right DSCP values. Follow the guidance provided [here](/SkypeForBusiness/manage/network-management/qos/configuring-port-ranges-for-your-skype-clients#configure-quality-of-service-policies-for-clients-running-on-windows-10) on how to set DSCP markings in your network.
3434
* You should configure and support multiple QoS queues within your network. Voice must be a standalone class and receive the EF treatment specified in [RFC 3246](https://www.ietf.org/rfc/rfc3246.txt).
35-
* You can decide the queuing mechanism, congestion detection policy, and bandwidth allocation per traffic class. But, the DSCP marking for Skype for Business workloads must be preserved. If you are using DSCP markings not listed above, e.g. AF31 (26), you must rewrite this DSCP value to 0 before sending the packet to Microsoft. Microsoft only sends packets marked with the DSCP value shown in the above table.
35+
* You can decide the queuing mechanism, congestion detection policy, and bandwidth allocation per traffic class. But, the DSCP marking for Skype for Business workloads must be preserved.
36+
* If you use DSCP markings that aren't listed in the table, such as AF31 (26), you must rewrite the DSCP value to 0 before you send the packet to Microsoft. Microsoft only sends packets marked with DSCP values shown in the table.
3637

3738
## Next steps
3839
* Refer to the requirements for [Routing](expressroute-routing.md) and [NAT](expressroute-nat.md).

articles/synapse-analytics/sql/resource-consumption-models.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ Increasing DWUs:
4444

4545
### Service Level Objective
4646

47-
The Service Level Objective (SLO) is the scalability setting that determines the cost and performance level of your data warehouse. The service levels for Gen2 are measured in compute data warehouse units (cDWU), for example DW2000c. Gen1 service levels are measured in DWUs, for example DW2000.
47+
The Service Level Objective (SLO) is the scalability setting that determines the cost and performance level of your data warehouse. The service levels for Gen2 are measured in compute data warehouse units (cDWU), for example DW2000c. Gen1 service levels are measured in DWUs, for example DW2000.
4848

49-
The Service Level Objective (SLO) is the scalability setting that determines the cost and performance level of your data warehouse. The service levels for Gen2 dedicated SQL pool are measured in data warehouse units (DWU), for example DW2000c.
49+
The Service Level Objective (SLO) is the scalability setting that determines the cost and performance level of your data warehouse. The service levels for Gen2 dedicated SQL pool are measured in data warehouse units (DWU), for example DW2000c.
5050

5151
> [!NOTE]
5252
> Azure Synapse Analytics Gen2 recently added additional scale capabilities to support compute tiers as low as 100 cDWU. Existing data warehouses currently on Gen1 that require the lower compute tiers can now upgrade to Gen2 in the regions that are currently available for no additional cost. If your region is not yet supported, you can still upgrade to a supported region. For more information, see [Upgrade to Gen2](../sql-data-warehouse/upgrade-to-latest-generation.md?context=/azure/synapse-analytics/context/context).

0 commit comments

Comments
 (0)