Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into update-SQL-tutorial

Author: daveba

.openpublishing.publish.config.json

@@ -224,11 +224,29 @@
       "branch": "master",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "samples-qnamaker-go",
+      "url": "https://github.com/Azure-Samples/cognitive-services-qnamaker-go",
+      "branch": "master",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "samples-qnamaker-csharp",
       "url": "https://github.com/Azure-Samples/cognitive-services-qnamaker-csharp",
       "branch": "master",
       "branch_mapping": {}
+    },
+    {
+      "path_to_root": "samples-qnamaker-java",
+      "url": "https://github.com/Azure-Samples/cognitive-services-qnamaker-java",
+      "branch": "master",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "samples-qnamaker-python",
+      "url": "https://github.com/Azure-Samples/cognitive-services-qnamaker-python",
+      "branch": "master",
+      "branch_mapping": {}
     }
   ],
   "branch_target_mapping": {

.openpublishing.redirection.json

@@ -1271,6 +1271,16 @@
             "redirect_url": "/azure/iot-edge/quickstart",
             "redirect_document_id": false
         },
+        {
+            "source_path": "articles/iot-edge/quickstart.experimental.md",
+            "redirect_url": "/azure/iot-edge/quickstart",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/iot-edge/quickstart-linux.experimental.md",
+            "redirect_url": "/azure/iot-edge/quickstart-linux",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/iot-edge/how-iot-edge-works.md",
             "redirect_url": "/azure/iot-edge/about-iot-edge",
@@ -13765,6 +13775,11 @@
             "redirect_url": "./end-user/microsoft-authenticator-app-how-to",
             "redirect_document_id": false
         },
