Skip to content

Commit b674270

Browse files
authored
Merge pull request #212357 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 9773be9 + bf85676 commit b674270

File tree

7 files changed

+61
-51
lines changed

7 files changed

+61
-51
lines changed

articles/active-directory/hybrid/how-to-connect-staged-rollout.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ The following scenarios are not supported for Staged Rollout:
8686

8787
- When you first add a security group for Staged Rollout, you're limited to 200 users to avoid a UX time-out. After you've added the group, you can add more users directly to it, as required.
8888

89-
- While users are in Staged Rollout with Password Hash Synchronization (PHS), by default no password expiration is applied. Password expiration can be applied by enabling "EnforceCloudPasswordPolicyForPasswordSyncedUsers". When "EnforceCloudPasswordPolicyForPasswordSyncedUsers" is enabled, password expiration policy is set to 90 days from the time password was set on-prem with no option to customize it. To learn how to set 'EnforceCloudPasswordPolicyForPasswordSyncedUsers' see [Password expiration policy](./how-to-connect-password-hash-synchronization.md#enforcecloudpasswordpolicyforpasswordsyncedusers).
89+
- While users are in Staged Rollout with Password Hash Synchronization (PHS), by default no password expiration is applied. Password expiration can be applied by enabling "EnforceCloudPasswordPolicyForPasswordSyncedUsers". When "EnforceCloudPasswordPolicyForPasswordSyncedUsers" is enabled, password expiration policy is set to 90 days from the time password was set on-prem with no option to customize it. Programatically updating PasswordPolicies attribute is not supported while users are in Staged Rollout. To learn how to set 'EnforceCloudPasswordPolicyForPasswordSyncedUsers' see [Password expiration policy](./how-to-connect-password-hash-synchronization.md#enforcecloudpasswordpolicyforpasswordsyncedusers).
9090

9191
- Windows 10 Hybrid Join or Azure AD Join primary refresh token acquisition for Windows 10 version older than 1903. This scenario will fall back to the WS-Trust endpoint of the federation server, even if the user signing in is in scope of Staged Rollout.
9292

articles/active-directory/hybrid/how-to-upgrade-previous-version.md

Lines changed: 50 additions & 43 deletions
Large diffs are not rendered by default.

articles/active-directory/hybrid/plan-connect-userprincipalname.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ When the updates to a user object are synchronized to the Azure AD Tenant, Azure
7676
>Azure AD recalculates the UserPrincipalName attribute value only in case an update to the on-premises UserPrincipalName attribute/Alternate login ID value is synchronized to the Azure AD Tenant.
7777
>
7878
>Whenever Azure AD recalculates the UserPrincipalName attribute, it also recalculates the MOERA.
79+
>
80+
>In case of verified domain change, Azure AD also recalculates the UserPrincipalName attribute. For more information, see [Troubleshoot: Audit data on verified domain change](https://docs.microsoft.com/azure/active-directory/reports-monitoring/troubleshoot-audit-data-verified-domain)
7981
8082
## UPN scenarios
8183
The following are example scenarios of how the UPN is calculated based on the given scenario.

articles/batch/batch-pool-vm-sizes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ For each VM series, the following table also lists whether the VM series and VM
5959
| NCv2 | All sizes |
6060
| NCv3 | All sizes |
6161
| NCasT4_v3 | All sizes |
62+
| NC_A100_v4 | All sizes |
6263
| ND | All sizes |
6364
| NDv4 | All sizes |
6465
| NDv2 | None - not yet available |

articles/healthcare-apis/register-application-cli-rest.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ Choose a name for the secret and specify the expiration duration. The default is
8989
###Add client secret with expiration. The default is one year.
9090
clientsecretname=mycert2
9191
clientsecretduration=2
92-
clientsecret=$(az ad app credential reset --id $clientid --append --credential-description $clientsecretname --years $clientsecretduration --query password --output tsv)
92+
clientsecret=$(az ad app credential reset --id $clientid --append --display-name $clientsecretname --years $clientsecretduration --query password --output tsv)
9393
echo $clientsecret
9494
```
9595

articles/storage/tables/table-storage-design.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Design scalable and performant tables in Azure table storage. | Microsoft Docs
3-
description: Learn to design scalable and performant tables in Azure table storage. Review table partitions, Entity Group Transactions, and capacity and cost considerations.
2+
title: Design scalable and performant tables in Azure Table storage. | Microsoft Docs
3+
description: Learn to design scalable and performant tables in Azure Table storage. Review table partitions, Entity Group Transactions, and capacity and cost considerations.
44
services: storage
55
ms.service: storage
66
author: tamram
@@ -148,4 +148,4 @@ Table storage is relatively inexpensive, but you should include cost estimates f
148148
- [Modeling relationships](table-storage-design-modeling.md)
149149
- [Design for querying](table-storage-design-for-query.md)
150150
- [Encrypting Table Data](table-storage-design-encrypt-data.md)
151-
- [Design for data modification](table-storage-design-for-modification.md)
151+
- [Design for data modification](table-storage-design-for-modification.md)

articles/virtual-machines/constrained-vcpu.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ ms.author: mimckitt
1616
> [!TIP]
1717
> Try the **[Virtual Machine selector tool](https://aka.ms/vm-selector)** to find other sizes that best fit your workload.
1818
19-
Some database workloads like SQL Server require high memory, storage, and I/O bandwidth, but not a high core count. Many database workloads are not CPU-intensive. Azure offers certain VM sizes where you can lower the VM vCPU count to reduce the cost of software licensing, while maintaining the same memory, storage, and I/O bandwidth.
19+
Some database workloads like SQL Server require high memory, storage, and I/O bandwidth, but not a high number of cores. Many database workloads are not CPU-intensive. Azure offers pre-defined VM sizes with lower vCPU count which can help to reduce the cost of software licensing, while maintaining the same memory, storage, and I/O bandwidth.
2020

2121
The available vCPU count can be reduced to one half or one quarter of the original VM specification. These new VM sizes have a suffix that specifies the number of available vCPUs to make them easier for you to identify. There are no additional cores available that can be used by the VM.
2222

23-
For example, the current VM size Standard_E32s_v5 comes with 32 vCPUs, 256 GiB RAM, 32 disks, and 80,000 IOPs or 2 GB/s of I/O bandwidth. The new VM sizes Standard_E32-16s_v5 and Standard_E32-8s_v5 comes with 16 and 8 active vCPUs respectively, while maintaining the rest of the specs of the Standard_E32s_v5 for memory, storage, and I/O bandwidth.
23+
For example, the Standard_E32s_v5 VM size comes with 32 vCPUs, 256 GiB RAM, 32 disks, and 80,000 IOPs or 2 GB/s of I/O bandwidth. The pre-defined Standard_E32-16s_v5 and Standard_E32-8s_v5 VM sizes comes with 16 and 8 active vCPUs respectively, while maintaining the memory, storage, and I/O bandwidth specifications of the Standard_E32s_v5.
2424

25-
The licensing fees charged for SQL Server are based on the avaialble vCPU count. Third party products should count the available vCPU which represents the max to be used and licensed. This results in a 50% to 75% increase in the ratio of the VM specs to available (billable) vCPUs. These new VM sizes allow customer workloads to use the same memory, storage, and I/O bandwidth while optimizing their software licensing cost. At this time, the compute cost, which includes OS licensing, remains the same one as the original size. For more information, see [Azure VM sizes for more cost-effective database workloads](https://azure.microsoft.com/blog/announcing-new-azure-vm-sizes-for-more-cost-effective-database-workloads/).
25+
The licensing fees charged for SQL Server are based on the avaialble vCPU count. Third party products should count the available vCPU which represents the max to be used and licensed. This results in a 50% to 75% increase in the ratio of the VM specs to available (billable) vCPUs. At this time, the VM pricing, which includes OS licensing, remains the same as the original size. For more information, see [Azure VM sizes for more cost-effective database workloads](https://azure.microsoft.com/blog/announcing-new-azure-vm-sizes-for-more-cost-effective-database-workloads/).
2626

2727

2828
| Name | vCPU | Specs |

0 commit comments

Comments
 (0)