Merge pull request #104675 from MicrosoftDocs/master

Merge Master to Live, 4 AM

Author: PMEds28

articles/active-directory-b2c/user-flow-password-complexity.md

@@ -69,7 +69,7 @@ Allows you to control the length requirements of the password.
 Allows you to control the different character types used in the password.
 
 - **2 of 4: Lowercase character, Uppercase character, Number (0-9), Symbol** ensures the password contains at least two character types. For example, a number and a lowercase character.
-- **3 of 4: Lowercase character, Uppercase character, Number (0-9), Symbol** ensures the password contains at least two character types. For example, a number, a lowercase character and an uppercase character.
+- **3 of 4: Lowercase character, Uppercase character, Number (0-9), Symbol** ensures the password contains at least three character types. For example, a number, a lowercase character and an uppercase character.
 - **4 of 4: Lowercase character, Uppercase character, Number (0-9), Symbol** ensures the password contains all for character types.
 
     > [!NOTE]

articles/automation/automation-dsc-compile.md

@@ -23,14 +23,16 @@ determine when to use which method based on the characteristics of each:
   - Work with node and non-node data at scale
   - Significant performance improvement
 
+For compilation details, see [Desired State Configuration extension with Azure Resource Manager templates](https://docs.microsoft.com/azure/virtual-machines/extensions/dsc-template#details).
+
 ## Compiling a DSC Configuration in Azure State Configuration
 
 ### Portal
 
 1. From your Automation account, click **State configuration (DSC)**.
 1. Click on the **Configurations** tab, then click on the configuration name to compile.
 1. Click **Compile**.
-1. If the configuration has no parameters, you are prompted to confirm whether you want to compile it. If the configuration has parameters, the **Compile Configuration** blade opens so you can provide parameter values. See the following [**Basic Parameters**](#basic-parameters) section for further details on parameters.
+1. If the configuration has no parameters, you are prompted to confirm whether you want to compile it. If the configuration has parameters, the **Compile Configuration** blade opens so that you can provide parameter values.
 1. The **Compilation Job** page is opened so that you can track the compilation job's status, and the node configurations (MOF configuration documents) it caused to be placed on the Azure Automation State Configuration Pull Server.
 
 ### Azure PowerShell
@@ -62,7 +64,7 @@ while($null -eq $CompilationJob.EndTime -and $null -eq $CompilationJob.Exception
 $CompilationJob | Get-AzAutomationDscCompilationJobOutput –Stream Any
 ```
 
-###  Basic Parameters
+### Declare basic parameters
 
 Parameter declaration in DSC configurations, including parameter types and properties, works the
 same as in Azure Automation runbooks. See [Starting a runbook in Azure Automation](automation-starting-a-runbook.md)
@@ -125,21 +127,21 @@ Start-AzAutomationDscCompilationJob -ResourceGroupName 'MyResourceGroup' -Automa
 
 For information about passing PSCredentials as parameters, see [Credential Assets](#credential-assets) below.
 
-### Compiling configurations in Azure Automation that contain Composite Resources
+### Compile configurations containing composite resources in Azure Automation
 
-**Composite Resources** allow you to use DSC configurations as nested resources inside of a
+The **Composite Resources** feature allows you to use DSC configurations as nested resources inside of a
 configuration. This enables you to apply multiple configurations to a single resource. See
 [Composite resources: Using a DSC configuration as a resource](/powershell/scripting/dsc/resources/authoringresourcecomposite)
-to learn more about **Composite Resources**.
+to learn more about composite resources.
 
 > [!NOTE]
-> In order for configurations containing **Composite Resources** to compile correctly, you must first ensure that any DSC Resources that the composite relies on are first imported in to Azure Automation.
+> For configurations containing **Composite Resources** to compile correctly, you must first ensure that any DSC Resources that the composite relies on are first imported in to Azure Automation.
 
 Adding a DSC **Composite Resource** is no different than adding any PowerShell module to Azure Automation.
 The step by step instruction for this process is documented in the article
 [Manage Modules in Azure Automation](/azure/automation/shared-resources/modules).
 
-### Managing ConfigurationData when compiling configuration in Azure Automation
+### Manage ConfigurationData when compiling configurations in Azure Automation
 
 **ConfigurationData** allows you to separate structural configuration from any environment-specific
 configuration while using PowerShell DSC. See [Separating "What" from "Where" in PowerShell DSC](https://blogs.msdn.com/b/powershell/archive/2014/01/09/continuous-deployment-using-dsc-with-minimal-change.aspx)
@@ -200,7 +202,7 @@ $ConfigData = @{
 Start-AzAutomationDscCompilationJob -ResourceGroupName 'MyResourceGroup' -AutomationAccountName 'MyAutomationAccount' -ConfigurationName 'ConfigurationDataSample' -ConfigurationData $ConfigData
 ```
 
-### Working with Assets in Azure Automation during compilation
+### Work with assets in Azure Automation during compilation
 
 Asset references are the same in Azure Automation State Configuration and runbooks. For more information, see the
 following:
@@ -277,7 +279,7 @@ Start-AzAutomationDscCompilationJob -ResourceGroupName 'MyResourceGroup' -Automa
 > [!NOTE]
 > When compilation is complete you may receive an error stating: **The 'Microsoft.PowerShell.Management' module was not imported because the 'Microsoft.PowerShell.Management' snap-in was already imported.** This warning can safely be ignored.
 
-## Compiling configurations in Windows PowerShell and publishing to Azure Automation
+## Compiling configurations in Windows PowerShell
 
 You can also import node configurations (MOFs) that have been compiled outside of Azure.
 This includes compiling from a developer workstation or in a service such as
@@ -292,7 +294,7 @@ ensuring that the configuration being applied to the node comes from an authoriz
 
 For more information about how to sign node configurations, see [Improvements in WMF 5.1 - How to sign configuration and module](/powershell/scripting/wmf/whats-new/dsc-improvements#dsc-module-and-configuration-signing-validations).
 
-### Compiling a configuration in Windows PowerShell
+### Compile a configuration in Windows PowerShell
 
 The process to compile DSC configurations in Windows PowerShell is included in the PowerShell DSC documentation
 [Write, Compile, and Apply a Configuration](/powershell/scripting/dsc/configurations/write-compile-apply-configuration#compile-the-configuration).
@@ -302,7 +304,7 @@ This can be executed from a developer workstation or within a build service such
 The MOF file or files produced by compiling the configuration can then be imported directly
 in to the Azure State Configuration service.
 
-### Importing a node configuration in the Azure portal
+### Import a node configuration in the Azure portal
 
 1. From your Automation account, click **State configuration (DSC)** under **Configuration Management**.
 1. In the **State configuration (DSC)** page, click on the **Configurations** tab, then click **+ Add**.
@@ -313,7 +315,7 @@ in to the Azure State Configuration service.
 1. Enter a name in the **Configuration Name** textbox. This name must match the name of the configuration from which the node configuration was compiled.
 1. Click **OK**.
 
-### Importing a node configuration with Azure PowerShell
+### Import a node configuration with Azure PowerShell
 
 You can use the [Import-AzAutomationDscNodeConfiguration](/powershell/module/az.automation/import-azautomationdscnodeconfiguration)
 cmdlet to import a node configuration into your automation account.
@@ -324,8 +326,8 @@ Import-AzAutomationDscNodeConfiguration -AutomationAccountName 'MyAutomationAcco
 
 ## Next steps
 
-- To get started, see [Getting started with Azure Automation State Configuration](automation-dsc-getting-started.md)
-- To learn about compiling DSC configurations so that you can assign them to target nodes, see [Compiling configurations in Azure Automation State Configuration](automation-dsc-compile.md)
-- For PowerShell cmdlet reference, see [Azure Automation State Configuration cmdlets](/powershell/module/az.automation)
-- For pricing information, see [Azure Automation State Configuration pricing](https://azure.microsoft.com/pricing/details/automation/)
-- To see an example of using Azure Automation State Configuration in a continuous deployment pipeline, see [Continuous Deployment Using Azure Automation State Configuration and Chocolatey](automation-dsc-cd-chocolatey.md)
+- To get started, see [Getting started with Azure Automation State Configuration](automation-dsc-getting-started.md.
+- To learn about compiling DSC configurations so that you can assign them to target nodes, see [Compiling configurations in Azure Automation State Configuration](automation-dsc-compile.md).
+- For PowerShell cmdlet reference, see [Azure Automation State Configuration cmdlets](/powershell/module/az.automation).
+- For pricing information, see [Azure Automation State Configuration pricing](https://azure.microsoft.com/pricing/details/automation/).
+- To see an example of using Azure Automation State Configuration in a continuous deployment pipeline, see [Continuous Deployment Using Azure Automation State Configuration and Chocolatey](automation-dsc-cd-chocolatey.md).

articles/automation/automation-dsc-diagnostics.md

@@ -34,7 +34,7 @@ To start sending your Automation State Configuration reports to Azure Monitor lo
 - An Azure Automation account. For more information, see [An introduction to Azure Automation](automation-intro.md).
 - A Log Analytics workspace with an Automation & Control service offering. For more information, see [Get started with Log Analytics in Azure Monitor](https://docs.microsoft.com/azure/azure-monitor/log-query/get-started-portal).
 - At least one Azure Automation State Configuration node. For more information, see [Onboarding machines for management by Azure Automation State Configuration](automation-dsc-onboarding.md).
-- The [xDscDiagnostics](https://www.powershellgallery.com/packages/xDscDiagnostics/2.7.0.0) module, version 2.7.0.0 or greater. For installation steps, see [Troubleshoot Azure Automation Desired State Configuration](./troubleshoot/desired-state-configuration.md#steps-to-troubleshoot-desired-state-configuration-dsc).
+- The [xDscDiagnostics](https://www.powershellgallery.com/packages/xDscDiagnostics/2.7.0.0) module, version 2.7.0.0 or greater. For installation steps, see [Troubleshoot Azure Automation Desired State Configuration](./troubleshoot/desired-state-configuration.md).
 
 ## Set up integration with Azure Monitor logs
 

articles/automation/troubleshoot/desired-state-configuration.md

@@ -14,35 +14,37 @@ manager: carmonm
 
 This article provides information on troubleshooting issues with Desired State Configuration (DSC).
 
-## Steps to troubleshoot Desired State Configuration (DSC)
+## Diagnosing an issue
 
-When you have errors compiling or deploying configurations in Azure State Configuration, here are a few
-steps to help you diagnose the issue.
+When you have errors while compiling or deploying configurations in Azure State Configuration, here are a few steps to help you diagnose the issue.
 
-1. **Ensure your configuration compiles successfully on your local machine:**  Azure State Configuration
-   is built on PowerShell DSC. You can find the documentation for the DSC language and syntax in
-   the [PowerShell DSC Docs](https://docs.microsoft.com/powershell/scripting/overview).
+### 1. Ensure that your configuration compiles successfully on the local machine
 
-   By compiling your DSC configuration on your local machine you can discover and resolve common errors, such as:
+Azure State Configuration is built on PowerShell DSC. You can find the documentation for the DSC language and syntax in the [PowerShell DSC Docs](https://docs.microsoft.com/powershell/scripting/overview).
 
-   - **Missing Modules**
-   - **Syntax Errors**
-   - **Logic Errors**
+By compiling your DSC configuration on your local machine, you can discover and resolve common errors, such as:
 
-2. **View DSC logs on your Node:** If your configuration compiles successfully, but fails when applied to a Node, you can find
-   detailed information in the logs. For information about where to find DSC logs, see [Where are the DSC Event Logs](/powershell/scripting/dsc/troubleshooting/troubleshooting#where-are-dsc-event-logs).
+   - Missing modules
+   - Syntax errors
+   - Logic errors
 
-   Furthermore, the [xDscDiagnostics](https://github.com/PowerShell/xDscDiagnostics) can assist you in parsing detailed information
-   from the DSC logs. If you contact support, they will require these logs to diagnose your issue.
+### 2. View DSC logs on your node
 
-   You can install **xDscDiagnostics** on your local machine using the instructions found under [Install the stable version module](https://github.com/PowerShell/xDscDiagnostics#install-the-stable-version-module).
+If your configuration compiles successfully, but fails when applied to a node, you can find detailed information in the DSC logs. For information about where to find these logs, see [Where are the DSC Event Logs](/powershell/scripting/dsc/troubleshooting/troubleshooting#where-are-dsc-event-logs).
 
-   To install **xDscDiagnostics** on your Azure machine, you can use [az vm run-command](/cli/azure/vm/run-command) or [Invoke-AzVMRunCommand](/powershell/module/azurerm.compute/invoke-azurermvmruncommand). You can also use the **Run command** option from the portal, by following the steps found in [Run PowerShell scripts in your Windows VM with Run Command](../../virtual-machines/windows/run-command.md).
+The [xDscDiagnostics](https://github.com/PowerShell/xDscDiagnostics) module can assist you in parsing detailed information from the DSC logs. If you contact support, they require these logs to diagnose your issue.
 
-   For information on using **xDscDiagnostics**, see [Using xDscDiagnostics to analyze DSC logs](/powershell/scripting/dsc/troubleshooting/troubleshooting#using-xdscdiagnostics-to-analyze-dsc-logs), as well as [xDscDiagnostics Cmdlets](https://github.com/PowerShell/xDscDiagnostics#cmdlets).
-3. **Ensure your Nodes and Automation workspace have the required modules:** Desired State Configuration depends on modules installed on the Node.  When using Azure Automation State Configuration, import any required modules into your automation account using the steps listed in [Import Modules](../shared-resources/modules.md#import-modules). Configurations can also have a dependency on specific versions of modules.  For more information, see, [Troubleshoot Modules](shared-resources.md#modules).
+You can install the xDscDiagnostics module on your local machine using the instructions found in [Install the stable version module](https://github.com/PowerShell/xDscDiagnostics#install-the-stable-version-module).
 
-## Common errors when working with Desired State Configuration (DSC)
+To install the xDscDiagnostics module on your Azure machine, use [Invoke-AzVMRunCommand](/powershell/module/azurerm.compute/invoke-azurermvmruncommand). You can also use the **Run command** option from the portal, by following the steps found in [Run PowerShell scripts in your Windows VM with Run Command](../../virtual-machines/windows/run-command.md).
+
+For information on using xDscDiagnostics, see [Using xDscDiagnostics to analyze DSC logs](/powershell/scripting/dsc/troubleshooting/troubleshooting#using-xdscdiagnostics-to-analyze-dsc-logs). See also [xDscDiagnostics Cmdlets](https://github.com/PowerShell/xDscDiagnostics#cmdlets).
+
+### 3. Ensure that nodes and the Automation workspace have required modules
+
+DSC depends on modules installed on the node. When using Azure Automation State Configuration, import any required modules into your Automation account using the steps listed in [Import Modules](../shared-resources/modules.md#import-modules). Configurations can also have a dependency on specific versions of modules. For more information, see [Troubleshoot Modules](shared-resources.md#modules).
+
+## Common errors when working with DSC
 
 ### <a name="unsupported-characters"></a>Scenario: A configuration with special characters cannot be deleted from the portal
 
@@ -96,7 +98,7 @@ Verify your machine has access to the proper endpoints for Azure Automation DSC
 When registering a Node with State Configuration (DSC) you receive one of the following error messages:
 
 ```error
-The attempt to send status report to the server https://{your automation account url}/accounts/xxxxxxxxxxxxxxxxxxxxxx/Nodes(AgentId='xxxxxxxxxxxxxxxxxxxxxxxxx')/SendReport returned unexpected response code Unauthorized.
+The attempt to send status report to the server https://{your Automation account URL}/accounts/xxxxxxxxxxxxxxxxxxxxxx/Nodes(AgentId='xxxxxxxxxxxxxxxxxxxxxxxxx')/SendReport returned unexpected response code Unauthorized.
 ```
 
 ```error
@@ -113,7 +115,7 @@ Follow the steps listed below to re-register the failing DSC node.
 
 First, un-register the node using the following steps.
 
-1. From the Azure portal, under **Home** -> **Automation Accounts**-> {Your Automation Account} -> **State configuration (DSC)**
+1. From the Azure portal, under **Home** -> **Automation Accounts**-> {Your Automation account} -> **State configuration (DSC)**
 2. Click "Nodes", and click on the node having trouble.
 3. Click "Unregister" to un-register the node.
 
@@ -145,7 +147,7 @@ If (($certs.Count) -gt 0)
 
 Finally, re-register the failing node using the following steps.
 
-1. From the Azure portal, under **Home** -> **Automation Accounts** -> {Your Automation Account} -> **State configuration (DSC)**
+1. From the Azure portal, under **Home** -> **Automation Accounts** -> {Your Automation account} -> **State configuration (DSC)**
 2. Click "Nodes".
 3. Click the "Add" button.
 4. Select the failing node.
@@ -228,7 +230,7 @@ You've used a credential in a configuration but didn’t provide proper **Config
 
 #### Resolution
 
-* Make sure to pass in the proper **ConfigurationData** to set **PSDscAllowPlainTextPassword** to true for each node configuration that is mentioned in the configuration. For more information, see [assets in Azure Automation DSC](../automation-dsc-compile.md#working-with-assets-in-azure-automation-during-compilation).
+* Make sure to pass in the proper **ConfigurationData** to set **PSDscAllowPlainTextPassword** to true for each node configuration that is mentioned in the configuration. For more information, see [Compiling DSC configurations in Azure Automation State Configuration](../automation-dsc-compile.md).
 
 ### <a name="failure-processing-extension"></a>Scenario: Onboarding from dsc extension, "Failure processing extension" error
 
@@ -261,7 +263,7 @@ One or more errors occurred.
 
 #### Cause
 
-This error occurs when you attempt to register a node that lives in a separate subscription than the Automation Account.
+This error occurs when you attempt to register a node that lives in a separate subscription than the Automation account.
 
 #### Resolution
 
@@ -330,6 +332,6 @@ The best workaround would be to compile locally or in a CI/CD pipeline and uploa
 
 If you didn't see your problem or are unable to solve your issue, visit one of the following channels for more support:
 
-* Get answers from Azure experts through [Azure Forums](https://azure.microsoft.com/support/forums/)
+* Get answers from Azure experts through [Azure Forums](https://azure.microsoft.com/support/forums/).
 * Connect with [@AzureSupport](https://twitter.com/azuresupport) – the official Microsoft Azure account for improving customer experience by connecting the Azure community to the right resources: answers, support, and experts.
 * If you need more help, you can file an Azure support incident. Go to the [Azure support site](https://azure.microsoft.com/support/options/) and select **Get Support**.