Skip to content

Commit 41dafd7

Browse files
authored
Merge pull request #101705 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 909f039 + fc8fbfa commit 41dafd7

18 files changed

+60
-55
lines changed

articles/active-directory-b2c/active-directory-b2c-reference-oauth-code.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ Now that you've acquired an authorization code, you can redeem the `code` for a
9898
You can also request an access token for your app's own back-end Web API by convention of using the app's client ID as the requested scope (which will result in an access token with that client ID as the "audience"):
9999

100100
```HTTP
101-
POST {tenant}.onmicrosoft.com/{policy}/oauth2/v2.0/token HTTP/1.1
102-
Host: {tenant}.b2clogin.com
101+
POST https://{tenant}.b2clogin.com/{tenant}.onmicrosoft.com/{policy}/oauth2/v2.0/token HTTP/1.1
102+
103103
Content-Type: application/x-www-form-urlencoded
104104
105105
grant_type=authorization_code&client_id=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6&scope=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6 offline_access&code=AwABAAAAvPM1KaPlrEqdFSBzjqfTGBCmLdgfSTLEMPGYuNHSUYBrq...&redirect_uri=urn:ietf:wg:oauth:2.0:oob
@@ -165,8 +165,8 @@ Authorization: Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6Ik5HVEZ2ZEstZn
165165
Access tokens and ID tokens are short-lived. After they expire, you must refresh them to continue to access resources. To do this, submit another POST request to the `/token` endpoint. This time, provide the `refresh_token` instead of the `code`:
166166

167167
```HTTP
168-
POST {tenant}.onmicrosoft.com/{policy}/oauth2/v2.0/token HTTP/1.1
169-
Host: {tenant}.b2clogin.com
168+
POST https://{tenant}.b2clogin.com/{tenant}.onmicrosoft.com/{policy}/oauth2/v2.0/token HTTP/1.1
169+
170170
Content-Type: application/x-www-form-urlencoded
171171
172172
grant_type=refresh_token&client_id=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6&scope=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6 offline_access&refresh_token=AwABAAAAvPM1KaPlrEqdFSBzjqfTGBCmLdgfSTLEMPGYuNHSUYBrq...&redirect_uri=urn:ietf:wg:oauth:2.0:oob

articles/active-directory/develop/authentication-scenarios.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,4 +165,4 @@ By default, MSAL uses the system browser except for .NET Framework desktop appli
165165
- See the [Microsoft identity platform developer glossary](developer-glossary.md) to get familiar with common terms.
166166
- See [Authentication flows and app scenarios](authentication-flows-app-scenarios.md) to learn more about other scenarios for authenticating users supported by the Microsoft identity platform.
167167
- See [MSAL libraries](msal-overview.md) to learn about the Microsoft libraries that help you develop applications that work with Microsoft Accounts, Azure AD accounts, and Azure AD B2C users all in a single, streamlined programming model.
168-
- See [Integrate App Service with Microsfot identity platform](/azure/app-service/configure-authentication-provider-aad) to learn how to configure authentication for your App Service app.
168+
- See [Integrate App Service with Microsoft identity platform](/azure/app-service/configure-authentication-provider-aad) to learn how to configure authentication for your App Service app.

articles/aks/acs-aks-migration.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ In this article we will summarize migration details for:
4141
> * Ensure valid quotas
4242
> * High Availability and business continuity
4343
> * Considerations for stateless applications
44-
> * Considerations for statefull applications
44+
> * Considerations for stateful applications
4545
> * Deployment of your cluster configuration
4646
4747
## AKS with Standard Load Balancer and Virtual Machine Scale Sets
@@ -107,7 +107,7 @@ To complete the migration, you'll want to point clients to the new services that
107107

108108
Stateless application migration is the most straightforward case. Apply your resource definitions (YAML or Helm) to the new cluster, make sure everything works as expected, and redirect traffic to activate your new cluster.
109109

