Skip to content

Commit 7f9b7b0

Browse files
ktoliverktoliver
committed
fix merge conflict
2 parents ecf41b5 + f860159 commit 7f9b7b0

File tree

521 files changed

+6596
-4808
lines changed

Some content is hidden

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

521 files changed

+6596
-4808
lines changed

‎.openpublishing.publish.config.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,12 @@
277277
"url": "https://github.com/Azure-Samples/Cognitive-Face-CSharp-sample",
278278
"branch": "master",
279279
"branch_mapping": {}
280+
},
281+
{
282+
"path_to_root": "cognitive-services-face-android-detect",
283+
"url": "https://github.com/Azure-Samples/cognitive-services-face-android-detect",
284+
"branch": "master",
285+
"branch_mapping": {}
280286
}
281287
],
282288
"branch_target_mapping": {

‎.openpublishing.redirection.json

Lines changed: 160 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,21 @@
155155
"redirect_url": "/azure/active-directory/users-groups-roles/users-sharing-accounts",
156156
"redirect_document_id": true
157157
},
158+
{
159+
"source_path": "articles/active-directory/fundamentals/active-directory-administer.md",
160+
"redirect_url": "/azure/active-directory/fundamentals/active-directory-whatis",
161+
"redirect_document_id": false
162+
},
163+
{
164+
"source_path": "articles/active-directory/fundamentals/identity-fundamentals.md",
165+
"redirect_url": "/azure/active-directory/fundamentals/active-directory-whatis",
166+
"redirect_document_id": false
167+
},
168+
{
169+
"source_path": "articles/active-directory/fundamentals/understand-azure-identity-solutions.md",
170+
"redirect_url": "/azure/active-directory/fundamentals/active-directory-whatis",
171+
"redirect_document_id": false
172+
},
158173
{
159174
"source_path": "articles/active-directory/fundamentals/active-directory-groups-restore-azure-portal.md",
160175
"redirect_url": "/azure/active-directory/users-groups-roles/groups-restore-deleted",
@@ -3276,6 +3291,11 @@
32763291
"redirect_url": "/azure/application-gateway/tutorial-autoscale-ps",
32773292
"redirect_document_id": false
32783293
},
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+
},
32793299
{
32803300
"source_path": "articles/application-insights/app-insights-azure-diagnostics.md",
32813301
"redirect_url": "/azure/monitoring-and-diagnostics/azure-diagnostics-configure-application-insights",
@@ -30166,6 +30186,11 @@
3016630186
"source_path": "articles/container-registry/container-registry-build-overview.md",
3016730187
"redirect_url": "/azure/container-registry/container-registry-tasks-overview",
3016830188
"redirect_document_id" : true
30189+
},
30190+
{
30191+
"source_path": "articles/active-directory/hybrid/reference-connect-sync-connector-version-history.md",
30192+
"redirect_url": "https://docs.microsoft.com/microsoft-identity-manager/reference/microsoft-identity-manager-2016-connector-version-history",
30193+
"redirect_document_id" : true
3016930194
},
3017030195
{
3017130196
"source_path": "articles/container-registry/container-registry-tutorial-quick-build.md",
@@ -30560,7 +30585,141 @@
3056030585
"source_path": "articles/backup/backup-mabs-upgrade-to-v2.md",
3056130586
"redirect_url": "/azure/backup/backup-mabs-whats-new-mabs",
3056230587
"redirect_document_id" : false
30588+
},
30589+
{
30590+
"source_path": "articles/monitoring/monitoring-solution-agenthealth.md",
30591+
"redirect_url": "/azure/azure-monitor/insights/solution-agenthealth",
30592+
"redirect_document_id": "false"
30593+
},
30594+
{
30595+
"source_path": "articles/monitoring/monitoring-solution-office-365.md",
30596+
"redirect_url": "/azure/azure-monitor/insights/solution-office-365",
30597+
"redirect_document_id": "false"
30598+
},
30599+
{
30600+
"source_path": "articles/monitoring/monitoring-solutions.md",
30601+
"redirect_url": "/azure/azure-monitor/insights/solutions",
30602+
"redirect_document_id": "false"
30603+
},
30604+
{
30605+
"source_path": "articles/monitoring/monitoring-solutions-best-practices.md",
30606+
"redirect_url": "/azure/azure-monitor/insights/solutions-best-practices",
30607+
"redirect_document_id": "false"
30608+
},
30609+
{
30610+
"source_path": "articles/monitoring/monitoring-solutions-creating.md",
30611+
"redirect_url": "/azure/azure-monitor/insights/solutions-creating",
30612+
"redirect_document_id": "false"
30613+
},
30614+
{
30615+
"source_path": "articles/monitoring/monitoring-solutions-inventory.md",
30616+
"redirect_url": "/azure/azure-monitor/insights/solutions-inventory",
30617+
"redirect_document_id": "false"
30618+
},
30619+
{
30620+
"source_path": "articles/monitoring/monitoring-solutions-resources-automation.md",
30621+
"redirect_url": "/azure/azure-monitor/insights/solutions-resources-automation",
30622+
"redirect_document_id": "false"
30623+
},
30624+
{
30625+
"source_path": "articles/monitoring/monitoring-solutions-resources-searches-alerts.md",
30626+
"redirect_url": "/azure/azure-monitor/insights/solutions-resources-searches-alerts",
30627+
"redirect_document_id": "false"
30628+
},
30629+
{
30630+
"source_path": "articles/monitoring/monitoring-solutions-resources-views.md",
30631+
"redirect_url": "/azure/azure-monitor/insights/solutions-resources-views",
30632+
"redirect_document_id": "false"
30633+
},
30634+
{
30635+
"source_path": "articles/monitoring/monitoring-solutions-solution-file.md",
30636+
"redirect_url": "/azure/azure-monitor/insights/solutions-solution-file",
30637+
"redirect_document_id": "false"
30638+
},
30639+
{
30640+
"source_path": "articles/monitoring/monitoring-solution-targeting.md",
30641+
"redirect_url": "/azure/azure-monitor/insights/solution-targeting",
30642+
"redirect_document_id": "false"
30643+
},
30644+
{
30645+
"source_path": "articles/monitoring/monitoring-container-insights-analyze.md",
30646+
"redirect_url": "/azure/azure-monitor/insights/container-insights-analyze",
30647+
"redirect_document_id": "false"
30648+
},
30649+
{
30650+
"source_path": "articles/monitoring/monitoring-container-insights-onboard.md",
30651+
"redirect_url": "/azure/azure-monitor/insights/container-insights-onboard",
30652+
"redirect_document_id": "false"
30653+
},
30654+
{
30655+
"source_path": "articles/monitoring/monitoring-container-insights-optout.md",
30656+
"redirect_url": "/azure/azure-monitor/insights/container-insights-optout",
30657+
"redirect_document_id": "false"
30658+
},
30659+
{
30660+
"source_path": "articles/monitoring/monitoring-container-insights-overview.md",
30661+
"redirect_url": "/azure/azure-monitor/insights/container-insights-overview",
30662+
"redirect_document_id": "false"
30663+
},
30664+
{
30665+
"source_path": "articles/monitoring/monitoring-container-insights-troubleshoot.md",
30666+
"redirect_url": "/azure/azure-monitor/insights/container-insights-troubleshoot",
30667+
"redirect_document_id": "false"
30668+
},
30669+
{
30670+
"source_path": "articles/monitoring/monitoring-container-overview.md",
30671+
"redirect_url": "/azure/azure-monitor/insights/container-overview",
30672+
"redirect_document_id": "false"
30673+
},
30674+
{
30675+
"source_path": "articles/monitoring/monitoring-container-agent-upgrade.md",
30676+
"redirect_url": "/azure/azure-monitor/insights/container-agent-upgrade",
30677+
"redirect_document_id": "false"
30678+
},
30679+
{
30680+
"source_path": "articles/monitoring/monitoring-vminsights-faq.md",
30681+
"redirect_url": "/azure/azure-monitor/insights/vminsights-faq",
30682+
"redirect_document_id": "false"
30683+
},
30684+
{
30685+
"source_path": "articles/monitoring/monitoring-vminsights-health.md",
30686+
"redirect_url": "/azure/azure-monitor/insights/vminsights-health",
30687+
"redirect_document_id": "false"
30688+
},
30689+
{
30690+
"source_path": "articles/monitoring/monitoring-vminsights-known-issues.md",
30691+
"redirect_url": "/azure/azure-monitor/insights/vminsights-known-issues",
30692+
"redirect_document_id": "false"
30693+
},
30694+
{
30695+
"source_path": "articles/monitoring/monitoring-vminsights-log-search.md",
30696+
"redirect_url": "/azure/azure-monitor/insights/vminsights-log-search",
30697+
"redirect_document_id": "false"
30698+
},
30699+
{
30700+
"source_path": "articles/monitoring/monitoring-vminsights-maps.md",
30701+
"redirect_url": "/azure/azure-monitor/insights/vminsights-maps",
30702+
"redirect_document_id": "false"
30703+
},
30704+
{
30705+
"source_path": "articles/monitoring/monitoring-vminsights-onboard.md",
30706+
"redirect_url": "/azure/azure-monitor/insights/vminsights-onboard",
30707+
"redirect_document_id": "false"
30708+
},
30709+
{
30710+
"source_path": "articles/monitoring/monitoring-vminsights-overview.md",
30711+
"redirect_url": "/azure/azure-monitor/insights/vminsights-overview",
30712+
"redirect_document_id": "false"
30713+
},
30714+
{
30715+
"source_path": "articles/monitoring/monitoring-vminsights-performance.md",
30716+
"redirect_url": "/azure/azure-monitor/insights/vminsights-performance",
30717+
"redirect_document_id": "false"
30718+
},
30719+
{
30720+
"source_path": "articles/monitoring/monitoring-vminsights-optout.md",
30721+
"redirect_url": "/azure/azure-monitor/insights/vminsights-optout",
30722+
"redirect_document_id": "false"
3056330723
}
30564-
3056530724
]
3056630725
}

