Merge pull request #4727 from MicrosoftDocs/staging

Merging latest changes to live

Author: sdwheeler

developer/cmdlet/defining-default-methods-for-objects.md

@@ -9,18 +9,29 @@ ms.topic: "article"
 ms.assetid: 53fe744a-485f-4c21-9623-1cb546372211
 caps.latest.revision: 9
 ---
+
 # Defining Default Methods for Objects
 
-When you extend .NET Framework objects, you can add code methods and script methods to the objects. The XML that is used to define these methods is described in the following sections.
+When you extend .NET Framework objects, you can add code methods and script methods to the objects.
+The XML that is used to define these methods is described in the following sections.
 
 > [!NOTE]
-> The examples in the following sections are from the Types.ps1xml types file in the Windows PowerShell installation directory (`$pshome`).
+> The examples in the following sections are from the `Types.ps1xml` types file in the Windows
+> PowerShell installation directory (`$PSHOME`). For more information, see [About Types.ps1xml](/powershell/module/microsoft.powershell.core/about/about_types.ps1xml).
 
-## Code Methods
+## Code methods
 
 A code method references a static method of a .NET Framework object.
 
-In the following example, the **ConvertLargeIntegerToInt64** method is added to the [System.Xml.Xmlnode?Displayproperty=Fullname](/dotnet/api/System.Xml.XmlNode) type. The [PSCodeMethod](/dotnet/api/system.management.automation.pscodemethod) element defines the extended method as a code method. The [Name](/dotnet/api/system.management.automation.psmemberinfo.name?view=pscore-6.2.0#System_Management_Automation_PSMemberInfo_Name) element specifies the name of the extended method. And, the [CodeReference](/dotnet/api/system.management.automation.pscodemethod.codereference?view=pscore-6.2.0#System_Management_Automation_PSCodeMethod_CodeReference) element specifies the static method. (You can also add the [PSCodeMethod](/dotnet/api/system.management.automation.pscodemethod) element to the members of the [PSMemberSets](/dotnet/api/system.management.automation.psmemberset?view=pscore-6.2.0) element.)
+In the following example, the **ToString** method is added to the [System.Xml.XmlNode](/dotnet/api/System.Xml.XmlNode)
+type. The [PSCodeMethod](/dotnet/api/system.management.automation.pscodemethod) element defines the
+extended method as a code method. The
+[Name](/dotnet/api/system.management.automation.psmemberinfo.name?view=pscore-6.2.0#System_Management_Automation_PSMemberInfo_Name)
+element specifies the name of the extended method. And, the
+[CodeReference](/dotnet/api/system.management.automation.pscodemethod.codereference?view=pscore-6.2.0#System_Management_Automation_PSCodeMethod_CodeReference)
+element specifies the static method. You can also add the [PSCodeMethod](/dotnet/api/system.management.automation.pscodemethod)
+element to the members of the [PSMemberSets](/dotnet/api/system.management.automation.psmemberset?view=pscore-6.2.0)
+element.
 
 ```xml
 <Type>
@@ -29,17 +40,26 @@ In the following example, the **ConvertLargeIntegerToInt64** method is added to
     <CodeMethod>
       <Name>ToString</Name>
       <CodeReference>
-        <TypeName>Microsoft.PowerShell.ToStringCodemethods</TypeName>
+        <TypeName>Microsoft.PowerShell.ToStringCodeMethods</TypeName>
         <MethodName>XmlNode</MethodName>
       </CodeReference>
     </CodeMethod>
   </Members>
 </Type>
 ```
 
-## Script Methods
+## Script methods
 
-A script method defines a method whose value is the output of a script. In the following example, the **ConvertToDateTime** method is added to the [System.Management.Managementobject?Displayproperty=Fullname](/dotnet/api/System.Management.ManagementObject) type. The [PSScriptMethod](/dotnet/api/system.management.automation.psscriptmethod?view=pscore-6.2.0) element defines the extended method as a script method. The [Name](/dotnet/api/system.management.automation.psmemberinfo.name?view=pscore-6.2.0#System_Management_Automation_PSMemberInfo_Name) element specifies the name of the extended method. And, the [Script](/dotnet/api/system.management.automation.psscriptmethod.script?view=pscore-6.2.0#System_Management_Automation_PSScriptMethod_Script) element specifies the script that generates the method value. (You can also add the [PSScriptMethod](/dotnet/api/system.management.automation.psscriptmethod?view=pscore-6.2.0) element to the members of the [PSMemberSets](/dotnet/api/system.management.automation.psmemberset?view=pscore-6.2.0) element.)
+A script method defines a method whose value is the output of a script. In the following example,
+the **ConvertToDateTime** method is added to the [System.Management.ManagementObject](/dotnet/api/System.Management.ManagementObject)
+type. The [PSScriptMethod](/dotnet/api/system.management.automation.psscriptmethod?view=pscore-6.2.0)
+element defines the extended method as a script method. The
+[Name](/dotnet/api/system.management.automation.psmemberinfo.name?view=pscore-6.2.0#System_Management_Automation_PSMemberInfo_Name)
+element specifies the name of the extended method. And, the
+[Script](/dotnet/api/system.management.automation.psscriptmethod.script?view=pscore-6.2.0#System_Management_Automation_PSScriptMethod_Script)
+element specifies the script that generates the method value. You can also add the [PSScriptMethod](/dotnet/api/system.management.automation.psscriptmethod?view=pscore-6.2.0)
+element to the members of the [PSMemberSets](/dotnet/api/system.management.automation.psmemberset?view=pscore-6.2.0)
+element.
 
 ```xml
 <Type>
@@ -55,6 +75,6 @@ A script method defines a method whose value is the output of a script. In the f
 </Type>
 ```
 
-## See Also
+## See also
 
 [Writing a Windows PowerShell Cmdlet](./writing-a-windows-powershell-cmdlet.md)

developer/cmdlet/how-to-import-cmdlets-using-modules.md

@@ -1,39 +1,56 @@
 ---
 title: "How to Import Cmdlets Using Modules | Microsoft Docs"
 ms.custom: ""
-ms.date: "09/13/2016"
+ms.date: "08/28/2019"
 ms.reviewer: ""
 ms.suite: ""
 ms.tgt_pltfrm: ""
 ms.topic: "article"
 ms.assetid: a41d9e5f-de6f-47b7-9601-c108609320d0
 caps.latest.revision: 8
 ---
+
 # How to Import Cmdlets Using Modules
 
-This topic describes how to import cmdlets to a Windows PowerShell session by using a binary module.
+This article describes how to import cmdlets to a PowerShell session by using a binary module.
 
 > [!NOTE]
-> The members of modules can include cmdlets, providers, functions, variables, aliases, and much more. Snap-ins can contain only cmdlets and providers.
+> The members of modules can include cmdlets, providers, functions, variables, aliases, and much
+> more. Snap-ins can contain only cmdlets and providers.
 
 ## How to load cmdlets using a module
 
-1. Create a module folder that has the same name as the assembly file in which the cmdlets are implemented. In this procedure, the module folder is created in the `system32` folder.
+1. Create a module folder that has the same name as the assembly file in which the cmdlets are
+   implemented. In this procedure, the module folder is created in the Windows `system32` folder.
 
    `%SystemRoot%\system32\WindowsPowerShell\v1.0\Modules\mymodule`
 
-2. Make sure that the `PSModulePath` environment variable includes the path to your new module folder. By default, the system folder is already added to the `PSModulePath` environment variable.
+1. Make sure that the `PSModulePath` environment variable includes the path to your new module
+   folder. By default, the system folder is already added to the `PSModulePath` environment
+   variable. To view the `PSModulePath`, type: `$env:PSModulePath`.
 
-3. Copy the cmdlet assembly into the module folder.
+1. Copy the cmdlet assembly into the module folder.
 
-4. Run the following command to add the cmdlets to the session:
+1. Add a module manifest file (`.psd1`) in the module's root folder. PowerShell uses the module
+   manifest to import your module. For more information, see [How to Write a PowerShell Module Manifest](../module/how-to-write-a-powershell-module-manifest.md).
 
-   `import-module [Module_Name]`
+1. Run the following command to add the cmdlets to the session:
 
-   This procedure can be used to test your cmdlets. It adds all the cmdlets in the assembly to the session. For more information about modules, the different types of modules, the different ways to load modules, and how to restrict the elements of a module that are exported, see [Writing a Windows PowerShell Module](../module/writing-a-windows-powershell-module.md).
+   `Import-Module [Module_Name]`
 
-## See Also
+   This procedure can be used to test your cmdlets. It adds all the cmdlets in the assembly to the
+   session. For more information about modules, see [Writing a Windows PowerShell Module](../module/writing-a-windows-powershell-module.md).
 
-[Writing a Windows PowerShell Cmdlet](./writing-a-windows-powershell-cmdlet.md)
+## See also
+
+[How to Write a PowerShell Module Manifest](../module/how-to-write-a-powershell-module-manifest.md)
+
+[Importing a PowerShell Module](../module/importing-a-powershell-module.md)
 
-[Installing Modules](../module/installing-a-powershell-module.md)
+[Import-Module](/powershell/module/Microsoft.PowerShell.Core/Import-Module)
+
+[Installing Modules](../module/installing-a-powershell-module.md)
+
+[Modifying the PSModulePath Installation Path](../module/modifying-the-psmodulepath-installation-path.md)
+
+[Writing a Windows PowerShell Cmdlet](./writing-a-windows-powershell-cmdlet.md)

dsc/configurations/import-dscresource.md

@@ -73,7 +73,7 @@ This usage has the following benefits:
 
 When authoring the DSC configuration in ISE, PowerShell provides IntelliSence for resources and resource properties. Resource definitions under the `$pshome` module path are loaded automatically. When you import resources using the `Import-DSCResource` keyword, the specified resource definitions are added and Intellisense is expanded to include the imported resource's schema.
 
-![Resource Intellisense](/media/resource-intellisense.png)
+![Resource Intellisense](../media/resource-intellisense.png)
 
 > [!NOTE]
 > Beginning in PowerShell 5.0, tab completion was added to the ISE for DSC resources and their properties. For more information, see [Resources](../resources/resources.md).
@@ -132,11 +132,11 @@ Installing and using multiple versions of resources side by side was not support
 
 In the image below, two versions of the **xPSDesiredStateConfiguration** module are installed.
 
-![Multiple Resource Versions Fixed](/media/multiple-resource-versions-broken.md)
+![Multiple Resource Versions Fixed](../media/multiple-resource-versions-broken.png)
 
 Copy the contents of your desired module version to the top level of the module directory.
 
-![Multiple Resource Versions Fixed](/media/multiple-resource-versions-fixed.md)
+![Multiple Resource Versions Fixed](../media/multiple-resource-versions-fixed.png)
 
 ### Resource location
 

dsc/managing-nodes/metaConfig.md

@@ -129,8 +129,8 @@ A **ConfigurationRepositoryWeb** defines the following properties.
 |ProxyURL*|string|The URL of the http proxy to use when communicating with the configuration service.|
 |ProxyCredential*|pscredential|Credential to use for the http proxy.|
 
->!NOTE
->\* Supported in Windows versions 1809 and later.
+> [!NOTE]
+> * Supported in Windows versions 1809 and later.
 
 An example script to simplify configuring the ConfigurationRepositoryWeb value for on-premises nodes
 is available - see [Generating DSC metaconfigurations](https://docs.microsoft.com/azure/automation/automation-dsc-onboarding#generating-dsc-metaconfigurations)
@@ -158,8 +158,8 @@ A **ResourceRepositoryWeb** defines the following properties.
 |ProxyURL*|string|The URL of the http proxy to use when communicating with the configuration service.|
 |ProxyCredential*|pscredential|Credential to use for the http proxy.|
 
->!NOTE
->\* Supported in Windows versions 1809 and later.
+> [!NOTE]
+> * Supported in Windows versions 1809 and later.
 
 An example script to simplify configuring the ResourceRepositoryWeb value for on-premises nodes
 is available - see [Generating DSC metaconfigurations](https://docs.microsoft.com/azure/automation/automation-dsc-onboarding#generating-dsc-metaconfigurations)
@@ -188,8 +188,8 @@ The report server role is not compatible with SMB based pull service.
 |ProxyURL*|string|The URL of the http proxy to use when communicating with the configuration service.|
 |ProxyCredential*|pscredential|Credential to use for the http proxy.|
 
->!NOTE
->\* Supported in Windows versions 1809 and later.
+> [!NOTE]
+> * Supported in Windows versions 1809 and later.
 
 An example script to simplify configuring the ReportServerWeb value for on-premises nodes
 is available - see [Generating DSC metaconfigurations](https://docs.microsoft.com/azure/automation/automation-dsc-onboarding#generating-dsc-metaconfigurations)

dsc/resources/get-test-set.md

@@ -8,7 +8,7 @@ title:  Get-Test-Set
 
 >Applies To: Windows PowerShell 4.0, Windows PowerShell 5.0
 
-![Get, Test, and Set](/media/get-test-set.png)
+![Get, Test, and Set](../media/get-test-set.png)
 
 PowerShell Desired State Configuration is constructed around a **Get**, **Test**, and **Set** process. DSC [resources](resources.md) each contains methods to complete each of these operations. In a [Configuration](../configurations/configurations.md), you define resource blocks to fill in keys that become parameters for a resource's **Get**, **Test**, and **Set** methods.