110-
### Considers for stateful applications
110+
### Considerations for stateful applications
111111

112112
Carefully plan your migration of stateful applications to avoid data loss or unexpected downtime.
113113

@@ -157,7 +157,7 @@ Some open-source tools can help you create managed disks and migrate volumes bet
157157

158158
### Deployment of your cluster configuration
159159

160-
We recommend that you use your existing Continuous Integration (CI) and Continuous Deliver (CD) pipeline to deploy a known-good configuration to AKS. You can use Azure Pipelines to [build and deploy your applications to AKS](https://docs.microsoft.com/azure/devops/pipelines/ecosystems/kubernetes/aks-template?view=azure-devops) Clone your existing deployment tasks and ensure that `kubeconfig` points to the new AKS cluster.
160+
We recommend that you use your existing Continuous Integration (CI) and Continuous Deliver (CD) pipeline to deploy a known-good configuration to AKS. You can use Azure Pipelines to [build and deploy your applications to AKS](https://docs.microsoft.com/azure/devops/pipelines/ecosystems/kubernetes/aks-template?view=azure-devops). Clone your existing deployment tasks and ensure that `kubeconfig` points to the new AKS cluster.
161161

162162
If that's not possible, export resource definitions from your existing Kubernetes cluster and then apply them to AKS. You can use `kubectl` to export objects.
163163

@@ -173,5 +173,5 @@ In this article we summarized migration details for:
173173
> * Ensure valid quotas
174174
> * High Availability and business continuity
175175
> * Considerations for stateless applications
176-
> * Considerations for statefull applications
176+
> * Considerations for stateful applications
177177
> * Deployment of your cluster configuration

articles/aks/concepts-diagnostics.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---
1+
---
22
title: Azure Kubernetes Service (AKS) Diagnostics Overview
33
description: Learn about self-diagnosing clusters in Azure Kubernetes Service.
44
services: container-service
@@ -20,14 +20,13 @@ To access AKS Diagnostics:
2020

2121
- Navigate to your Kubernetes cluster in the [Azure portal](https://portal.azure.com).
2222
- Click on **Diagnose and solve problems** in the left navigation, which opens AKS Diagnostics.
23-
- Choose a category that best describes the issue of your cluster by using the keywords in the homepage tile
24-
OR type a keyword that best describes your issue in the search bar, for example _Cluster Node Issues_.
23+
- Choose a category that best describes the issue of your cluster by using the keywords in the homepage tile, or type a keyword that best describes your issue in the search bar, for example _Cluster Node Issues_.
2524

2625
![Homepage](./media/concepts-diagnostics/aks-diagnostics-homepage.png)
2726

2827
## View a diagnostic report
2928

30-
After you click on a category, you can view a diagnostic report specific to your cluster. Diagnostic report intelligently calls out if there is any issue in your cluster with status icons. You can drill down on each topic by clicking on **More Info** to see detailed description of the issue, recommended actions, links to helpful docs, related-metrics, and logging data. Diagnostic reports are intelligently generated based on the current state of your cluster after running variety of checks. Diagnostic reports can be a useful tool for pinpointing the problem of your cluster and finding the next steps to resolve the issue.
29+
After you click on a category, you can view a diagnostic report specific to your cluster. Diagnostic report intelligently calls out if there is any issue in your cluster with status icons. You can drill down on each topic by clicking on **More Info** to see detailed description of the issue, recommended actions, links to helpful docs, related-metrics, and logging data. Diagnostic reports are intelligently generated based on the current state of your cluster after running a variety of checks. Diagnostic reports can be a useful tool for pinpointing the problem of your cluster and finding the next steps to resolve the issue.
3130

3231
![Diagnostic Report](./media/concepts-diagnostics/diagnostic-report.png)
3332

@@ -69,7 +68,7 @@ CRUD Operations checks for any CRUD operations that may cause issues in your clu
6968

7069
### Identity and security management
7170

72-
Identity and security Management detects authentication and authorization errors that may prevent communication to your cluster.
71+
Identity and Security Management detects authentication and authorization errors that may prevent communication to your cluster.
7372

7473
- Node authorization failures
7574
- 401 errors

articles/aks/kubernetes-draft.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.author: zarhoads
1313

1414
Draft is an open-source tool that helps package and run application containers in a Kubernetes cluster. With Draft, you can quickly redeploy an application to Kubernetes as code changes occur without having to commit your changes to version control. For more information on Draft, see the [Draft documentation on GitHub][draft-documentation].
1515

16-
This article shows you how to use Draft package and run an application on AKS.
16+
This article shows you how to use Draft to package and run an application on AKS.
1717

1818

1919
## Prerequisites
@@ -167,7 +167,7 @@ You've configured Draft to use your ACR, and Draft can push container images to
167167

168168
## Download the sample application
169169

170-
This quickstart uses [an example java application from the Draft GitHub repository][example-java]. Clone the application from GitHub and navigate to the `draft/examples/example-java/` directory.
170+
This quickstart uses [an example Java application from the Draft GitHub repository][example-java]. Clone the application from GitHub and navigate to the `draft/examples/example-java/` directory.
171171

172172
```console
173173
git clone https://github.com/Azure/draft
@@ -230,7 +230,7 @@ Connect to java:4567 on localhost:49804
230230
[java]: >> Listening on 0.0.0.0:4567
231231
```
232232

233-
Navigate to the application in a browser using the `localhost` url to see the sample application. In the above example, the url is `http://localhost:49804`. Stop the connection using `Ctrl+c`.
233+
Navigate to the application in a browser using the `localhost` URL to see the sample application. In the above example, the URL is `http://localhost:49804`. Stop the connection using `Ctrl+c`.
234234

235235
## Access the application on the internet
236236

articles/aks/tutorial-kubernetes-prepare-acr.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ To get the login server address, use the [az acr list][az-acr-list] command and
7878
az acr list --resource-group myResourceGroup --query "[].{acrLoginServer:loginServer}" --output table
7979
```
8080

81-
Now, tag your local *azure-vote-front* image with the *acrloginServer* address of the container registry. To indicate the image version, add *:v1* to the end of the image name:
81+
Now, tag your local *azure-vote-front* image with the *acrLoginServer* address of the container registry. To indicate the image version, add *:v1* to the end of the image name:
8282

8383
```console
8484
docker tag azure-vote-front <acrLoginServer>/azure-vote-front:v1

articles/azure-functions/functions-infrastructure-as-code.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ The function app resource is defined by using a resource of type **Microsoft.Web
125125
"[resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName'))]",
126126
"[resourceId('Microsoft.Insights/components', variables('appInsightsName'))]"
127127
]
128+
}
128129
```
129130

130131
> [!IMPORTANT]
@@ -134,7 +135,7 @@ A function app must include these application settings:
134135

135136
| Setting name | Description | Example values |
136137
|------------------------------|-------------------------------------------------------------------------------------------|---------------------------------------|
137-
| AzureWebJobsStorage | A connection string to a storage account that the Functions runtime for internal queueing | See [Storage account](#storage) |
138+
| AzureWebJobsStorage | A connection string to a storage account that the Functions runtime uses for internal queueing | See [Storage account](#storage) |
138139
| FUNCTIONS_EXTENSION_VERSION | The version of the Azure Functions runtime | `~2` |
139140
| FUNCTIONS_WORKER_RUNTIME | The language stack to be used for functions in this app | `dotnet`, `node`, `java`, `python`, or `powershell` |
140141
| WEBSITE_NODE_DEFAULT_VERSION | Only needed if using the `node` language stack, specifies the version to use | `10.14.1` |
@@ -170,7 +171,7 @@ These properties are specified in the `appSettings` collection in the `siteConfi
170171

171172
## Deploy on Consumption plan
172173

173-
The Consumption plan automatically allocates compute power when your code is running, scales out as necessary to handle load, and then scales down when code is not running. You don't have to pay for idle VMs, and you don't have to reserve capacity in advance. To learn more, see [Azure Functions scale and hosting](functions-scale.md#consumption-plan).
174+
The Consumption plan automatically allocates compute power when your code is running, scales out as necessary to handle load, and then scales in when code is not running. You don't have to pay for idle VMs, and you don't have to reserve capacity in advance. To learn more, see [Azure Functions scale and hosting](functions-scale.md#consumption-plan).
174175

175176
For a sample Azure Resource Manager template, see [Function app on Consumption plan].
176177

articles/azure-functions/functions-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.custom: H1Hack27Feb2017, mvc
1515

1616
Azure Functions allows you to run small pieces of code (called "functions") without worrying about application infrastructure. With Azure Functions, the cloud infrastructure provides all the up-to-date servers you need to keep your application running at scale.
1717

18-
A function is "triggered" by an 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.
18+
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

2020
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 and third-party services](./functions-triggers-bindings.md).
2121

articles/azure-resource-manager/templates/templates-cloud-consistency.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Azure Resource Manager capabilities will always be introduced to global Azure fi
5050

5151
1. Once you have a local clone of the repository, connect to the destination's Azure Resource Manager with PowerShell.
5252

53-
1. Import the psm1 module and execute the Test-AzureRmureRmTemplateFunctions cmdlet:
53+
1. Import the psm1 module and execute the Test-AzureRmTemplateFunctions cmdlet:
5454

5555
```powershell
5656
# Import the module

articles/cost-management-billing/costs/get-started-partners.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Regardless of the policy, partners can also view the costs if they have access t
115115

116116
Partners use the following information to enable to the policy to view Azure usage charges for their customers.
117117

118-
In the Azure portal, sign in to the partner tenant and select **Cost Management + Billing**. Select a billing account and then select **Customers**. The list of customers is associated with the billing account.
118+
In the Azure portal, sign in to the partner tenant and select **Cost Management + Billing**. Select the relevant Microsoft Partner Agreement billing account, and then select **Customers**. The list of customers is associated with the billing account.
119119

120120
In the list of customers, select the customer that you want to allow to view costs.
121121

@@ -132,7 +132,7 @@ When the cost policy is set to **Yes**, subscription users associated to the cus
132132

133133
When the cost visibility policy is enabled, all services that have subscription usage show costs at pay-as-you-go rates. Reservation usage appears with zero charges for actual and amortized costs. Purchases and entitlements are not associated to a specific subscription. So, purchases aren't displayed at the subscription scope.
134134

135-
To view costs for the customer tenant, open Cost Management + Billing and then select Billing accounts. In the list of billing accounts, select a billing account.
135+
To view costs for the customer tenant, open **Cost Management + Billing** and select the relevant Microsoft Partner Agreement billing account.
136136

137137
![Select a billing account](./media/get-started-partners/select-billing-account.png)
138138

@@ -258,7 +258,7 @@ Users with RBAC access to the subscription can also export the cost data to an A
258258

259259
### Create an export in a partner tenant or customer tenant
260260

261-
In the Azure portal, sign in to the partner tenant or customer tenant and select **Cost Management + Billing**. Select an appropriate scope, for example a billing account, and then select **Cost Analysis**. When the page loads, select **Export**. Select **View all exports** under Schedule Export.
261+
In the Azure portal, sign in to the partner tenant or customer tenant and select **Cost Management + Billing**. Select an appropriate scope, for example a Microsoft Partner Agreement billing account, and then select **Cost Analysis**. When the page loads, select **Export**. Select **View all exports** under Schedule Export.
262262

263263
![Select Export and View all exports](./media/get-started-partners/export01.png)
264264

0 commit comments

Comments
 (0)