‎articles/active-directory-b2c/active-directory-b2c-custom-guide-eventlogger-appins.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ When you use Azure Active Directory (Azure AD) B2C together with Azure Applicati
2727
2828
## How it works
2929

30-
The Identity Experience Framework in Azure AD B2C includes the provider `Handler="Web.TPEngine.Providers.UserJourneyContextProvider, Web.TPEngine, Version=1.0.0.0`. It sends event data directly to Application Insights by using the instrumentation key provided to Azure AD B2C.
30+
The Identity Experience Framework in Azure AD B2C includes the provider `Handler="Web.TPEngine.Providers.AzureApplicationInsightsProvider, Web.TPEngine, Version=1.0.0.0`. It sends event data directly to Application Insights by using the instrumentation key provided to Azure AD B2C.
3131

3232
A technical profile uses this provider to define an event from Azure AD B2C. The profile specifies the name of the event, the claims that are recorded, and the instrumentation key. To post an event, the technical profile is then added as an `orchestration step`, or as a `validation technical profile` in a custom user journey.
3333

‎articles/active-directory/authentication/howto-password-smart-lockout.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.component: authentication
88
ms.topic: conceptual
9-
ms.date: 07/18/2018
9+
ms.date: 11/12/2018
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
@@ -18,10 +18,18 @@ ms.reviewer: rogoya
1818

