Merge branch 'master' into cats12

Author: dagiro

.openpublishing.redirection.json

@@ -4970,6 +4970,11 @@
       "redirect_url": "/azure/app-service-mobile",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/application-gateway/application-gateway-redirect-overview.md",
+      "redirect_url": "/azure/application-gateway/redirect-overview",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/application-gateway/application-gateway-create-gateway-arm-template.md",
       "redirect_url": "/azure/application-gateway/create-vmss-template",
@@ -37618,6 +37623,11 @@
       "redirect_url": "/azure/azure-monitor/platform/diagnostic-logs-stream-log-store",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/azure-monitor/log-query/simple-logs.md",
+      "redirect_url": "/azure/azure-monitor/log-query/log-query-overview",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/machine-learning/service/how-to-automated-ml.md",
       "redirect_url": "/azure/machine-learning/service/concept-automated-ml",

articles/active-directory-b2c/active-directory-b2c-faqs.md

@@ -120,9 +120,9 @@ No, Azure AD B2C does not support the same set of reports as Azure AD Premium. H
 
 Yes!  Read about [language customization](active-directory-b2c-reference-language-customization.md), which is in public preview. We provide translations for 36 languages, and you can override any string to suit your needs.
 
-### Can I use my own URLs on my sign-up and sign-in pages that are served by Azure AD B2C? For instance, can I change the URL from login.microsoftonline.com to login.contoso.com?
+### Can I use my own URLs on my sign-up and sign-in pages that are served by Azure AD B2C? For instance, can I change the URL from contoso.b2clogin.com to login.contoso.com?
 
-Not currently. This feature is on our roadmap. Verifying your domain in the **Domains** tab in the Azure portal does not accomplish this goal.
+Not currently. This feature is on our roadmap. Verifying your domain in the **Domains** tab in the Azure portal does not accomplish this goal. However, with b2clogin.com, we offer a [neutral top level domain](b2clogin.md), and thus the external appearance can be implemented without the mention of Microsoft.
 
 ### How do I delete my Azure AD B2C tenant?
 

articles/active-directory-b2c/active-directory-b2c-setup-qq-app.md

