Skip to content

Commit 1ca5dee

Browse files
authored
Merge pull request #212418 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 45c6328 + 7d190f2 commit 1ca5dee

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

articles/app-service/overview-diagnostics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ The tiles or the Troubleshoot link show the available diagnostics for the catego
9393

9494
## Diagnostic report
9595

96-
After you choose to investigate the issue further by clicking on a topic, you can view more details about the topic often supplemented with graphs and markdowns. Diagnostic report can be a powerful tool for pinpointing the problem with your app. The following is the Overview for Availability and Performance:
96+
After you choose to investigate the issue further by clicking on a topic, you can view more details about the topic often supplemented with graphs and markdowns. Diagnostic report can be a powerful tool for pinpointing the problem with your app. The following is the Web App Down from Availability and Performance:
9797

9898
![App Service Diagnose and solve problems Availability and Performance category homepage with Web App Down diagnostic selected, which displays an availability chart, Organic SLA percentage and Observations and Solutions for problems that were detected.](./media/app-service-diagnostics/full-diagnostic-report-5.png)
9999

articles/batch/tutorial-run-python-batch-azure-data-factory.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ In this section, you'll use Batch Explorer to create the Batch pool that your Az
4848
1. Create a pool by selecting **Pools** on the left side bar, then the **Add** button above the search form.
4949
1. Choose an ID and display name. We'll use `custom-activity-pool` for this example.
5050
1. Set the scale type to **Fixed size**, and set the dedicated node count to 2.
51-
1. Under **Data science**, select **Dsvm Windows** as the operating system.
51+
1. Under **Image Type**, select **Marketplace** as the operating system and **Publisher** as **microsoft-dsvm**
5252
1. Choose `Standard_f2s_v2` as the virtual machine size.
5353
1. Enable the start task and add the command `cmd /c "pip install azure-storage-blob pandas"`. The user identity can remain as the default **Pool user**.
5454
1. Select **OK**.

articles/migrate/migrate-support-matrix.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ Create a key vault for VMware agentless migration | To migrate VMware VMs with a
7777
You can create a project in many geographies in the public cloud.
7878

7979
- Although you can only create projects in these geographies, you can assess or migrate servers for other target locations.
80-
- The project geography is only used to store the discovered metadata.
81-
- When you create a project, you select a geography. The project and related resources are created in one of the regions in the geography. The region is allocated by the Azure Migrate service.
80+
- The project geography is only used to store the discovered metadata.
81+
- When you create a project, you select a geography. The project and related resources are created in one of the regions in the geography. The region is allocated by the Azure Migrate service. Azure Migrate does not move or store customer data outside of the region allocated.
8282

8383
**Geography** | **Metadata storage location**
8484
--- | ---
@@ -135,4 +135,4 @@ There are two versions of the Azure Migrate service:
135135
## Next steps
136136

137137
- [Assess VMware VMs](./tutorial-assess-vmware-azure-vm.md) for migration.
138-
- [Assess Hyper-V VMs](tutorial-assess-hyper-v.md) for migration.
138+
- [Assess Hyper-V VMs](tutorial-assess-hyper-v.md) for migration.

articles/notification-hubs/notification-hubs-python-push-notification-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class NotificationHub:
8989

9090
for part in parts:
9191
if part.startswith('Endpoint'):
92-
self.Endpoint = 'https' + part[11:]
92+
self.Endpoint = 'https' + part[11:].lower()
9393
if part.startswith('SharedAccessKeyName'):
9494
self.SasKeyName = part[20:]
9595
if part.startswith('SharedAccessKey'):

articles/storage/blobs/storage-blob-dotnet-get-started.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public static void GetBlobServiceClient(ref BlobServiceClient blobServiceClient,
8080
You can also create a [BlobServiceClient](/dotnet/api/azure.storage.blobs.blobserviceclient) by using a connection string.
8181

8282
```csharp
83-
BlobServiceClient blobServiceClient = new BlobServiceClient(connectionString);
83+
BlobServiceClient blobServiceClient = new BlobServiceClient(connectionString);
8484
```
8585

8686
For information about how to obtain account keys and best practice guidelines for properly managing and safeguarding your keys, see [Manage storage account access keys](../common/storage-account-keys-manage.md).
@@ -239,4 +239,4 @@ The following guides show you how to use each of these classes to build your app
239239
- [Samples](../common/storage-samples-dotnet.md?toc=%2fazure%2fstorage%2fblobs%2ftoc.json#blob-samples)
240240
- [API reference](/dotnet/api/azure.storage.blobs)
241241
- [Library source code](https://github.com/Azure/azure-sdk-for-net/tree/master/sdk/storage/Azure.Storage.Blobs)
242-
- [Give Feedback](https://github.com/Azure/azure-sdk-for-net/issues)
242+
- [Give Feedback](https://github.com/Azure/azure-sdk-for-net/issues)

includes/storage-table-cosmos-db-tip-include.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ ms.author: tamram
77
---
88

99
> [!TIP]
10-
> The content in this article applies to the original Azure Table storage. However, the same concepts apply to the newer Azure Cosmos DB Table API. The Cosmos DB Table API offers higher performance and availability, global distribution, and automatic secondary indexes. It is also available in a consumption-based [serverless](../articles/cosmos-db/serverless.md) mode. There are some [feature differences](../articles/cosmos-db/table/introduction.md) between Table API in Azure Cosmos DB and Azure table storage. For more information, see [Azure Cosmos DB Table API](../articles/cosmos-db/table-introduction.md). For ease of development, we now provide a unified [Azure Tables SDK](https://devblogs.microsoft.com/azure-sdk/announcing-the-new-azure-data-tables-libraries/) that can be used to target both the original Table storage as well as the Cosmos DB Table API.
10+
> The content in this article applies to the original Azure Table Storage. However, the same concepts apply to the newer Azure Cosmos DB Table API. The Cosmos DB Table API offers higher performance and availability, global distribution, and automatic secondary indexes. It is also available in a consumption-based [serverless](../articles/cosmos-db/serverless.md) mode. There are some [feature differences](../articles/cosmos-db/table/introduction.md) between Table API in Azure Cosmos DB and Azure Table Storage. For more information, see [Azure Cosmos DB Table API](../articles/cosmos-db/table-introduction.md). For ease of development, we now provide a unified [Azure Tables SDK](https://devblogs.microsoft.com/azure-sdk/announcing-the-new-azure-data-tables-libraries/) that can be used to target both the original Table Storage as well as the Cosmos DB Table API.

0 commit comments

Comments
 (0)