Skip to content

Commit 19e5e4d

Browse files
authored
Merge pull request #94712 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents d0c98d5 + 66f110a commit 19e5e4d

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

articles/active-directory/hybrid/how-to-connect-sso-quick-start.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,14 @@ Mozilla Firefox doesn't automatically use Kerberos authentication. Each user mus
180180

181181
Ensure that the machine running the macOS is joined to AD. Instructions for AD-joining your macOS device is outside the scope of this article.
182182

183+
#### Microsoft Edge based on Chromium (all platforms)
184+
185+
If you have overridden the [AuthNegotiateDelegateAllowlist](https://docs.microsoft.com/DeployEdge/microsoft-edge-policies#authnegotiatedelegateallowlist) or the [AuthServerAllowlist](https://docs.microsoft.com/DeployEdge/microsoft-edge-policies#authserverallowlist) policy settings in your environment, ensure that you add Azure AD's URL (`https://autologon.microsoftazuread-sso.com`) to them as well.
186+
187+
#### Microsoft Edge based on Chromium (macOS and other non-Windows platforms)
188+
189+
For Microsoft Edge based on Chromium on Mac OS and other non-Windows platforms, refer to [the Microsoft Edge based on Chromium Policy List](https://docs.microsoft.com/DeployEdge/microsoft-edge-policies#authserverallowlist) for information on how to add the Azure AD URL for integrated authentication to your allow-list.
190+
183191
#### Google Chrome (all platforms)
184192

185193
If you have overridden the [AuthNegotiateDelegateWhitelist](https://www.chromium.org/administrators/policy-list-3#AuthNegotiateDelegateWhitelist) or the [AuthServerWhitelist](https://www.chromium.org/administrators/policy-list-3#AuthServerWhitelist) policy settings in your environment, ensure that you add Azure AD's URL (`https://autologon.microsoftazuread-sso.com`) to them as well.
@@ -192,7 +200,7 @@ The use of third-party Active Directory Group Policy extensions to roll out the
192200

193201
#### Known browser limitations
194202

195-
Seamless SSO doesn't work in private browsing mode on Firefox and Microsoft Edge browsers. It also doesn't work on Internet Explorer if the browser is running in Enhanced Protected mode.
203+
Seamless SSO doesn't work in private browsing mode on Firefox and Microsoft Edge browsers. It also doesn't work on Internet Explorer if the browser is running in Enhanced Protected mode. For the next version of Microsoft Edge based on Chromium, it will not work in InPrivate and Guest mode by design.
196204

197205
## Step 4: Test the feature
198206

articles/cosmos-db/sql-api-sdk-bulk-executor-java.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ms.author: ramkris
3232
|**Description**|The bulk executor library allows client applications to perform bulk operations in Azure Cosmos DB accounts. bulk executor library provides BulkImport, and BulkUpdate namespaces. The BulkImport module can bulk ingest documents in an optimized way such that the throughput provisioned for a collection is consumed to its maximum extent. The BulkUpdate module can bulk update existing data in Azure Cosmos containers as patches.|
3333
|**SDK download**|[Maven](https://search.maven.org/#search%7Cga%7C1%7Cdocumentdb-bulkexecutor)|
3434
|**Bulk executor library in GitHub**|[GitHub](https://github.com/Azure/azure-cosmosdb-bulkexecutor-java-getting-started)|
35-
| **API documentation**| [.NET API reference documentation](https://docs.microsoft.com/java/api/com.microsoft.azure.documentdb.bulkexecutor)|
35+
| **API documentation**| [Java API reference documentation](https://docs.microsoft.com/java/api/com.microsoft.azure.documentdb.bulkexecutor)|
3636
|**Get started**|[Get started with the bulk executor library Java SDK](bulk-executor-java.md)|
3737
|**Minimum supported runtime**|[Java Development Kit (JDK) 7+](https://aka.ms/azure-jdks)|
3838

articles/virtual-machines/troubleshooting/troubleshoot-recovery-disks-windows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ The troubleshooting process is as follows:
3939
6. Unmount and detach disk from recovery VM.
4040
7. Change the OS disk for the affected VM.
4141

42-
You can use the VM recovery scripts to automate steps 1, 2, 3, 4, 6, and 7. For more documentation and instructions, see [VM Recovery Scripts for Resource Manager VM](https://github.com/Azure/azure-support-scripts/tree/master/VMRecovery/ResourceManager).
42+
You can use the VM repair commands to automate steps 1, 2, 3, 4, 6, and 7. For more documentation and instructions, see [Repair a Windows VM by using the Azure Virtual Machine repair commands](repair-windows-vm-using-azure-virtual-machine-repair-commands.md?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
4343

4444
Make sure that you have [the latest Azure PowerShell](/powershell/azure/overview) installed and logged in to your subscription:
4545

0 commit comments

Comments
 (0)