Skip to content

Commit 5801c72

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 351cb13 + 275eb46 commit 5801c72

File tree

135 files changed

+3342
-1998
lines changed

Some content is hidden

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

135 files changed

+3342
-1998
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3291,6 +3291,11 @@
32913291
"redirect_url": "/azure/application-gateway/tutorial-autoscale-ps",
32923292
"redirect_document_id": false
32933293
},
3294+
{
3295+
"source_path": "articles/application-gateway/application-gateway-create-gateway-portal.md",
3296+
"redirect_url": "/azure/application-gateway/quick-create-portal",
3297+
"redirect_document_id": false
3298+
},
32943299
{
32953300
"source_path": "articles/application-insights/app-insights-azure-diagnostics.md",
32963301
"redirect_url": "/azure/monitoring-and-diagnostics/azure-diagnostics-configure-application-insights",

articles/active-directory/conditional-access/app-sign-in-risk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ When no longer needed, delete the test user, the Tor Browser and the conditional
209209

210210
![Multi-factor authentication](./media/app-sign-in-risk/33.png)
211211

212-
- For instructions to remove the Tor Browser, see [Uninstalling](https://tb-manual.torproject.org/en-US/uninstalling.html).
212+
- For instructions to remove the Tor Browser, see [Uninstalling](https://tb-manual.torproject.org/uninstalling/).
213213

214214
## Next steps
215215

articles/active-directory/conditional-access/technical-reference.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,13 +123,13 @@ This setting works with all browsers. However, to satisfy a device policy, like
123123

124124
| OS | Browsers | Support |
125125
| :-- | :-- | :-: |
126-
| Windows 10 | Internet Explorer, Edge, Chrome | ![Check][1] |
126+
| Windows 10 | Internet Explorer, Microsoft Edge, Chrome | ![Check][1] |
127127
| Windows 8 / 8.1 | Internet Explorer, Chrome | ![Check][1] |
128128
| Windows 7 | Internet Explorer, Chrome | ![Check][1] |
129129
| iOS | Safari, Intune Managed Browser | ![Check][1] |
130130
| Android | Chrome, Intune Managed Browser | ![Check][1] |
131-
| Windows Phone | Internet Explorer, Edge | ![Check][1] |
132-
| Windows Server 2016 | Internet Explorer, Edge | ![Check][1] |
131+
| Windows Phone | Internet Explorer, Microsoft Edge | ![Check][1] |
132+
| Windows Server 2016 | Internet Explorer, Microsoft Edge | ![Check][1] |
133133
| Windows Server 2016 | Chrome | Coming soon |
134134
| Windows Server 2012 R2 | Internet Explorer, Chrome | ![Check][1] |
135135
| Windows Server 2008 R2 | Internet Explorer, Chrome | ![Check][1] |

articles/active-directory/develop/howto-v1-debug-saml-sso-issues.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ We recommend installing the [My Apps Secure Sign-in Extension](../user-help/acti
2828
To download and install the My Apps Secure Sign-in Extension, use one of the following links.
2929

3030
- [Chrome](https://go.microsoft.com/fwlink/?linkid=866367)
31-
- [Edge](https://go.microsoft.com/fwlink/?linkid=845176)
31+
- [Microsoft Edge](https://go.microsoft.com/fwlink/?linkid=845176)
3232
- [Firefox](https://go.microsoft.com/fwlink/?linkid=866366)
3333

3434

articles/active-directory/develop/quickstart-v2-windows-desktop.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.devlang: na
1414
ms.topic: quickstart
1515
ms.tgt_pltfrm: na
1616
ms.workload: identity
17-
ms.date: 11/01/2018
17+
ms.date: 11/15/2018
1818
ms.author: jmprieur
1919
ms.custom: aaddev
2020
#Customer intent: As an application developer, I want to learn how my Windows desktop .NET application can get an access token and call an API that's protected by an Azure AD v2.0 endpoint.
@@ -30,21 +30,22 @@ In this quickstart, you'll learn how to write a Windows desktop .NET (WPF) appli
3030

3131
> [!div renderon="docs"]
3232
> ## Register and download your quickstart app
33-
> [!div renderon="docs" class="sxs-lookup"]
3433
> You have two options to start your quickstart application:
3534
> * [Express] [Option 1: Register and auto configure your app and then download your code sample](#option-1-register-and-auto-configure-your-app-and-then-download-your-code-sample)
3635
> * [Manual] [Option 2: Register and manually configure your application and code sample](#option-2-register-and-manually-configure-your-application-and-code-sample)
3736
>
3837
> ### Option 1: Register and auto configure your app and then download your code sample
3938
>
40-
> 1. Go to the [Azure portal - Application Registration](https://portal.azure.com/?Microsoft_AAD_RegisteredApps=true#blade/Microsoft_AAD_RegisteredApps)
39+
> 1. Go to the [Azure portal - Application Registration (Preview)](https://portal.azure.com/?Microsoft_AAD_RegisteredApps=true#blade/Microsoft_AAD_RegisteredApps/applicationsListBlade/quickStartType/WinDesktopQuickstartPage/sourceType/docs).
4140
> 1. Enter a name for your application and select **Register**.
4241
> 1. Follow the instructions to download and automatically configure your new application with just one click.
4342
>
4443
> ### Option 2: Register and manually configure your application and code sample
45-
> [!div renderon="docs"]
44+
>
4645
> #### Step 1: Register your application
47-
> 1. Sign in to the [Azure portal](https://portal.azure.com) using either a work or school account, or a personal Microsoft account.
46+
> To register your application and add the app's registration information to your solution manually, follow these steps:
47+
>
48+
> 1. Sign in to the [Azure portal](https://portal.azure.com) using either a work or school account or a personal Microsoft account.
4849
> 1. If your account gives you access to more than one tenant, select your account in the top right corner, and set your portal session to the desired Azure AD tenant.
4950
> 1. In the left-hand navigation pane, select the **Azure Active Directory** service, and then select **App registrations (Preview)** > **New registration**.
5051
> 1. When the **Register an application** page appears, enter your application's registration information:
@@ -55,8 +56,8 @@ In this quickstart, you'll learn how to write a Windows desktop .NET (WPF) appli
5556
> 1. In the **Redirect URIs** section, locate the **Suggested Redirect URIs for public clients (mobile, desktop)** section, and select **"urn:ietf:wg:oauth:2.0:oob**.
5657
> 1. Select **Save**.
5758
58-
> [!div renderon="portal" class="sxs-lookup"]
59-
> #### Step 1: Configure your application
59+
> [!div class="sxs-lookup" renderon="portal"]
60+
> #### Step 1: Configure your application in Azure portal
6061
> For the code sample for this quickstart to work, you need to add a reply URL as **urn:ietf:wg:oauth:2.0:oob**.
6162
> > [!div renderon="portal" id="makechanges" class="nextstepaction"]
6263
> > [Make this change for me]()

articles/active-directory/fundamentals/active-directory-deployment-checklist-p2.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@ ms.reviewer:
1616
---
1717
# Azure Active Directory Premium P2 licensing feature checklist
1818

19-
It can seem daunting to deploy Azure Active Directory (Azure AD) for your organization and keep it secure. This article identifies some common tasks that customers find helpful to complete over the course of 30 days, 90 days, or beyond to enhance their security posture. Even organizations who have already deployed Azure AD can use this checklist to ensure they are getting the most out of their investment.
19+
It can seem overwhelming to deploy Azure Active Directory (Azure AD) for your organization and keep it secure. This article identifies some common tasks that customers find helpful. Customers typically complete these tasks over the course of 30 days, 90 days, or beyond to enhance their security posture. Even organizations who have already deployed Azure AD can use this checklist to make sure they're getting the most out of their investment.
2020

2121
A well-planned and executed identity infrastructure paves the way for more secure access to your productivity workloads and data only by authenticated users and devices.
2222

2323
## Prerequisites
2424

25-
This guide assumes you have Azure AD Premium P2 licenses, Enterprise Mobility + Security E5, Microsoft 365 E5, or an equivalent license bundle.
25+
This guide assumes you have Azure AD Premium P2 licenses, Enterprise Mobility + Security E5, Microsoft 365 E5, or a similar license bundle.
2626

2727
[Azure AD licensing](https://azure.microsoft.com/pricing/details/active-directory/)
2828

29-
[Microsoft 365 Enterprise](https://www.microsoft.com/licensing/product-licensing/microsoft-365-enterprise.aspx)
29+
[Microsoft 365 Enterprise](https://www.microsoft.com/en-us/licensing/product-licensing/microsoft-365-enterprise)
3030

31-
[Enterprise Mobility + Security](https://www.microsoft.com/licensing/product-licensing/enterprise-mobility-security.aspx)
31+
[Enterprise Mobility + Security](https://www.microsoft.com/en-us/licensing/product-licensing/enterprise-mobility-security)
3232

3333
## Plan and deploy: Day 1-30
3434

@@ -68,7 +68,7 @@ This guide assumes you have Azure AD Premium P2 licenses, Enterprise Mobility +
6868
- [Allow or block invitations to B2B users from specific organizations](../b2b/allow-deny-list.md)
6969
- [Grant B2B users in Azure AD access to your on-premises applications](../b2b/hybrid-cloud-to-on-premises.md)
7070
- Make decisions about user lifecycle management strategy
71-
- [Decide on device managment strategy](../devices/overview.md)
71+
- [Decide on device management strategy](../devices/overview.md)
7272
- [Usage scenarios and deployment considerations for Azure AD Join](../devices/azureadjoin-plan.md)
7373
- [Manage Windows Hello for Business in your organization](/windows/security/identity-protection/hello-for-business/hello-manage-in-organization)
7474

articles/active-directory/fundamentals/toc.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,6 @@
8181
- name: Azure Active Directory FAQ
8282
href: active-directory-faq.md
8383
- name: Azure Active Directory deployment plans
84-
href: active-directory-deployment-plans.md
84+
href: active-directory-deployment-plans.md
85+
- name: Archive for What's new? in Azure AD
86+
href: whats-new-archive.md

0 commit comments

Comments
 (0)