Skip to content

Commit a25a257

Browse files
authored
Merge pull request #95576 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 5a8fffd + 527db49 commit a25a257

File tree

9 files changed

+19
-11
lines changed

9 files changed

+19
-11
lines changed

articles/active-directory/develop/scenario-web-api-call-api-app-configuration.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,8 @@ private void AddAccountToCacheFromJwt(IEnumerable<string> scopes, JwtSecurityTok
138138
}
139139
```
140140

141+
You can also see an example of on behalf of flow implementation in [NodeJS and Azure Functions](https://github.com/Azure-Samples/ms-identity-nodejs-webapi-onbehalfof-azurefunctions/blob/master/MiddleTierAPI/MyHttpTrigger/index.js#L61).
142+
141143
## Protocol
142144

143145
For more information about the on-behalf-of protocol, see [Microsoft identity platform and OAuth 2.0 On-Behalf-Of flow](https://docs.microsoft.com/azure/active-directory/develop/v2-oauth2-on-behalf-of-flow).

articles/active-directory/develop/tutorial-v2-ios.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ let kScopes: [String] = ["https://graph.microsoft.com/user.read"] // request per
138138
let kAuthority = "https://login.microsoftonline.com/common" // this authority allows a personal Microsoft account and a work or school account in any organization’s Azure AD tenant to sign in
139139
var accessToken = String()
140140
var applicationContext : MSALPublicClientApplication?
141-
var webViewParamaters : MSALWebviewParameters?
141+
var webViewParameters : MSALWebviewParameters?
142142
```
143143

144144
The only value you need to modify above is the value assigned to `kClientID`to be your [Application ID](https://docs.microsoft.com/azure/active-directory/develop/developer-glossary#application-id-client-id). This value is part of the MSAL Configuration data that you saved during the step at the beginning of this tutorial to register the application in the Azure portal.
@@ -318,16 +318,16 @@ Add the following after `initMSAL` method to the `ViewController` class.
318318

319319
```swift
320320
func initWebViewParams() {
321-
self.webViewParamaters = MSALWebviewParameters(parentViewController: self)
321+
self.webViewParameters = MSALWebviewParameters(parentViewController: self)
322322
}
323323
```
324324

325325
### macOS code:
326326

327327
```swift
328328
func initWebViewParams() {
329-
self.webViewParamaters = MSALWebviewParameters()
330-
self.webViewParamaters?.webviewType = .wkWebView
329+
self.webViewParameters = MSALWebviewParameters()
330+
self.webViewParameters?.webviewType = .wkWebView
331331
}
332332
```
333333

@@ -421,7 +421,7 @@ Add the following code to the `ViewController` class.
421421
func acquireTokenInteractively() {
422422

423423
guard let applicationContext = self.applicationContext else { return }
424-
guard let webViewParameters = self.webViewParamaters else { return }
424+
guard let webViewParameters = self.webViewParameters else { return }
425425

426426
// #1
427427
let parameters = MSALInteractiveTokenParameters(scopes: kScopes, webviewParameters: webViewParameters)

articles/active-directory/manage-apps/configure-single-sign-on-non-gallery-applications.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,4 +158,4 @@ For more information, see [Debug SAML-based single sign-on to applications in Az
158158
## Next steps
159159

160160
- [Assign users or groups to the application](methods-for-assigning-users-and-groups.md)
161-
- [Configure automatic user account provisioning](configure-automatic-user-provisioning-portal.md)
161+
- [Configure automatic user account provisioning](configure-automatic-user-provisioning-portal.md)

articles/app-service/app-service-web-tutorial-auth-aad.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ $routeProvider.when("/Home", {
398398
}).otherwise({ redirectTo: "/Home" });
399399
```
400400

401-
The new change adds the `revolve` mapping that calls `/.auth/me` and sets the access token. It makes sure you have the access token before instantiating the `todoListCtrl` controller. That way all API calls by the controller includes the token.
401+
The new change adds the `resolve` mapping that calls `/.auth/me` and sets the access token. It makes sure you have the access token before instantiating the `todoListCtrl` controller. That way all API calls by the controller includes the token.
402402

403403
### Deploy updates and test
404404

articles/availability-zones/az-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ To achieve comprehensive business continuity on Azure, build your application ar
3434
![conceptual view of one zone going down in a region](./media/az-overview/az-graphic-two.png)
3535

3636
> [!IMPORTANT]
37-
> The Availability Zone identifiers (the numbers 1, 2 and 3 in the picture above) are logically mapped to the actual physical zones for each subscription independently. That means that Availability Zone 1 in a given subscription might refer to a different physical zone than Availability Zone 1 in a different subscription. As a consequence, it's recommended to not relay in Availability Zone IDs across different subscriptions for virtual machine placement.
37+
> The Availability Zone identifiers (the numbers 1, 2 and 3 in the picture above) are logically mapped to the actual physical zones for each subscription independently. That means that Availability Zone 1 in a given subscription might refer to a different physical zone than Availability Zone 1 in a different subscription. As a consequence, it's recommended to not rely on Availability Zone IDs across different subscriptions for virtual machine placement.
3838
3939
## Services support by region
4040

articles/azure-maps/traffic-coverage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ manager: timlt
1515

1616
Azure Maps provides rich traffic information in the form of traffic **flow** and **incidents**. This data can be visualized on maps or used to generate smarter routes that factor in real driving conditions.
1717

18-
However, Maps does not have the same level of information and accuracy for all regions. The following table provides information about what kind of traffic information you can request from each region:
18+
However, Maps does not have the same level of information and accuracy for all countries or regions. The following table provides information about what kind of traffic information you can request from each country or region:
1919

2020
## Americas
2121

articles/azure-monitor/platform/autoscale-custom-metric.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ This article assumes that you have a web app with application insights configure
3030
![Scale by custom metric][6]
3131
- Similar to the step above, add a scale rule that will scale in and decrease the scale count by 1 if the custom metric is below a threshold.
3232
![Scale based on cpu][7]
33-
- Set the you instance limits. For example, if you want to scale between 2-5 instances depending on the custom metric fluctuations, set 'minimum' to '2', 'maximum' to '5' and 'default' to '2'
33+
- Set the instance limits. For example, if you want to scale between 2-5 instances depending on the custom metric fluctuations, set 'minimum' to '2', 'maximum' to '5' and 'default' to '2'
3434
> Note: In case there is a problem reading the resource metrics and the current capacity is below the default capacity, then to ensure the availability of the resource, Autoscale will scale out to the default value. If the current capacity is already higher than default capacity, Autoscale will not scale in.
3535
- Click on 'Save'
3636

articles/cloud-shell/troubleshooting.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,12 @@ Known resolutions for troubleshooting issues in Azure Cloud Shell include:
8484

8585
Azure Cloud Shell has the following known limitations:
8686

87+
### Quota limitations
88+
89+
Azure Cloud Shell has a limit of 20 concurrent users per tenant per region. If you try to open more simultaneous sessions than the limit, you will see an "Tenant User Over Quota" error. If you have a legitimate need to have more sessions open than this (for example for training sessions), contact support in advance of your anticipated usage to request a quota increase.
90+
91+
Cloud Shell is provided as a free service and is designed to be used to configure your Azure environment, not as a general purpose computing platform. Excessive automated usage may be considered in breach to the Azure Terms of Service and could lead to Cloud Shell access being blocked.
92+
8793
### System state and persistence
8894

8995
The machine that provides your Cloud Shell session is temporary, and it is recycled after your session is inactive for 20 minutes. Cloud Shell requires an Azure file share to be mounted. As a result, your subscription must be able to set up storage resources to access Cloud Shell. Other considerations include:

articles/virtual-machine-scale-sets/virtual-machine-scale-sets-deploy-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ To reduce the configuration management and time to provision a VM, you can creat
3333

3434

3535
## <a name="already-provisioned"></a>Install an app with the Custom Script Extension
36-
The Custom Script Extension downloads and executes scripts on Azure VMs. This extension is useful for post deployment configuration, software installation, or any other configuration / management task. Scripts can be downloaded from Azure storage or GitHub, or provided to the Azure portal at extension run-time. For more information on how to create and use a custom VM image with a scale set, see the following tutorials:
36+
The Custom Script Extension downloads and executes scripts on Azure VMs. This extension is useful for post deployment configuration, software installation, or any other configuration / management task. Scripts can be downloaded from Azure storage or GitHub, or provided to the Azure portal at extension run-time. For more information on how to install an app with a Custom Script Extension, see the following tutorials:
3737

3838
- [Azure CLI](tutorial-install-apps-cli.md)
3939
- [Azure PowerShell](tutorial-install-apps-powershell.md)

0 commit comments

Comments
 (0)