Skip to content

Commit e5ccd97

Browse files
authored
Merge pull request #229586 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 14a5568 + 76461de commit e5ccd97

15 files changed

+49
-42
lines changed

articles/active-directory/authentication/concept-sspr-writeback.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Password writeback provides the following features:
3838
* **Supports side-by-side domain-level deployment** using [Azure AD Connect](tutorial-enable-sspr-writeback.md) or [cloud sync](tutorial-enable-cloud-sync-sspr-writeback.md) to target different sets of users depending on their needs, including users who are in disconnected domains.
3939

4040
> [!NOTE]
41-
> Administrator accounts that exist within protected groups in on-premises AD can be used with password writeback. Administrators can change their password in the cloud but can't reset a forgotten password. For more information about protected groups, see [Protected accounts and groups in AD DS](/windows-server/identity/ad-ds/plan/security-best-practices/appendix-c--protected-accounts-and-groups-in-active-directory).
41+
> The on-premises service account that handles password write-back requests cannot change the passwords for users that belong to protected groups. Administrators can change their password in the cloud but they cannot use password write-back to reset a forgotten password for their on-premises user. For more information about protected groups, see [Protected accounts and groups in AD DS](/windows-server/identity/ad-ds/plan/security-best-practices/appendix-c--protected-accounts-and-groups-in-active-directory).
4242
4343
To get started with SSPR writeback, complete either one or both of the following tutorials:
4444

articles/active-directory/authentication/howto-authentication-passwordless-troubleshoot.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,20 +98,20 @@ The following events logs and registry key info is collected:
9898

9999
### Deployment Issues
100100