@@ -24,7 +24,7 @@ To use a QQ account as an identity provider in Azure Active Directory (Azure AD)
 ### Register for the QQ developer program
 
 1. Sign in to the [QQ developer portal](http://open.qq.com) with your QQ account credentials.
-1. After signing in, go to [http://open.qq.com/reg](http://open.qq.com/reg) to register yourself as a developer.
+1. After signing in, go to [https://open.qq.com/reg](https://open.qq.com/reg) to register yourself as a developer.
 1. Select **个人** (individual developer).
 1. Enter the required information and select **下一步** (next step).
 1. Complete the email verification process. You will need to wait a few days to be approved after registering as a developer.

articles/active-directory-b2c/active-directory-b2c-setup-twitter-app.md

@@ -23,7 +23,7 @@ To use Twitter as an identity provider in Azure AD B2C, you need to create a Twi
 1. Select  **Create an app**.
 1. Enter an **App name** and an **Application description**.
 1. In **Website URL**, enter `https://your-tenant.b2clogin.com`. Replace `your-tenant` with the name of your tenant. For example, https://contosob2c.b2clogin.com.
-1. For the **Callback URL**, enter `https://your-tenant.b2clogin.com/your-tenant.onmicrosoft.com/your-user-flow-Id/oauth1/authresp`. Replace `your-tenant` with the name of your tenant name and `your-user-flow-Id` with the identifier of your user flow. For example, `b2c_1A_signup_signin_twitter`. You need to use all lowercase letters when entering your tenant name even if the tenant is defined with uppercase letters in Azure AD B2C.
+1. For the **Callback URL**, enter `https://your-tenant.b2clogin.com/your-tenant.onmicrosoft.com/your-user-flow-Id/oauth1/authresp`. Replace `your-tenant` with the name of your tenant name and `your-user-flow-Id` with the identifier of your user flow. For example, `b2c_1A_signup_signin_twitter`. You need to use all lowercase letters when entering your tenant name and user flow id even if they are defined with uppercase letters in Azure AD B2C.
 1. At the bottom of the page, read and accept the terms, and then select **Create**.
 1. On the **App details** page, select **Edit > Edit details**, check the box for **Enable Sign in with Twitter**, and then select **Save**.
 1. Select **Keys and tokens** and record the **Consumer API Key** and the **Consumer API secret key** values to be used later.

articles/active-directory/authentication/howto-sspr-deployment.md

@@ -34,7 +34,7 @@ Before deploying SSPR, organizations may want to determine how many password res
 
 ## Licensing considerations
 
-Azure Active Directory is license per-user meaning each user has to have an appropriate license for the features they utilize.
+Azure Active Directory is licensed per-user meaning each user has to have an appropriate license for the features they utilize.
 
 More information about licensing can be found on the [Azure Active Directory pricing page](https://azure.microsoft.com/pricing/details/active-directory/)
 

articles/active-directory/develop/howto-app-gallery-listing.md

@@ -45,13 +45,8 @@ This article shows how to list an application in the Azure AD application galler
 
 - For password SSO, please ensure that your application supports form authentication so that password vaulting can be done to get single sign-on work as expected.
 
-- For automatic user-provisioning requests, application should be listed in the gallery with single sign-on feature enabled using SAML 2.0/WS-Fed. You can request for SSO and User provisioning together on the portal, if it's not already listed.
-
 - Need a permanent account for testing with atleast 2 users registered.
 
->[!NOTE]
->We are running with high number of SCIM connector requests, so we have stopped taking new requests on our portal. Please hold on your requests until further notice. We apologies for this delay and any inconvenience this may have caused.
-
 ## Submit the request in the portal
 
 After you've tested that your application integration works with Azure AD, submit your request for access on our [Application Network Portal](https://microsoft.sharepoint.com/teams/apponboarding/Apps). If you have an Office 365 account, use that to sign in to this portal. If not, use your Microsoft account (such as Outlook or Hotmail) to sign in.

articles/active-directory/develop/scenario-web-app-sign-user-sign-in.md

@@ -25,7 +25,7 @@ Learn how to add sign-in to the code for your web app that signs-in users.
 
 ## Sign-in
 
-The code we've in the previous article [app's code configuration](scenario-web-app-sign-user-app-configuration.md) is all you need to implement sign-out.
+The code we've reviewed in the previous article [app's code configuration](scenario-web-app-sign-user-app-configuration.md) is all you need to implement sign-in.
 Once the user has signed-in to your app, you probably want to enable them to sign out. ASP.NET core handles sign-out for you.
 
 ## What sign out involves

articles/active-directory/devices/hybrid-azuread-join-plan.md

@@ -148,7 +148,7 @@ The table below provides details on support for these on-premises AD UPNs in Win
 | ----- | ----- | ----- | ----- |
 | Routable | Federated | From 1703 release | Generally available |
 | Non-routable | Federated | From 1803 release | Generally available |
-| Routable | Managed | Not supported | |
+| Routable | Managed | From 1803 release | Generally available, Azure AD SSPR on Windows lockscreen is not supported |
 | Non-routable | Managed | Not supported | |
 
 ## Next steps

articles/active-directory/manage-apps/application-proxy-deployment-plan.md

@@ -81,7 +81,7 @@ For detailed information on the topic, see [KCD for single sign-on](application-
 
    * **Application publishing and administration** require the *Application Administrator* role. Application Administrators can manage all applications in the directory including registrations, SSO settings, user and group assignments and licensing, Application Proxy settings, and consent. It doesn't grant the ability to manage Conditional Access. The *Cloud Application Administrator* role has all the abilities of the Application Administrator, except that it does not allow management of Application Proxy settings.
 
-* **Licensing**: Application Proxy is available through the Azure AD Basic subscription. Refer to the [Azure Active Directory Pricing page](https://azure.microsoft.com/pricing/details/active-directory/) for a full list of licensing options and features.  
+* **Licensing**: Application Proxy is available through an Azure AD Premium subscription. Refer to the [Azure Active Directory Pricing page](https://azure.microsoft.com/pricing/details/active-directory/) for a full list of licensing options and features.  
 
 ### Application Discovery
 

articles/active-directory/manage-apps/application-proxy-troubleshoot.md

@@ -80,7 +80,7 @@ This list covers errors that your end users might encounter when they try to acc
 | The website cannot display the page. | Your user may get this error when trying to access the app you published if the application is an OWA application. This could be caused by one of the following:<br><li>The defined SPN for this application is incorrect. Make sure that the SPN configured for this application is correct.</li><li>The user who tried to access the application is using a Microsoft account rather than the proper corporate account to sign in, or the user is a guest user. Make sure the user signs in using their corporate account that matches the domain of the published application. Microsoft Account users and guest cannot access IWA applications.</li><li>The user who tried to access the application is not properly defined for this application on the on premises side. Make sure that this user has the proper permissions as defined for this backend application on the on premises machine. |
 | This corporate app can’t be accessed. You are not authorized to access this application. Authorization failed. Make sure to assign the user with access to this application. | Your user may get this error when trying to access the app you published if they use Microsoft accounts instead of their corporate account to sign in. Guest users may also get this error. Microsoft Account users and guests cannot access IWA applications. Make sure the user signs in using their corporate account that matches the domain of the published application.<br><br>You may not have assigned the user for this application. Go to the **Application** tab, and under **Users and Groups**, assign this user or user group to this application. |
 | This corporate app can’t be accessed right now. Please try again later…The connector timed out. | Your user may get this error when trying to access the app you published if they are not properly defined for this application on the on-premises side. Make sure that your users have the proper permissions as defined for this backend application on the on premises machine. |
-| This corporate app can’t be accessed. You are not authorized to access this application. Authorization failed. Make sure that the user has a license for Azure Active Directory Premium or Basic. | Your user may get this error when trying to access the app you published if they weren't explicitly assigned with a Premium/Basic license by the subscriber’s administrator. Go to the subscriber’s Active Directory **Licenses** tab and make sure that this user or user group is assigned a Premium or Basic license. |
+| This corporate app can’t be accessed. You are not authorized to access this application. Authorization failed. Make sure that the user has a license for Azure Active Directory Premium. | Your user may get this error when trying to access the app you published if they weren't explicitly assigned with a Premium license by the subscriber’s administrator. Go to the subscriber’s Active Directory **Licenses** tab and make sure that this user or user group is assigned a Premium license. |
 | A server with the specified host name could not be found. | Your user may get this error when trying to access the app you published if the application's custom domain is not configured correctly. Make sure you've uploaded a certificate for the domain and configured the DNS record correctly by following the steps in [Working with custom domains in Azure AD Application Proxy](application-proxy-configure-custom-domain.md) |
 
 ## My error wasn't listed here