+        {
+            "source_path": "articles/service-fabric/service-fabric-patterns-and-scenarios.md",
+            "redirect_url": "/azure/service-fabric/service-fabric-application-scenarios",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/service-fabric-mesh/service-fabric-mesh-howto-deploy-app-private-registry.md",
             "redirect_url": "/azure/service-fabric-mesh/service-fabric-mesh-tutorial-template-deploy-app",

articles/active-directory-b2c/active-directory-b2c-custom-setup-adfs2016-idp.md

@@ -162,6 +162,15 @@ Open a browser and navigate to the URL. Make sure you type the correct URL and t
 9. Select **Add Rule**.  
 10. In **Claim rule template**, select **Send LDAP attributes as claims**.
 11. Provide a **Claim rule name**. For the **Attribute store**, select **Select Active Directory**, add the following claims, then click **Finish** and **OK**.
+
+    | LDAP attrubute | Outgoing claim type |
+    | -------------- | ------------------- |
+    | User-Principal-Name | userPricipalName |
+    | Surname | family_name |
+    | Given-Name | given_name |
+    | E-Mail-Address | email |
+    | Display-Name | name |
+    
 12.  Based on your certificate type, you may need to set the HASH algorithm. On the relying party trust (B2C Demo) properties window, select the **Advanced** tab and change the **Secure hash algorithm** to `SHA-1` or `SHA-256`, and click **Ok**.  
 13. In Server Manager, select **Tools**, and then select **ADFS Management**.
 14. Select the relying party trust you created, select **Update from Federation Metadata**, and then click **Update**. 

articles/active-directory-b2c/active-directory-b2c-support-create-directory.md

@@ -24,7 +24,7 @@ If you encounter issues when you [create an Azure Active Directory B2C (Azure AD
 * If the Azure AD B2C tenant doesn't show up in your list of tenants, try again to create the tenant.
 * If the Azure AD B2C tenant does show up in your list of tenants and you see the following  error message, delete the tenant and create it again:
 
-    "Could not complete the creation of the B2C tenant 'contosob2c'. Please visit this [link](http://go.microsoft.com/fwlink/?LinkID=624192&clcid=0x409) for more guidance."
+    "Could not complete the creation of the B2C tenant 'contosob2c'. Please visit this [link](https://go.microsoft.com/fwlink/?LinkID=624192&clcid=0x409) for more guidance."
 * There are known issues when you delete an existing Azure AD B2C tenant and re-create it by using the same domain name. When you create a new Azure AD B2C tenant, you must use a different domain name.
 * If these resolutions don't work, contact Azure Support. For more information, see [File support requests for Azure AD B2C](active-directory-b2c-support.md).
 

articles/active-directory-domain-services/active-directory-ds-admin-guide-administer-domain.md

@@ -59,7 +59,7 @@ The first step is to set up a Windows Server virtual machine that is joined to t
 ### Remotely administer the managed domain from a client computer (for example, Windows 10)
 The instructions in this article use a Windows Server virtual machine to administer the AAD-DS managed domain. However, you can also choose to use a Windows client (for example, Windows 10) virtual machine to do so.
 
-You can [install Remote Server Administration Tools (RSAT)](http://social.technet.microsoft.com/wiki/contents/articles/2202.remote-server-administration-tools-rsat-for-windows-client-and-windows-server-dsforum2wiki.aspx) on a Windows client virtual machine by following the instructions on TechNet.
+You can [install Remote Server Administration Tools (RSAT)](https://social.technet.microsoft.com/wiki/contents/articles/2202.remote-server-administration-tools-rsat-for-windows-client-and-windows-server-dsforum2wiki.aspx) on a Windows client virtual machine by following the instructions on TechNet.
 
 ## Task 2 - Install Active Directory administration tools on the virtual machine
 Complete the following steps to install the Active Directory Administration tools on the domain joined virtual machine. See Technet for more [information on installing and using Remote Server Administration Tools](https://technet.microsoft.com/library/hh831501.aspx).

articles/active-directory-domain-services/active-directory-ds-admin-guide-configure-secure-ldap.md

@@ -41,7 +41,7 @@ Acquire a valid certificate per the following guidelines, before you enable secu
 
 1. **Trusted issuer** - The certificate must be issued by an authority trusted by computers connecting to the managed domain using secure LDAP. This authority may be a public certification authority (CA) or an Enterprise CA trusted by these computers.
 2. **Lifetime** - The certificate must be valid for at least the next 3-6 months. Secure LDAP access to your managed domain is disrupted when the certificate expires.
-3. **Subject name** - The subject name on the certificate must be a wildcard for your managed domain. For instance, if your domain is named 'contoso100.com', the certificate's subject name must be 'contoso100.com'. Set the DNS name (subject alternate name) to this wildcard name.
+3. **Subject name** - The subject name on the certificate must be your managed domain. For instance, if your domain is named 'contoso100.com', the certificate's subject name must be 'contoso100.com'. Set the DNS name (subject alternate name) to a wildcard name for your managed domain.
 4. **Key usage** - The certificate must be configured for the following uses - Digital signatures and key encipherment.
 5. **Certificate purpose** - The certificate must be valid for SSL server authentication.
 
@@ -79,7 +79,7 @@ On your Windows computer, open a new PowerShell window as **Administrator** and
 $lifetime=Get-Date
 New-SelfSignedCertificate -Subject contoso100.com `
   -NotAfter $lifetime.AddDays(365) -KeyUsage DigitalSignature, KeyEncipherment `
-  -Type SSLServerAuthentication -DnsName *.contoso100.com
+  -Type SSLServerAuthentication -DnsName *.contoso100.com, contoso100.com
 ```
 
 In the preceding sample, replace 'contoso100.com' with the DNS domain name of your managed domain. For example, if you created a managed domain called 'contoso100.onmicrosoft.com', replace 'contoso100.com' in the Subject attribute with 'contoso100.onmicrosoft.com' and '*.contoso100.com' in the DnsName attribute with '*.contoso100.onmicrosoft.com').

articles/active-directory-domain-services/active-directory-ds-getting-started-password-sync-synced-tenant.md

@@ -46,7 +46,7 @@ A synced Azure AD tenant is set to synchronize with your organization's on-premi
 ### Install or update Azure AD Connect
 Install the latest recommended release of Azure AD Connect on a domain joined computer. If you have an existing instance of Azure AD Connect setup, you need to update it to use the latest version of Azure AD Connect. To avoid known issues/bugs that may have already been fixed, always use the latest version of Azure AD Connect.
 
-**[Download Azure AD Connect](http://www.microsoft.com/download/details.aspx?id=47594)**
+**[Download Azure AD Connect](https://www.microsoft.com/download/details.aspx?id=47594)**
 
 Recommended version: **1.1.614.0** - published on September 5, 2017.
 

articles/active-directory-domain-services/active-directory-ds-getting-started-password-sync.md

@@ -49,7 +49,7 @@ This password change process causes the password hashes that are required by Azu
 ### Enable NTLM and Kerberos password hash generation for a cloud-only user account
 Here are the instructions you need to provide users, so they can change their passwords:
 
-1. Go to the [Azure AD Access Panel](http://myapps.microsoft.com) page for your organization.
+1. Go to the [Azure AD Access Panel](https://myapps.microsoft.com) page for your organization.
 
     ![Launch the Azure AD access panel](./media/active-directory-domain-services-getting-started/access-panel.png)
 

articles/active-directory/active-directory-device-registration-on-premises-setup.md

@@ -46,7 +46,7 @@ These capabilities are available to customers who purchase an Azure Active Direc
 * License for Azure Active Directory Premium
 * Windows Server 2012 R2 Federation Services, configured for SSO to Azure AD
 * Windows Server 2012 R2 Web Application Proxy 
-* Microsoft Azure Active Directory Connect (Azure AD Connect) [(Download Azure AD Connect)](http://www.microsoft.com/download/details.aspx?id=47594)
+* Microsoft Azure Active Directory Connect (Azure AD Connect) [(Download Azure AD Connect)](https://www.microsoft.com/download/details.aspx?id=47594)
 * Verified domain
 
 ## Known issues in this release

articles/active-directory/authentication/active-directory-passwords-troubleshoot.md

@@ -96,7 +96,7 @@ A best practice when you troubleshoot problems with password writeback is to ins
 | Code | Name or message | Description |
 | --- | --- | --- |
 | 6329 | BAIL: MMS(4924) 0x80230619: “A restriction prevents the password from being changed to the current one specified.” | This event occurs when the password writeback service attempts to set a password on your local directory that does not meet the password age, history, complexity, or filtering requirements of the domain. <br> <br> If you have a minimum password age and have recently changed the password within that window of time, you're not able to change the password again until it reaches the specified age in your domain. For testing purposes, the minimum age should be set to 0. <br> <br> If you have password history requirements enabled, then you must select a password that has not been used in the last *N* times, where *N* is the password history setting. If you do select a password that has been used in the last *N* times, then you see a failure in this case. For testing purposes, the password history should be set to 0. <br> <br> If you have password complexity requirements, all of them are enforced when the user attempts to change or reset a password. <br> <br> If you have password filters enabled and a user selects a password that does not meet the filtering criteria, then the reset or change operation fails. |
-| 6329 | MMS(3040): admaexport.cpp(2837): The server does not contain the LDAP password policy control. | This problem occurs if LDAP_SERVER_POLICY_HINTS_OID control (1.2.840.113556.1.4.2066) isn't enabled on the DCs. To use the password writeback feature, you must enable the control. To do so, the DCs must be on Windows Server 2008 (with the latest SP) or later. If your DCs are on 2008 (pre-R2), then you must also apply hotfix [KB2386717](http://support.microsoft.com/kb/2386717). |
+| 6329 | MMS(3040): admaexport.cpp(2837): The server does not contain the LDAP password policy control. | This problem occurs if LDAP_SERVER_POLICY_HINTS_OID control (1.2.840.113556.1.4.2066) isn't enabled on the DCs. To use the password writeback feature, you must enable the control. To do so, the DCs must be on Windows Server 2008 (with the latest SP) or later. If your DCs are on 2008 (pre-R2), then you must also apply hotfix [KB2386717](https://support.microsoft.com/kb/2386717). |
 | HR 8023042 | Synchronization Engine returned an error hr=80230402, message=An attempt to get an object failed because there are duplicated entries with the same anchor. | This error occurs when the same user ID is enabled in multiple domains. An example is if you're syncing account and resource forests and have the same user ID present and enabled in each forest. <br> <br> This error can also occur if you use a non-unique anchor attribute, like an alias or UPN, and two users share that same anchor attribute. <br> <br> To resolve this problem, ensure that you don't have any duplicated users within your domains and that you use a unique anchor attribute for each user. |
 
 ### If the source of the event is PasswordResetService
@@ -212,7 +212,7 @@ We recommend that you perform this step only after you attempt the first two ste
 > If you have customized the out-of-the-box sync rules, *back them up before proceeding with upgrade and then manually redeploy them after you're finished.*
 >
 
-1. Download the latest version of Azure AD Connect from the [Microsoft Download Center](http://go.microsoft.com/fwlink/?LinkId=615771).
+1. Download the latest version of Azure AD Connect from the [Microsoft Download Center](https://go.microsoft.com/fwlink/?LinkId=615771).
 1. Because you have already installed Azure AD Connect, you need to perform an in-place upgrade to update your Azure AD Connect installation to the latest version.
 1. Execute the downloaded package and follow the on-screen instructions to update your Azure AD Connect machine.