Skip to content

Commit af5e8fb

Browse files
authored
Merge pull request #134330 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 b759ff3 + 8684215 commit af5e8fb

File tree

8 files changed

+18
-11
lines changed

8 files changed

+18
-11
lines changed

articles/aks/managed-aad.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ AKS-managed Azure Active Directory integration is available in public regions wh
2727
## Limitations
2828

2929
* AKS-managed Azure AD integration can't be disabled
30-
* non-RBAC enabled clusters aren't supported for AKS-managed Azue AD integration
30+
* non-RBAC enabled clusters aren't supported for AKS-managed Azure AD integration
3131
* Changing the Azure AD tenant associated with AKS-managed Azure AD integration isn't supported
3232

3333
## Prerequisites

articles/app-service/environment/firewall-integration.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ With an Azure Firewall, you automatically get everything below configured with t
222222
|rteventservice.trafficmanager.net:443 |
223223
|ctldl.windowsupdate.com:80 |
224224
|ctldl.windowsupdate.com:443 |
225+
|global-dsms.dsms.core.windows.net:443 |
225226

226227
#### Wildcard HTTP/HTTPS dependencies
227228

@@ -425,6 +426,7 @@ Linux is not available in US Gov regions and is thus not listed as an optional c
425426
|www.microsoft.com:443 |
426427
|www.msftconnecttest.com:443 |
427428
|www.thawte.com:443 |
429+
|global-dsms.dsms.core.usgovcloudapi.net:443 |
428430

429431
<!--Image references-->
430432
[1]: ./media/firewall-integration/firewall-apprule.png

articles/azure-functions/functions-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Azure Functions allows you to run small pieces of code (called "functions") with
1717

1818
A function is "triggered" by a specific type of event. [Supported triggers](./functions-triggers-bindings.md) include responding to changes in data, responding to messages, running on a schedule, or as the result of an HTTP request.
1919

20-
While you can always code directly against a myriad of services, integrating with other services is streamlined by using bindings. Bindings give you [declarative access to a wide variety of Azure and third-party services](./functions-triggers-bindings.md).
20+
Although you can always code directly against myriad services, integrating with other services is streamlined by using bindings. Bindings give you [declarative access to a wide variety of Azure and third-party services](./functions-triggers-bindings.md).
2121

2222
## Features
2323

articles/azure-monitor/platform/delete-workspace.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,9 @@ You must have at least *Log Analytics Contributor* permissions to delete a works
109109
* If you get an error message *This workspace name is already in use* or *conflict* when creating a workspace, it could be since:
110110
* The workspace name isn't available and being used by someone in your organization, or by other customer.
111111
* The workspace was deleted in the last 14 days and its name kept reserved for the soft-delete period. To override the soft-delete and permanently delete your workspace to create a new workspace with the same name, follow these steps to recover the workspace first and perform permanent delete:<br>
112-
1. [Recover](#recover-workspace) your workspace.
113-
2. [Permanently delete](#permanent-workspace-delete) your workspace.
114-
3. Create a new workspace using the same workspace name.
112+
1. [Recover](#recover-workspace) your workspace.
113+
2. [Permanently delete](#permanent-workspace-delete) your workspace.
114+
3. Create a new workspace using the same workspace name.
115+
* If you see a 204 response code that shows *Resource not found*, the cause might be consecutive tries to use the delete workspace operation. 204 is an empty response, which usually means that the resource doesn't exist, so the delete completed without doing anything.
116+
After the deletion call is successfully completed on the back end, you can restore the workspace and complete the permanent delete operation in one of the methods suggested earlier.
117+

articles/cosmos-db/local-emulator.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ Use the following steps to use the emulator on Linux or macOS environments:
238238
1. From the Windows VM, launch the Azure Cosmos emulator from the command line using the following options. For details on the parameters supported by the command line, see the [emulator command-line tool reference](emulator-command-line-parameters.md):
239239

240240
```bash
241-
Microsoft.Azure.Cosmos.Emulator.exe /AllowNetworkAccess /Key=C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM +4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==
241+
Microsoft.Azure.Cosmos.Emulator.exe /AllowNetworkAccess /Key=C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==
242242
```
243243

244244
1. Finally, you need to resolve the certificate trust process between the application running on the Linux or Mac environment and the emulator. You can use one of the following two options to resolve the certificate:

articles/databox-online/azure-stack-edge-gpu-prepare-device-failure.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ The following third-party data protection solutions can provide a backup solutio
6262
| Third-party software | Reference to the solution |
6363
|--------------------------------|---------------------------------------------------------|
6464
| Cohesity | https://www.cohesity.com/solution/cloud/azure/ <br> For details, contact Cohesity. |
65-
| Veritas | For details, contact Veritas. |
65+
| Commvault | https://www.commvault.com/azure <br> For details, contact Commvault. |
66+
| Veritas | http://veritas.com/azure <br> For details, contact Veritas. |
6667

6768

6869
## Protect files and folders on VMs
@@ -74,7 +75,8 @@ Azure Stack Edge works with Azure Backup and other third-party data protection s
7475
|-------------------------|----------------|--------------------------------------------------------------------------|
7576
| Microsoft Azure Recovery Services (MARS) agent for Azure Backup | Windows | [About MARS agent](/azure/backup/backup-azure-about-mars) |
7677
| Cohesity | Windows, Linux | [Microsoft Azure Integration, Backup and Recovery solution brief](https://www.cohesity.com/solution/cloud/azure) <br>For details, contact Cohesity. |
77-
| Veritas | Windows, Linux | For details, contact Veritas. |
78+
| Commvault | Windows, Linux | https://www.commvault.com/azure <br>For details, contact Commvault. |
79+
| Veritas | Windows, Linux | http://veritas.com/azure <br> For details, contact Veritas. |
7880

7981

8082

articles/iot-edge/how-to-retrieve-iot-edge-logs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ az iot hub invoke-module-method --method-name 'GetTaskStatus' -n <hub name> -d <
364364
'
365365
```
366366

367-
In the Azure portal, invoke the method with the method name `UploadModuleLogs` and the following JSON payload after populating the GUID with your information:
367+
In the Azure portal, invoke the method with the method name `GetTaskStatus` and the following JSON payload after populating the GUID with your information:
368368

369369
```json
370370
{
@@ -377,4 +377,4 @@ In the Azure portal, invoke the method with the method name `UploadModuleLogs` a
377377

378378
## Next steps
379379

380-
[Properties of the IoT Edge agent and IoT Edge hub module twins](module-edgeagent-edgehub.md)
380+
[Properties of the IoT Edge agent and IoT Edge hub module twins](module-edgeagent-edgehub.md)

articles/storage/blobs/data-lake-storage-directory-file-acl-dotnet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ This example creates a [DataLakeServiceClient](https://docs.microsoft.com/dotnet
7171

7272
```cs
7373
public void GetDataLakeServiceClient(ref DataLakeServiceClient dataLakeServiceClient,
74-
String accountName, String clientID, string clientSecret, string tenantID)
74+
string accountName, string clientID, string clientSecret, string tenantID)
7575
{
7676

7777
TokenCredential credential = new ClientSecretCredential(

0 commit comments

Comments
 (0)