Skip to content

Commit ba42221

Browse files
authored
Merge pull request #58159 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 b850632 + 2afe009 commit ba42221

File tree

13 files changed

+21
-15
lines changed

13 files changed

+21
-15
lines changed

articles/azure-functions/functions-host-json.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ The following sample *host.json* files have all possible options specified.
6464
"default": "None"
6565
},
6666
"applicationInsights": {
67-
"sampling": {
67+
"samplingSettings": {
6868
"isEnabled": true,
6969
"maxTelemetryItemsPerSecond" : 5
7070
}

articles/billing/billing-how-to-cancel-azure-subscription.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ If you cancel a paid Azure Support plan, you are still billed for the rest of th
4040

4141
## What happens after I cancel my subscription?
4242

43-
Once you cancel, billing is stopped immediately. However, it can take up to 10 minutes for the cancellation show in the portal.
43+
Once you cancel, billing is stopped immediately. However, it can take up to 10 minutes for the cancellation to show in the portal.
4444

4545
After that, your services are disabled. That means your virtual machines are de-allocated, temporary IP addresses are freed, and storage is read-only.
4646

articles/billing/billing-how-to-change-credit-card.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ms.author: cwatson
2020
---
2121
# Add, update, or remove a credit or debit card for Azure
2222

23-
In the Account Center, you can add a new credit card, update an existing credit card, or delete a credit card that you don't use. You must be [Account Administrator](billing-subscription-transfer.md#whoisaa) to make these changes.
23+
In the Account Center, you can add a new credit card, update an existing credit card, or delete a credit card that you don't use. You must be an [Account Administrator](billing-subscription-transfer.md#whoisaa) to make these changes.
2424

2525
**Want to switch to pay by invoice?** See [Pay for Azure subscriptions by invoice](billing-how-to-pay-by-invoice.md).
2626

@@ -78,7 +78,7 @@ If you need to remove your credit or debit card before the 90-day retention peri
7878

7979
### Why do I keep getting "Your login session has expired. Please click here to log back in"?
8080

81-
If you keep getting this error message even if already you logged out and back in, try again with a private browsing session.
81+
If you keep getting this error message even if you've already logged out and back in, try again with a private browsing session.
8282

8383
### How do I use a different card for each subscription I have?
8484

articles/billing/billing-partner-admin-link-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ When you have access to the customer's resources, use Azure portal, PowerShell,
3838

3939
2. Sign in to the Azure portal.
4040

41-
3. Enter the Microsoft partner ID.The partner ID is the [Microsoft Partner Network(MPN)](https://partner.microsoft.com/) ID of your organization.
41+
3. Enter the Microsoft partner ID. The partner ID is the [Microsoft Partner Network (MPN)](https://partner.microsoft.com/) ID of your organization.
4242

4343
![Screenshot that shows link partner ID](./media/billing-link-partner-id/link-partner-ID.PNG)
4444

articles/cognitive-services/cognitive-services-container-support.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.author: diberry
1515

1616
# Container support in Azure Cognitive Services
1717

18-
Container support in Azure Cognitive Services allows developers to use the same rich APIs that are available in Azure, but with the flexibility that comes with [Docker containers](https://www.docker.com/what-container). Container support is currently available in preview for a subset of Azure Cognitive Services, including parts of [Computer Vision](Computer-vision/Home.md), [Face](Face/Overview.md), and [Text Analytics](text-analytics/overview.md).
18+
Container support in Azure Cognitive Services allows developers to use the same rich APIs that are available in Azure, and enables flexibility in where to deploy and host the services that come with [Docker containers](https://www.docker.com/what-container). Container support is currently available in preview for a subset of Azure Cognitive Services, including parts of [Computer Vision](Computer-vision/Home.md), [Face](Face/Overview.md), and [Text Analytics](text-analytics/overview.md).
1919

2020
Containerization is an approach to software distribution in which an application or service, including its dependencies & configuration, is packaged together as a container image. With little or no modification, a container image can be deployed on a container host. Containers are isolated from each other and the underlying operating system, with a smaller footprint than a virtual machine. Containers can be instantiated from container images for short-term tasks, and removed when no longer needed.
2121

@@ -74,4 +74,4 @@ Install and explore the functionality provided by containers in Azure Cognitive
7474

7575
* [Install and use Computer Vision containers](Computer-vision/computer-vision-how-to-install-containers.md)
7676
* [Install and use Face containers](Face/face-how-to-install-containers.md)
77-
* [Install and use Text Analytics containers](text-analytics/how-tos/text-analytics-how-to-install-containers.md)
77+
* [Install and use Text Analytics containers](text-analytics/how-tos/text-analytics-how-to-install-containers.md)
204 KB
Loading
Binary file not shown.
206 KB
Loading

articles/cost-management/tutorial-export-acm-data.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.custom:
1414

1515
# Tutorial: Create and manage exported data
1616

17-
If you read the Cost Analysis tutorial, then you're familiar with manually downloading your Cost Management data. However, you can create a daily recurring task that automatically exports your Cost Management data daily to Azure storage. Exported data is in CSV format and it contains all the information that's collected by Cost Management. You can then use the exported data in Azure storage with external systems and combine it with your own custom data. And you can use your exported data in an external system like a dashboard or other financial system.
17+
If you read the Cost Analysis tutorial, then you're familiar with manually downloading your Cost Management data. However, you can create a recurring task that automatically exports your Cost Management data to Azure storage on a daily, weekly, or monthly basis. Exported data is in CSV format and it contains all the information that's collected by Cost Management. You can then use the exported data in Azure storage with external systems and combine it with your own custom data. And you can use your exported data in an external system like a dashboard or other financial system.
1818

1919
The examples in this tutorial walk you though exporting your cost management data and then verify that the data was successfully exported.
2020

@@ -43,11 +43,17 @@ Sign in to the Azure portal at [https://portal.azure.com](https://portal.azure.c
4343

4444
Cost Management + Billing > Cost Management > select a subscription or resource group in a subscription > Export > **Add**.
4545

46-
Type a name for the export and specify the subscription, Azure storage account, container, and the file storage directory or blob container, then click **Create**.
46+
Type a name for the export and select the "Daily export of month-to-date costs" option. Click **Next**.
4747

48-
![New export](./media/tutorial-export-acm-data/new-export01.png)
48+
![New export: export type](./media/tutorial-export-acm-data/basics_exports.png)
4949

50-
Your new export appears in the list of exports. By default, new exports are enabled, and they run daily. If you want to disable or delete a scheduled export, click any item in the list and then click either **Disable** or **Delete**.
50+
Specify the subscription for your Azure storage account, then select your storage account. Specify the storage container and the directory path that you'd like the export file to go to. Click **Next**.
51+
52+
![New export: storage](./media/tutorial-export-acm-data/storage_exports.png)
53+
54+
Review your export details and click **Create**.
55+
56+
Your new export appears in the list of exports. By default, new exports are enabled. If you want to disable or delete a scheduled export, click any item in the list and then click either **Disable** or **Delete**.
5157

5258
Initially, it can take one to two hours before the export runs. However, it can take up to four hours before data is shown in exported files.
5359

articles/event-hubs/event-hubs-create-kafka-enabled.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ If you do not have an Azure subscription, create a [free account](https://azure.
3636

3737
3. Provide a unique name and enable Kafka on the namespace. Click **Create**.
3838

39-
![Create a namespace](./media/event-hubs-create-kafka-enabled/create-kafka-namespace.png)
39+
![Create a namespace](./media/event-hubs-create-kafka-enabled/create-kafka-namespace.jpg)
4040

4141
4. Once the namespace is created, on the **Settings** tab click **Shared access policies** to get the connection string.
4242

0 commit comments

Comments
 (0)