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

Author: TimShererWithAquent

articles/active-directory-domain-services/tutorial-configure-password-hash-sync.md

@@ -66,7 +66,7 @@ With Azure AD Connect installed and configured to synchronize with Azure AD, now
 
     In this example screenshot, the following connectors are used:
 
-    * The Azure AD connector is named *aaddscontoso.onmicrosoft.com - AAD*
+    * The Azure AD connector is named *contoso.onmicrosoft.com - AAD*
     * The on-premises AD DS connector is named *onprem.contoso.com*
 
 1. Copy and paste the following PowerShell script to the computer with Azure AD Connect installed. The script triggers a full password sync that includes legacy password hashes. Update the `$azureadConnector` and `$adConnector` variables with the connector names from the previous step.

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

@@ -340,7 +340,7 @@ Audit logs for registration and password reset are available for 30 days. If sec
 
 ## Next steps
 
-* To get started deploying SSPR, see [Enable Azure AD self-service password reset](https://docs.microsoft.com/azure/active-directory/authentication/tutorial-enable-sspr.md)
+* To get started deploying SSPR, see [Enable Azure AD self-service password reset](tutorial-enable-sspr.md)
 
 * [Consider implementing Azure AD password protection](https://docs.microsoft.com/azure/active-directory/authentication/concept-password-ban-bad)
 

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

@@ -40,7 +40,7 @@ For machines running Windows 7, 8, 8.1, and 10 you can enable users to reset the
 - The combination of the following specific three settings can cause this feature to not work.
     - Interactive logon: Do not require CTRL+ALT+DEL = Disabled
     - DisableLockScreenAppNotifications = 1 or Enabled
-    - IsContentDeliveryPolicyEnforced = 1 or True
+    - Windows SKU isn't Home or Professional edition
 
 ## Windows 10 password reset
 

articles/active-directory/saas-apps/catchpoint-tutorial.md

@@ -4,7 +4,7 @@ description: This article provides an overview of how to use Azure Automation Up
 services: automation
 ms.subservice: update-management
 ms.topic: tutorial
-ms.date: 03/04/2020
+ms.date: 04/06/2020
 ms.custom: mvc
 ---
 # Manage updates and patches for your Azure VMs
@@ -117,7 +117,7 @@ Under **New update deployment**, specify the following information:
 
    For descriptions of the classification types, see [Update classifications](automation-view-update-assessments.md#update-classifications).
 
-* **Updates to include/exclude** - Opens the Include/Exclude page. Updates to be included or excluded are on separate tabs.
+* **Updates to include/exclude** - Opens the Include/Exclude page. Updates to be included or excluded are on separate tabs by specifying the KB Article ID numbers. When specifying one or more ID numbers, you need to remove or un-check all classifications with the update deployment. This ensures that no other updates are included in your update package when specifying update IDs.
 
 > [!NOTE]
 > It's important to know that exclusions override inclusions. For instance, if you define an exclusion rule of `*`, Update Management installs no patches or packages, as they're all excluded. Excluded patches still show as missing from the machine. For Linux machines, if you include a package that has a dependent package that has been excluded, Update Management doesn't install the main package.

articles/automation/automation-tutorial-update-management.md

@@ -3,7 +3,7 @@ title: Query Azure Update Management logs
 description: This article describes how to query the logs for Update Management in your Log Analytics workspace.
 services: automation
 ms.subservice: update-management
-ms.date: 03/31/2020
+ms.date: 04/06/2020
 ms.topic: conceptual
 ---
 # Query update records for Update Management in Azure Monitor Logs
@@ -106,7 +106,7 @@ A record with a type of `UpdateRunProgress` is created that provides update depl
 | CorrelationId | Unique identifier of the runbook job run for the update. |
 | EndTime | The time when the synchronization process ended. | 
 | ErrorResult | Windows Update error code generated if an update fails to install. | 
-| InstallationStatus | The possible installation states of an update on the client computer, *In progress*, *Succeeded*, *Partially failed*. |
+| InstallationStatus | The possible installation states of an update on the client computer,<br> *NotStarted* - job not triggered yet.<br> *FailedToStart* - unable to start the job on machine.<br> *Failed* - job started but failed with an exception.<br> *InProgress* - job in progress.<br> *MaintenanceWindowExceeded* - if execution was remaining but maintenance window interval reached.<br> *Succeeded* - job succeeded.<br> *InstallFailed* - update failed to install successfully.<br> *NotIncluded*<br> *Excluded* |
 | KBID | Knowledge base article ID for the Windows update. | 
 | ManagementGroupName | Name of the Operations Manager management group or Log Analytics workspace. |
 | OSType | Specifies the type of operating system, *Windows* or *Linux*. | 

articles/automation/automation-update-management-query-logs.md

@@ -8,7 +8,7 @@ ms.date: 08/26/2019
 
 Child resources are resources that exist only within the context of another resource. For example, a [virtual machine extension](/azure/templates/microsoft.compute/2019-03-01/virtualmachines/extensions) can't exist without a [virtual machine](/azure/templates/microsoft.compute/2019-03-01/virtualmachines). The extension resource is a child of the virtual machine.
 
-In a Resource Manger template, you can specify the child resource either within the parent resource or outside of the parent resource. The following example shows the child resource included within the resources property of the parent resource.
+In a Resource Manager template, you can specify the child resource either within the parent resource or outside of the parent resource. The following example shows the child resource included within the resources property of the parent resource.
 
 ```json
 "resources": [

articles/azure-resource-manager/templates/child-resource-name-type.md

@@ -5,7 +5,7 @@ services: azure-resource-manager
 author: mumian
 ms.service: azure-resource-manager
 ms.topic: conceptual
-ms.date: 03/30/2020
+ms.date: 04/06/2020
 ms.author: jgao
 
 ---
@@ -29,6 +29,8 @@ The benefits of deployment script:
 - Allow passing command-line arguments to the script.
 - Can specify script outputs and pass them back to the deployment.
 
+The deployment script resource is only available in the regions where Azure Container Instance is available.  See [Resource availability for Azure Container Instances in Azure regions](../../container-instances/container-instances-region-availability.md).
+
 > [!IMPORTANT]
 > Two deployment script resources, a storage account and a container instance, are created in the same resource group for script execution and troubleshooting. These resources are usually deleted by the script service when the deployment script execution gets in a terminal state. You are billed for the resources until the resources are deleted. To learn more, see [Clean-up deployment script resources](#clean-up-deployment-script-resources).
 
@@ -185,6 +187,8 @@ To see an example, select [here](https://github.com/Azure/azure-docs-json-sample
 
 The external script files must be accessible.  To secure your script files that are stored in Azure storage accounts, see [Tutorial: Secure artifacts in Azure Resource Manager template deployments](./template-tutorial-secure-artifacts.md).
 
+You are responsible for ensuring the integrity of the scripts that are referenced by deployment script, either **PrimaryScriptUri** or **SupportingScriptUris**.  Reference only scripts that you trust.
+
 ## Use supporting scripts
 
 You can separate complicated logics into one or more supporting script files. The `supportingScriptURI` property allows you to provide an array of URIs to the supporting script files if needed:

articles/azure-resource-manager/templates/deployment-script-template.md

@@ -1,7 +1,7 @@
 ---
 title: Azure Blockchain Service limits
 description: Overview of the service and functional limits in Azure Blockchain Service
-ms.date: 03/30/2020
+ms.date: 04/02/2020
 ms.topic: conceptual
 ms.reviewer: ravastra
 #Customer intent: As an operator or architect, I want to understand service and functional limits for Azure Blockchain Service.
@@ -31,7 +31,6 @@ Changing the pricing tier between basic and standard after member creation is no
 The maximum amount of storage that can be used per node for ledger data and logs is 1.8 terabytes.
 
 Decreasing ledger and log storage size is not supported.
-
 ## Consortium limits
 
 * **Consortium and member names must be unique** from other consortium and member names in the Azure Blockchain Service.
@@ -56,6 +55,12 @@ Decreasing ledger and log storage size is not supported.
 
     For more information on the patching, updates, and ledger versions available in Azure Blockchain Service, see [Patching, updates, and versions](ledger-versions.md).
 
+## Performance
+
+Do not use *eth.estimate* gas function for each transaction submission. The *eth.estimate* function is memory intensive. Calling the function multiple times reduces transactions per second drastically.
+
+If possible, use a conservative gas value for submitting transactions and minimize the use of *eth.estimate*.
+
 ## Next steps
 
 Learn more about policies regarding systems patching and upgrades - [Patching, updates, and versions](ledger-versions.md).

articles/blockchain/service/limits.md

@@ -22,15 +22,15 @@ highlightedContent:
     - title: What is the Speech service?
       itemType: overview
       url: overview.md
+    - title: About the Speech SDK
+      itemType: overview
+      url: speech-sdk.md
     - title: Speech SDK release notes
       itemType: whats-new
       url: releasenotes.md
-    - title: Language support in Speech services
+    - title: Language support in the Speech service
       itemType: reference
       url: language-support.md
-    - title: Create a Speech services resource
-      itemType: how-to-guide
-      url: get-started.md
 
 conceptualContent:
   items: