Skip to content

Commit e383975

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into robinsh-0814
2 parents 8cd8681 + 609621f commit e383975

File tree

286 files changed

+3945
-2570
lines changed

Some content is hidden

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

286 files changed

+3945
-2570
lines changed

.openpublishing.redirection.json

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3265,6 +3265,16 @@
32653265
"redirect_url": "/azure/azure-portal/azure-portal-dashboards",
32663266
"redirect_document_id": false
32673267
},
3268+
{
3269+
"source_path": "articles/azure-resource-manager/resource-manager-powershell-sas-token.md",
3270+
"redirect_url": "/azure/azure-resource-manager/secure-template-with-sas-token",
3271+
"redirect_document_id": false
3272+
},
3273+
{
3274+
"source_path": "articles/azure-resource-manager/resource-manager-cli-sas-token.md",
3275+
"redirect_url": "/azure/azure-resource-manager/secure-template-with-sas-token",
3276+
"redirect_document_id": false
3277+
},
32683278
{
32693279
"source_path": "articles/azure-resource-manager/resource-manager-tutorial-move-resources.md",
32703280
"redirect_url": "/azure/azure-resource-manager/resource-group-move-resources",
@@ -25854,6 +25864,16 @@
2585425864
"redirect_url": "/azure/security-center/security-center-detection-capabilities",
2585525865
"redirect_document_id": false
2585625866
},
25867+
{
25868+
"source_path": "articles/security-center/security-center-alerts-type.md",
25869+
"redirect_url": "/azure/security-center/security-center-alerts-overview",
25870+
"redirect_document_id": false
25871+
},
25872+
{
25873+
"source_path": "articles/security-center/security-center-ueba-mcas.md",
25874+
"redirect_url": "/azure/security-center/security-center-alerts-service-layer#azure-management-layer-azure-resource-manager-preview",
25875+
"redirect_document_id": false
25876+
},
2585725877
{
2585825878
"source_path": "articles/virtual-network/virtual-network-deploy-multinic-arm-cli.md",
2585925879
"redirect_url": "/azure/virtual-machines/linux/multiple-nics",
@@ -33686,7 +33706,7 @@
3368633706
},
3368733707
{
3368833708
"source_path": "articles/active-directory/user-help/user-help-my-apps-overview.md",
33689-
"redirect_url": "/azure/active-directory/user-help/myapps-portal-end-user-overview",
33709+
"redirect_url": "/azure/active-directory/user-help/my-apps-portal-end-user-overview",
3369033710
"redirect_document_id": false
3369133711
},
3369233712
{
@@ -33696,7 +33716,7 @@
3369633716
},
3369733717
{
3369833718
"source_path": "articles/active-directory/user-help/active-directory-saas-access-panel-user-help.md",
33699-
"redirect_url": "/azure/active-directory/user-help/myapps-portal-end-user-troubleshoot",
33719+
"redirect_url": "/azure/active-directory/user-help/my-apps-portal-end-user-troubleshoot",
3370033720
"redirect_document_id": false
3370133721
},
3370233722
{

articles/active-directory-domain-services/deploy-azure-app-proxy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ To perform the tasks listed in this article, you need:
3232

3333
1. A valid **Azure subscription**.
3434
2. An **Azure AD directory** - either synchronized with an on-premises directory or a cloud-only directory.
35-
3. An **Azure AD Basic or Premium license** is required to use the Azure AD Application Proxy.
35+
3. An **Azure AD Premium license** is required to use the Azure AD Application Proxy.
3636
4. **Azure AD Domain Services** must be enabled for the Azure AD directory. If you haven't done so, follow all the tasks outlined in the [Getting Started guide](create-instance.md).
3737

3838
<br>

articles/active-directory-domain-services/faqs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ No. Once you have enabled an Azure AD Domain Services managed domain, the servic
9797
No. Azure AD Domain Services does not currently provide a geo-redundant deployment model. It is limited to a single virtual network in an Azure region. If you want to utilize multiple Azure regions, you need to run your Active Directory Domain Controllers on Azure IaaS VMs. Architecture guidance can be found [here](https://docs.microsoft.com/azure/architecture/reference-architectures/identity/adds-extend-domain).
9898

9999
### Can I get Azure AD Domain Services as part of Enterprise Mobility Suite (EMS)? Do I need Azure AD Premium to use Azure AD Domain Services?
100-
No. Azure AD Domain Services is a pay-as-you-go Azure service and is not part of EMS. Azure AD Domain Services can be used with all editions of Azure AD (Free, Basic, and, Premium). You are billed on an hourly basis, depending on usage.
100+
No. Azure AD Domain Services is a pay-as-you-go Azure service and is not part of EMS. Azure AD Domain Services can be used with all editions of Azure AD (Free and Premium). You are billed on an hourly basis, depending on usage.
101101

102102
### What Azure regions is the service available in?
103103
Refer to the [Azure Services by region](https://azure.microsoft.com/regions/#services/) page to see a list of the Azure regions where Azure AD Domain Services is available.

articles/active-directory/develop/access-tokens.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Claims are present only if a value exists to fill it. So, your app shouldn't tak
8383

8484
| Claim | Format | Description |
8585
|-----|--------|-------------|
86-
| `aud` | String, an App ID URI | Identifies the intended recipient of the token. In access tokens, the audience is your app's Application ID, assigned to your app in the Azure portal. Your app should validate this value and reject the token if the value does not match. |
86+
| `aud` | String, an App ID URI | Identifies the intended recipient of the token. In id tokens, the audience is your app's Application ID, assigned to your app in the Azure portal. Your app should validate this value and reject the token if the value does not match. |
8787
| `iss` | String, an STS URI | Identifies the security token service (STS) that constructs and returns the token, and the Azure AD tenant in which the user was authenticated. If the token issued is a v2.0 token (see the `ver` claim), the URI will end in `/v2.0`. The GUID that indicates that the user is a consumer user from a Microsoft account is `9188040d-6c67-4c5b-b112-36a304b66dad`. Your app should use the GUID portion of the claim to restrict the set of tenants that can sign in to the app, if applicable. |
8888
|`idp`| String, usually an STS URI | Records the identity provider that authenticated the subject of the token. This value is identical to the value of the Issuer claim unless the user account not in the same tenant as the issuer - guests, for instance. If the claim isn't present, it means that the value of `iss` can be used instead. For personal accounts being used in an organizational context (for instance, a personal account invited to an Azure AD tenant), the `idp` claim may be 'live.com' or an STS URI containing the Microsoft account tenant `9188040d-6c67-4c5b-b112-36a304b66dad`. |
8989
| `iat` | int, a UNIX timestamp | "Issued At" indicates when the authentication for this token occurred. |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ Not every application type is available on every platform. You can also use vari
192192
| [Desktop app that calls web APIs](scenario-desktop-overview.md) <br/> [![Desktop app that calls web APIs](media/scenarios/desktop-app.svg)](scenario-desktop-overview.md) ![Device code flow](media/scenarios/device-code-flow-app.svg) | ![MSAL.NET](media/sample-v2-code/logo_NET.png) MSAL.NET ![.NET Core](media/sample-v2-code/logo_NETcore.png) MSAL.NET ![MSAL Java](media/sample-v2-code/logo_java.png) msal4j ![MSAL Python](media/sample-v2-code/logo_python.png) MSAL Python| ![.NET Core](media/sample-v2-code/logo_NETcore.png)MSAL.NET ![MSAL Java](media/sample-v2-code/logo_java.png) msal4j ![MSAL Python](media/sample-v2-code/logo_python.png) MSAL Python| ![.NET Core](media/sample-v2-code/logo_NETcore.png) MSAL.NET ![MSAL Java](media/sample-v2-code/logo_java.png) msal4j ![MSAL Python](media/sample-v2-code/logo_python.png) MSAL Python
193193
| [Mobile app that calls web APIs](scenario-mobile-overview.md) <br/> [![Mobile app that calls web APIs](media/scenarios/mobile-app.svg)](scenario-mobile-overview.md) | ![UWP](media/sample-v2-code/logo_windows.png) MSAL.NET ![Xamarin](media/sample-v2-code/logo_xamarin.png) MSAL.NET | | | ![iOS / Objective C or swift](media/sample-v2-code/logo_iOS.png) MSAL.iOS | ![Android](media/sample-v2-code/logo_Android.png) MSAL.Android
194194
| [Daemon app](scenario-daemon-overview.md) <br/> [![Daemon app](media/scenarios/daemon-app.svg)](scenario-daemon-overview.md) | ![.NET](media/sample-v2-code/logo_NET.png) MSAL.NET ![.NET Core](media/sample-v2-code/logo_NETcore.png)MSAL.NET ![MSAL Java](media/sample-v2-code/logo_java.png) msal4j ![MSAL Python](media/sample-v2-code/logo_python.png) MSAL Python| ![.NET Core](media/sample-v2-code/logo_NETcore.png) MSAL.NET ![MSAL Java](media/sample-v2-code/logo_java.png) msal4j ![MSAL Python](media/sample-v2-code/logo_python.png) MSAL Python| ![.NET Core](media/sample-v2-code/logo_NETcore.png)MSAL.NET ![MSAL Java](media/sample-v2-code/logo_java.png) msal4j ![MSAL Python](media/sample-v2-code/logo_python.png) MSAL Python
195-
| [Web API that calls web APIs](scenario-web-api-call-api-overview.md) <br/> [![Web API that calls web APIs](media/scenarios/web-api.svg)](scenario-web-api-call-api-overview.md) | ![.NET](media/sample-v2-code/logo_NET.png) <br/> ASP.NET + MSAL.NET ![.NET Core](media/sample-v2-code/logo_NETcore.png) <br/> ASP.NET Core + MSAL.NET| ![.NET Core](media/sample-v2-code/logo_NETcore.png) <br/> ASP.NET Core + MSAL.NET| ![.NET Core](media/sample-v2-code/logo_NETcore.png)<br/> ASP.NET Core + MSAL.NET
195+
| [Web API that calls web APIs](scenario-web-api-call-api-overview.md) <br/> [![Web API that calls web APIs](media/scenarios/web-api.svg)](scenario-web-api-call-api-overview.md) | ![.NET](media/sample-v2-code/logo_NET.png) MSAL.NET ![.NET Core](media/sample-v2-code/logo_NETcore.png)MSAL.NET ![MSAL Java](media/sample-v2-code/logo_java.png) msal4j ![MSAL Python](media/sample-v2-code/logo_python.png) MSAL Python| ![.NET Core](media/sample-v2-code/logo_NETcore.png) MSAL.NET ![MSAL Java](media/sample-v2-code/logo_java.png) msal4j ![MSAL Python](media/sample-v2-code/logo_python.png) MSAL Python| ![.NET Core](media/sample-v2-code/logo_NETcore.png)MSAL.NET ![MSAL Java](media/sample-v2-code/logo_java.png) msal4j ![MSAL Python](media/sample-v2-code/logo_python.png) MSAL Python
196196

197197
See also [Microsoft-supported libraries by OS / language](reference-v2-libraries.md#microsoft-supported-libraries-by-os--language)
198198

0 commit comments

Comments
 (0)