1919
Smart lockout uses cloud intelligence to lock out bad actors who are trying to guess your users’ passwords or use brute-force methods to get in. That intelligence can recognize sign-ins coming from valid users and treat them differently than ones of attackers and other unknown sources. Smart lockout locks out the attackers, while letting your users continue to access their accounts and be productive.
2020

21-
By default, smart lockout locks the account from sign-in attempts for one minute after ten failed attempts. The account locks again after each subsequent failed sign-in attempt, for one minute at first and longer in subsequent attempts.
21+
By default, smart lockout locks the account from sign-in attempts for one minute after 10 failed attempts. The account locks again after each subsequent failed sign-in attempt, for one minute at first and longer in subsequent attempts.
22+
23+
* Smart lockout tracks the last three bad password hashes to avoid reincrementing the lockout counter. If someone enters the same bad password multiple times, this behavior will not cause the account to lockout.
24+
* This functionality is not available for customers with pass-through authentication enabled.
2225

2326
Smart lockout is always on for all Azure AD customers with these default settings that offer the right mix of security and usability. Customization of the smart lockout settings, with values specific to your organization, requires Azure AD Basic or higher licenses for your users.
2427

28+
Using smart lockout does not guarantee that a genuine user will never be locked out. When smart lockout locks a user account, we try our best to not lockout the genuine user. The lockout service attempts to ensure that bad actors can’t gain access to a genuine users account.
29+
30+
* Each Azure Active Directory data center tracks lockout independently. A user will have (threshold_limit * datacenter_count) number of attempts, if the user hits each data center.
31+
* Smart Lockout uses familiar location vs unfamiliar location to differentiate between a bad actor and the genuine user. Unfamiliar and familiar locations will both have separate lockout counters.
32+
2533
Smart lockout can be integrated with hybrid deployments, using password hash sync or pass-through authentication to protect on-premises Active Directory accounts from being locked out by attackers. By setting smart lockout policies in Azure AD appropriately, attacks can be filtered out before they reach on-premises Active Directory.
2634

2735
When using [pass-through authentication](../hybrid/how-to-connect-pta.md), you need to make sure that:

‎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]()

0 commit comments

Comments
 (0)