Skip to content

Commit 6afac79

Browse files
authored
Merge pull request #223316 from MicrosoftDocs/main
Publish to live, Monday 4 AM PST, 1/9
2 parents 3b28603 + bc28252 commit 6afac79

File tree

47 files changed

+605
-167
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+605
-167
lines changed

articles/active-directory/develop/msal-acquire-cache-tokens.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ The format of the scope value varies depending on the resource (the API) receivi
4545

4646
For Microsoft Graph only, the `user.read` scope maps to `https://graph.microsoft.com/User.Read`, and both scope formats can be used interchangeably.
4747

48-
Certain web APIs such as the Azure Resource Manager API (https://management.core.windows.net/) expect a trailing forward slash ('/') in the audience claim (`aud`) of the access token. In this case, pass the scope as `https://management.core.windows.net//user_impersonation`, including the double forward slash ('//').
48+
Certain web APIs such as the Azure Resource Manager API (`https://management.core.windows.net/`) expect a trailing forward slash ('/') in the audience claim (`aud`) of the access token. In this case, pass the scope as `https://management.core.windows.net//user_impersonation`, including the double forward slash ('//').
4949

5050
Other APIs might require that *no scheme or host* is included in the scope value, and expect only the app ID (a GUID) and the scope name, for example:
5151

articles/aks/includes/keda/current-version-callout.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
author: tomkerkhove
33

4-
ms.service: container-service
4+
ms.service: azure-kubernetes-service
55
ms.topic: include
66
ms.date: 05/24/2022
77
ms.author: tomkerkhove

articles/cost-management-billing/costs/cost-analysis-common-uses.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,44 +15,44 @@ ms.reviewer: adwise
1515

1616
Cost Management users often want answers to questions that many others ask. This article walks you through getting results for common cost analysis tasks in Cost Management.
1717

18-
## View forecasted costs
18+
## View forecast costs
1919

20-
Forecasted costs are shown in cost analysis areas for area and stacked column views. The forecast is based on your historical resource use. Changes to your resource use affect forecasted costs.
20+
Forecast costs are shown in cost analysis areas for area and stacked column views. The forecast is based on your historical resource use. Changes to your resource use affect forecast costs.
2121

2222
In the Azure portal, navigate to cost analysis for your scope. For example: **Cost Management + Billing** > **Cost Management** > **Cost analysis**.
2323

24-
In the default view, the top chart has the Actual/Amortized cost and forecasted cost sections. The solid color of the chart shows your Actual/Amortized cost. The shaded color shows the forecast cost.
24+
In the default view, the top chart has the Actual/Amortized cost and forecast cost sections. The solid color of the chart shows your Actual/Amortized cost. The shaded color shows the forecast cost.
2525

26-
[![Forecasted cost](./media/cost-analysis-common-uses/enrollment-forecast.png)](./media/cost-analysis-common-uses/enrollment-forecast.png#lightbox)
26+
[![Forecast cost](./media/cost-analysis-common-uses/enrollment-forecast.png)](./media/cost-analysis-common-uses/enrollment-forecast.png#lightbox)
2727

28-
## View forecasted costs grouped by service
28+
## View forecast costs grouped by service
2929

30-
The default view doesn't show forecasted costs group by a service, so you have to add a group by selection.
30+
The default view doesn't show forecast costs group by a service, so you have to add a group by selection.
3131

3232
In the Azure portal, navigate to cost analysis for your scope. For example: **Cost Management + Billing** > **Cost Management** > **Cost analysis**.
3333

3434
Select **Group by** > **Service name**.
3535

36-
The view shows your costs grouped for each service. The forecasted cost isn't calculated for each service. It's projected for the **Total** of all your services.
36+
The view shows your costs grouped for each service. The forecast cost isn't calculated for each service. It's projected for the **Total** of all your services.
3737

38-
[![Grouped forecasted cost](./media/cost-analysis-common-uses/forecast-group-by-service.png)](./media/cost-analysis-common-uses/forecast-group-by-service.png#lightbox)
38+
[![Grouped forecast cost](./media/cost-analysis-common-uses/forecast-group-by-service.png)](./media/cost-analysis-common-uses/forecast-group-by-service.png#lightbox)
3939

40-
## View forecasted costs for a service
40+
## View forecast costs for a service
4141

42-
You can view forecasted costs narrowed to a single service. For example, you might want to see forecasted costs for just virtual machines.
42+
You can view forecast costs narrowed to a single service. For example, you might want to see forecast costs for just virtual machines.
4343

4444
1. In the Azure portal, navigate to cost analysis for your scope. For example: **Cost Management + Billing** > **Cost Management** > **Cost analysis**.
4545
1. Select **Add filter** and then select **Service name**.
4646
1. In the **choose** list, select a service. For example select, **virtual machines**.
4747

48-
Review the actual cost for selection and the forecasted cost.
48+
Review the actual cost for selection and the forecast cost.
4949

5050
You can add more customizations to the view.
5151

5252
1. Add a second filter for **Meter** and select a value to filter for an individual type of meter under your selected service name.
53-
1. Group by **Resource** to see the specific resources that are accruing cost. The forecasted cost isn't calculated for each service. It's projected for the **Total** of all your resources.
53+
1. Group by **Resource** to see the specific resources that are accruing cost. The forecast cost isn't calculated for each service. It's projected for the **Total** of all your resources.
5454

55-
[![Forecasted cost for a service](./media/cost-analysis-common-uses/forecast-by-service.png)](./media/cost-analysis-common-uses/forecast-by-service.png#lightbox)
55+
[![Forecast cost for a service](./media/cost-analysis-common-uses/forecast-by-service.png)](./media/cost-analysis-common-uses/forecast-by-service.png#lightbox)
5656

5757
## View your Azure and AWS costs together
5858

articles/defender-for-iot/device-builders/how-to-provision-micro-agent.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@ To learn how to configure the Microsoft Defender for IoT micro agent for Edge de
4848
4949
## Next steps
5050

51-
> [Configure Microsoft Defender for IoT agent-based solution](tutorial-configure-agent-based-solution.md)
51+
[Configure Microsoft Defender for IoT agent-based solution](tutorial-configure-agent-based-solution.md)
5252

53-
> [Configure pluggable Authentication Modules (PAM) to audit sign-in events (Preview)](configure-pam-to-audit-sign-in-events.md)
53+
[Configure pluggable Authentication Modules (PAM) to audit sign-in events (Preview)](configure-pam-to-audit-sign-in-events.md)

0 commit comments

Comments
 (0)