Skip to content

Commit a725801

Browse files
authored
Merge pull request #173721 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 7dd7662 + 8d77813 commit a725801

File tree

6 files changed

+15
-9
lines changed

6 files changed

+15
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Password writeback is a highly secure service. To ensure your information is pro
101101
After a user submits a password reset, the reset request goes through several encryption steps before it arrives in your on-premises environment. These encryption steps ensure maximum service reliability and security. They are described as follows:
102102

103103
1. **Password encryption with 2048-bit RSA Key**: After a user submits a password to be written back to on-premises, the submitted password itself is encrypted with a 2048-bit RSA key.
104-
1. **Package-level encryption with AES-GCM**: The entire package, the password plus the required metadata, is encrypted by using AES-GCM. This encryption prevents anyone with direct access to the underlying Service Bus channel from viewing or tampering with the contents.
104+
1. **Package-level encryption with 256-bit AES-GCM**: The entire package, the password plus the required metadata, is encrypted by using AES-GCM (with a key size of 256 bits). This encryption prevents anyone with direct access to the underlying Service Bus channel from viewing or tampering with the contents.
105105
1. **All communication occurs over TLS/SSL**: All the communication with Service Bus happens in an SSL/TLS channel. This encryption secures the contents from unauthorized third parties.
106106
1. **Automatic key rollover every six months**: All keys roll over every six months, or every time password writeback is disabled and then re-enabled on Azure AD Connect, to ensure maximum service security and safety.
107107

articles/active-directory/develop/msal-net-migration.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,10 @@ For details about the decision tree below, read [MSAL.NET or Microsoft.Identity.
4949

5050
## Next steps
5151

52+
- Learn about [public client and confidential client applications](msal-client-applications.md).
5253
- Learn how to [migrate confidential client applications built on top of ASP.NET MVC or .NET classic from ADAL.NET to MSAL.NET](msal-net-migration-confidential-client.md).
5354
- Learn how to [migrate public client applications built on top of .NET or .NET classic from ADAL.NET to MSAL.NET](msal-net-migration-public-client.md).
5455
- Learn more about the [Differences between ADAL.NET and MSAL.NET apps](msal-net-differences-adal-net.md).
5556
- Learn how to migrate confidential client applications built on top of ASP.NET Core from ADAL.NET to Microsoft.Identity.Web:
5657
- [Web apps](https://github.com/AzureAD/microsoft-identity-web/wiki/web-apps#migrating-from-previous-versions--adding-authentication)
57-
- [Web APIs](https://github.com/AzureAD/microsoft-identity-web/wiki/web-apis)
58+
- [Web APIs](https://github.com/AzureAD/microsoft-identity-web/wiki/web-apis)

articles/machine-learning/how-to-troubleshoot-online-endpoints.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,10 @@ az ml endpoint get-logs
180180

181181
The requested CPU or memory can't be satisfied. Please adjust your request or the cluster.
182182

183+
### ERR_2102: Resources requests invalid
184+
185+
Requests for resources must be less than or equal to limits. If you don't set limits, we set default values when you attach your compute to an Azure Machine Learning workspace. You can check limits in the Azure portal or by using the `az ml compute show` command.
186+
183187
### ERR_2200: User container has crashed\terminated
184188

185189
To run the `score.py` provided as part of the deployment, Azure creates a container that includes all the resources that the `score.py` needs, and runs the scoring script on that container. The error in this scenario is that this container is crashing when running, which means scoring couldn't happen. This error happens when:

articles/postgresql/connect-ruby.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ begin
9797
password = String('<server_admin_password>')
9898

9999
# Initialize connection object.
100-
connection = PG::Connection.new(:host => host, :user => user, :database => dbname, :port => '5432', :password => password)
100+
connection = PG::Connection.new(:host => host, :user => user, :dbname => database, :port => '5432', :password => password)
101101
puts 'Successfully created connection to database.'
102102

103103
resultSet = connection.exec('SELECT * from inventory;')

articles/security/fundamentals/feature-availability.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@ The following tables display the current Azure Sentinel feature availability in
134134
|- [SOC incident audit metrics](../../sentinel/manage-soc-with-incident-metrics.md) | GA | GA |
135135
|- [Watchlists](../../sentinel/watchlists.md) | GA | GA |
136136
| **Threat intelligence support** | | |
137-
| - [Threat Intelligence - TAXII data connector](../../sentinel/understand-threat-intelligence.md) | Public Preview | Not Available |
137+
| - [Threat Intelligence - TAXII data connector](../../sentinel/understand-threat-intelligence.md) | GA | Not Available |
138138
| - [Threat Intelligence Platform data connector](../../sentinel/understand-threat-intelligence.md) | Public Preview | Not Available |
139-
| - [Threat Intelligence Research Blade](https://techcommunity.microsoft.com/t5/azure-sentinel/what-s-new-threat-intelligence-menu-item-in-public-preview/ba-p/1646597) | Public Preview | Not Available |
139+
| - [Threat Intelligence Research Blade](https://techcommunity.microsoft.com/t5/azure-sentinel/what-s-new-threat-intelligence-menu-item-in-public-preview/ba-p/1646597) | GA | Not Available |
140140
| - [URL Detonation](https://techcommunity.microsoft.com/t5/azure-sentinel/using-the-new-built-in-url-detonation-in-azure-sentinel/ba-p/996229) | Public Preview | Not Available |
141141
| - [Threat Intelligence workbook](/azure/architecture/example-scenario/data/sentinel-threat-intelligence) | GA | Not Available |
142142
|**Detection support** | | |
@@ -323,4 +323,4 @@ The following table displays the current Azure Defender for IoT feature availabi
323323
- Understand the [shared responsibility](shared-responsibility.md) model and which security tasks are handled by the cloud provider and which tasks are handled by you.
324324
- Understand the [Azure Government Cloud](../../azure-government/documentation-government-welcome.md) capabilities and the trustworthy design and security used to support compliance applicable to federal, state, and local government organizations and their partners.
325325
- Understand the [Office 365 Government plan](/office365/servicedescriptions/office-365-platform-service-description/office-365-us-government/office-365-us-government#about-office-365-government-environments).
326-
- Understand [compliance in Azure](../../compliance/index.yml) for legal and regulatory standards.
326+
- Understand [compliance in Azure](../../compliance/index.yml) for legal and regulatory standards.

articles/virtual-desktop/deploy-azure-ad-joined-vm.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ ms.topic: how-to
1010
ms.date: 09/15/2021
1111
ms.author: helohr
1212
---
13+
1314
# Deploy Azure AD-joined virtual machines in Azure Virtual Desktop
1415

15-
This article will walk you through the process of deploying and accessing Azure Active Directory joined virtual machines in Azure Virtual Desktop. Azure AD-joined VMs remove the need to have line-of-sight from the VM to an on-premise or virtualized Active Directory Domain Controller (DC) or to deploy Azure AD Domain services (Azure AD DS). In some cases, it can remove the need for a DC entirely, simplifying the deployment and management of the environment. These VMs can also be automatically enrolled in Intune for ease of management.
16+
This article will walk you through the process of deploying and accessing Azure Active Directory joined virtual machines in Azure Virtual Desktop. Azure AD-joined VMs remove the need to have line-of-sight from the VM to an on-premises or virtualized Active Directory Domain Controller (DC) or to deploy Azure AD Domain services (Azure AD DS). In some cases, it can remove the need for a DC entirely, simplifying the deployment and management of the environment. These VMs can also be automatically enrolled in Intune for ease of management.
1617

1718
> [!NOTE]
1819
> Azure AD-joined VMs are currently only supported in the Azure Commercial cloud.
@@ -31,7 +32,7 @@ User accounts can be cloud-only or hybrid users from the same Azure AD tenant.
3132

3233
The following known limitations may impact access to your on-premises or Active Directory domain-joined resources and should be considered when deciding whether Azure AD-joined VMs are right for your environment. We currently recommend Azure AD-joined VMs for scenarios where users only need access to cloud-based resources or Azure AD-based authentication.
3334

34-
- Azure Virtual Desktop (classic) doesn't support Azure AD-joined VMs.
35+
- Azure Virtual Desktop (classic) doesn't support Azure AD-joined VMs.
3536
- Azure AD-joined VMs don't currently support external users.
3637
- Azure AD-joined VMs only supports local user profiles at this time.
3738
- Azure AD-joined VMs can't access Azure Files file shares for FSLogix or MSIX app attach. You'll need Kerberos authentication to access either of these features.
@@ -48,7 +49,7 @@ You can deploy Azure AD-joined VMs directly from the Azure portal when [creating
4849
4950
### Assign user access to host pools
5051

51-
After you've created your host pool, you must assign users access to let them access to their resources. To grant access to resources, add each user to the app group. Follow the instructions in [Manage app groups](manage-app-groups.md) to assign user access to apps and desktops. We recommend that you use user groups instead of individual users wherever possible.
52+
After you've created your host pool, you must assign users access to let them access their resources. To grant access to resources, add each user to the app group. Follow the instructions in [Manage app groups](manage-app-groups.md) to assign user access to apps and desktops. We recommend that you use user groups instead of individual users wherever possible.
5253

5354
For Azure AD-joined VMs, you'll need to do two extra things on top of the requirements for Active Directory or Azure Active Directory Domain Services-based deployments:
5455

0 commit comments

Comments
 (0)