101-
To troubleshoot issues with deploying the Azure AD Kerberos Server, use the new PowerShell module included with Azure AD Connect.
101+
To troubleshoot issues with deploying the Azure AD Kerberos Server, use the logs for the new [AzureADHybridAuthenticationManagement](https://www.powershellgallery.com/packages/AzureADHybridAuthenticationManagement) PowerShell module.
102102

103103
#### Viewing the logs
104104

105-
The Azure AD Kerberos Server PowerShell cmdlets use the same logging as the standard Azure AD Connect Wizard. To view information or error details from the cmdlets, complete the following steps:
105+
The Azure AD Kerberos Server PowerShell cmdlets in the [AzureADHybridAuthenticationManagement](https://www.powershellgallery.com/packages/AzureADHybridAuthenticationManagement) module use the same logging as the standard Azure AD Connect Wizard. To view information or error details from the cmdlets, complete the following steps:
106106

107-
1. On the Azure AD Connect Server, browse to `C:\ProgramData\AADConnect\`. This folder is hidden by default.
107+
1. On the machine where the [AzureADHybridAuthenticationManagement](https://www.powershellgallery.com/packages/AzureADHybridAuthenticationManagement) module was used, browse to `C:\ProgramData\AADConnect\`. This folder is hidden by default.
108108
1. Open and view the most recent `trace-*.log` file located in the directory.
109109

110110
#### Viewing the Azure AD Kerberos Server Objects
111111

112112
To view the Azure AD Kerberos Server Objects and verify they are in good order, complete the following steps:
113113

114-
1. On the Azure AD Connect Server, open PowerShell and navigate to `C:\Program Files\Microsoft Azure Active Directory Connect\AzureADKerberos\`
114+
1. On the Azure AD Connect Server or any other machine where the [AzureADHybridAuthenticationManagement](https://www.powershellgallery.com/packages/AzureADHybridAuthenticationManagement) module is installed, open PowerShell and navigate to `C:\Program Files\Microsoft Azure Active Directory Connect\AzureADKerberos\`
115115
1. Run the following PowerShell commands to view the Azure AD Kerberos Server from both Azure AD and on-premises AD DS.
116116

117117
Replace *corp.contoso.com* with the name of your on-premises AD DS domain.

articles/azure-resource-manager/bicep/child-resource-name-type.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ The **full name** of the child resource uses the pattern:
2929
{parent-resource-name}/{child-resource-name}
3030
```
3131

32-
If you have more two levels in the hierarchy, keep repeating parent names:
32+
If you have more than two levels in the hierarchy, keep repeating parent names:
3333

3434
```bicep
3535
{parent-resource-name}/{child-level1-resource-name}/{child-level2-resource-name}

articles/bastion/connect-native-client-windows.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,9 @@ Use the example that corresponds to the type of target VM to which you want to c
141141
az network bastion rdp --name "<BastionName>" --resource-group "<ResourceGroupName>" --target-resource-id "<VMResourceId>"
142142
```
143143

144+
> [!IMPORTANT]
145+
> Remote connection to VMs that are joined to Azure AD is allowed only from Windows 10 or later PCs that are Azure AD registered (starting with Windows 10 20H1), Azure AD joined, or hybrid Azure AD joined to the *same* directory as the VM.
146+
144147
**SSH:**
145148

146149
The extension can be installed by running, ```az extension add --name ssh```. To sign in using an SSH key pair, use the following example.

articles/data-factory/data-movement-security-considerations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ In this article, we review security considerations in the following two data mov
5656

5757
- **Store encrypted credentials in an Azure Data Factory managed store**. Data Factory helps protect your data store credentials by encrypting them with certificates managed by Microsoft. These certificates are rotated every two years (which includes certificate renewal and the migration of credentials). For more information about Azure Storage security, see [Azure Storage security overview](../storage/blobs/security-recommendations.md).
5858
- **Store credentials in Azure Key Vault**. You can also store the data store's credential in [Azure Key Vault](https://azure.microsoft.com/services/key-vault/). Data Factory retrieves the credential during the execution of an activity. For more information, see [Store credential in Azure Key Vault](store-credentials-in-key-vault.md).
59-
-
59+
6060
Centralizing storage of application secrets in Azure Key Vault allows you to control their distribution. Key Vault greatly reduces the chances that secrets may be accidentally leaked. Instead of storing the connection string in the app's code, you can store it securely in Key Vault. Your applications can securely access the information they need by using URIs. These URIs allow the applications to retrieve specific versions of a secret. There's no need to write custom code to protect any of the secret information stored in Key Vault.
6161

6262
### Data encryption in transit

articles/data-factory/whats-new.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ New top-level CDC resource - native CDC configuration in 3 simple steps [Learn m
3737

3838
### Orchestration
3939

40-
Orchestyrate Synapse notebooks and Synapse spark job definitions natively [Learn more](https://techcommunity.microsoft.com/t5/azure-data-factory-blog/orchestrate-and-operationalize-synapse-notebooks-and-spark-job/ba-p/3724379)
40+
Orchestrate Synapse notebooks and Synapse spark job definitions natively [Learn more](https://techcommunity.microsoft.com/t5/azure-data-factory-blog/orchestrate-and-operationalize-synapse-notebooks-and-spark-job/ba-p/3724379)
4141

4242
### Region expansion
4343

articles/event-hubs/event-hubs-faq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ sections:
221221
- question: |
222222
How is Event Hubs Capture billed?
223223
answer: |
224-
Capture is enabled when any event hub in the namespace has the Capture option enabled. Event Hubs Capture is billed hourly per purchased throughput unit. As the throughput unit count is increased or decreased, Event Hubs Capture billing reflects these changes in whole hour increments. For more information about Event Hubs Capture billing, see [Event Hubs pricing information](https://azure.microsoft.com/pricing/details/event-hubs/).
224+
Capture is enabled when any event hub in the namespace has the Capture option enabled. Event Hubs Capture is billed monthly per purchased throughput unit. As the throughput unit count is increased or decreased, Event Hubs Capture billing reflects these changes in whole hour increments. For more information about Event Hubs Capture billing, see [Event Hubs pricing information](https://azure.microsoft.com/pricing/details/event-hubs/).
225225
226226
- question: |
227227
Do I get billed for the storage account I select for Event Hubs Capture?

articles/machine-learning/how-to-administrate-data-authentication.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.service: machine-learning
77
ms.subservice: enterprise-readiness
88
ms.topic: how-to
99
ms.author: xunwan
10-
author: xunwan
10+
author: SturgeonMi
1111
ms.reviewer: larryfr
1212
ms.date: 01/20/2023
1313
ms.custom: engagement-fy23
@@ -96,7 +96,7 @@ When an Azure Storage account is behind a virtual network, the storage firewall
9696
When the workspace uses a private endpoint and the storage account is also in the VNet, there are extra validation requirements when using studio:
9797

9898
* If the storage account uses a __service endpoint__, the workspace private endpoint and storage service endpoint must be in the same subnet of the VNet.
99-
* If the storage account uses a __private endpoint__, the workspace private endpoint and storage service endpoint must be in the same VNet. In this case, they can be in different subnets.
99+
* If the storage account uses a __private endpoint__, the workspace private endpoint and storage private endpoint must be in the same VNet. In this case, they can be in different subnets.
100100

101101
## Azure Data Lake Storage Gen1
102102

articles/machine-learning/how-to-configure-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ The `ml` extension to the [Azure CLI](/cli/azure/) is the enhanced interface for
3131

3232
## Installation
3333

34-
The new Machine Learning extension **requires Azure CLI version `>=2.15.0`**. Ensure this requirement is met:
34+
The new Machine Learning extension **requires Azure CLI version `>=2.38.0`**. Ensure this requirement is met:
3535

3636
:::code language="azurecli" source="~/azureml-examples-main/cli/misc.sh" id="az_version":::
3737

articles/mysql/single-server/concepts-query-store.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,10 @@ This view returns all the data in Query Store. There is one row for each distinc
127127
| `execution_count` | bigint(20)| NO| The number of times the query got executed for this timestamp ID / during the configured interval period|
128128
| `warning_count` | bigint(20)| NO| Number of warnings this query generated during the internal|
129129
| `error_count` | bigint(20)| NO| Number of errors this query generated during the interval|
130-
| `sum_timer_wait` | double| YES| Total execution time of this query during the interval|
131-
| `avg_timer_wait` | double| YES| Average execution time for this query during the interval|
132-
| `min_timer_wait` | double| YES| Minimum execution time for this query|
133-
| `max_timer_wait` | double| YES| Maximum execution time|
130+
| `sum_timer_wait` | double| YES| Total execution time of this query during the interval in milliseconds|
131+
| `avg_timer_wait` | double| YES| Average execution time for this query during the interval in milliseconds|
132+
| `min_timer_wait` | double| YES| Minimum execution time for this query in milliseconds|
133+
| `max_timer_wait` | double| YES| Maximum execution time in milliseconds|
134134
| `sum_lock_time` | bigint(20)| NO| Total amount of time spent for all the locks for this query execution during this time window|
135135
| `sum_rows_affected` | bigint(20)| NO| Number of rows affected|
136136
| `sum_rows_sent` | bigint(20)| NO| Number of rows sent to client|

0 commit comments

Comments
 (0)