Merging latest updates into Live

dsc/authoringResourceComposite.md

@@ -94,7 +94,7 @@ Configuration xVirtualMachine
         DependsOn = "[File]ParentVHDFile"
     }
 
-    # Creae VM specific diff VHD
+    # Create VM specific diff VHD
     foreach ($Name in $VMName)
     {
         xVHD "VHD$Name"

dsc/configurations.md

@@ -28,7 +28,6 @@ Configuration MyDscConfiguration {
 	}
 } 
 
-MyDscConfiguration 
 ```
 
 Save the script as a .ps1 file.
@@ -62,7 +61,6 @@ Configuration MyDscConfiguration {
 	}
 }
 
-MyDscConfiguration 
 ```
 
 In this example, you specify the name of the node by passing it as the **ComputerName** parameter when you compile the configuraton. The name defaults to "localhost".
@@ -99,7 +97,7 @@ MyDscConfiguration
     Directory: C:\users\default\Documents\DSC Configurations\MyDscConfiguration
 Mode                LastWriteTime         Length Name                                                                                              
 ----                -------------         ------ ----                                                                                         
--a----       10/23/2015   4:32 PM           2842 TEST-PC1.mof
+-a----       10/23/2015   4:32 PM           2842 localhost.mof
 ```  
 
 If the configuration takes a parameter, as in the second example, that has to be provided at compile time. Here's how that would look:
@@ -140,7 +138,6 @@ Configuration DependsOnExample {
     }
 }
 
-DependsOnExample
 ```
 
 ## Using new resources in Your configuration

dsc/dscCiCd.md

@@ -375,7 +375,7 @@ and stores the results in the `InfraDNS/Tests/Results/*.xml` folder.
     **\Integration\**
     ```
 
-1. Set **TargetFolder** to `$(BuildArtifactStagingDirectory)\`
+1. Set **TargetFolder** to `$(Build.ArtifactStagingDirectory)\`
 
 This step copies the build and test scripts to the staging directory so that the can be published as build artifacts by the next step.
 

dsc/separatingEnvData.md

@@ -104,6 +104,7 @@ We'll define the development and production environment data in a file namd `Dev
             SQLServerName   = "MySQLServer"
             SqlSource       = "C:\Software\Sql"
             DotNetSrc       = "C:\Software\sxs"
+	    WebSiteName     = "New website"
         },
 
         @{
@@ -218,7 +219,7 @@ Configuration MyWebApp
         {
 
             Ensure          = 'Present'
-            Name            = $WebSiteName
+            Name            = $Node.WebSiteName
             State           = 'Started'
             PhysicalPath    = $Node.SitePath
             DependsOn       = '[File]WebContent'

reference/3.0/Microsoft.PowerShell.Core/About/about_Transactions.md

@@ -579,7 +579,7 @@ $t.tostring()
 
 Windows PowerShell
 
-# EXAMPLE 7: MANAGING MULTI-SUBSCRIBER TRANSACTIONS
+# EXAMPLE 8: MANAGING MULTI-SUBSCRIBER TRANSACTIONS
 
 
 When you start a transaction while another transaction is in
@@ -663,7 +663,7 @@ RollbackPreference   SubscriberCount   Status
 ------------------   ---------------   ------
 Error                0                 Committed
 
-# EXAMPLE 8: MANAGING INDEPENDENT TRANSACTIONS
+# EXAMPLE 9: MANAGING INDEPENDENT TRANSACTIONS
 
 
 When you start a transaction while another transaction is in

reference/3.0/Microsoft.PowerShell.Core/Get-Help.md

@@ -219,15 +219,15 @@ PS C:\> Get-Help Get-Member -Online
 ```
 
 This command displays the online version of the help topic for the Get-Member cmdlet.
-### Example 14
+### Example 12
 ```
 PS C:\> Get-Help remoting
 ```
 
 This command displays a list of topics that include the word "remoting."
 
 When you enter a word that does not appear in any topic title, **Get-Help** displays a list of topics that include that word.
-### Example 15
+### Example 13
 ```
 The first command uses the **Path** parameter of **Get-Help** to specify the provider path. This command can be entered at any path location.
 PS C:\> Get-Help Get-Item -Path SQLSERVER:\DataCollection
@@ -282,7 +282,7 @@ The example shows two ways of getting the provider-specific help for **Get-Item*
 
 You can also get provider-specific help for cmdlets online in the section that describes the provider.
 For example, for provider-specific online help for the New-Item cmdlet in each WSMan provider path, see http://go.microsoft.com/fwlink/?LinkID=158676http://go.microsoft.com/fwlink/?LinkID=158676.
-### Example 16
+### Example 14
 ```
 PS C:\> Get-Help C:\PS-Test\MyScript.ps1
 ```

reference/3.0/Microsoft.PowerShell.Core/Import-Module.md

@@ -322,7 +322,7 @@ This command imports the PSWorkflow module.
 It uses the **MinimumVersion** (alias=Version) parameter of **Import-Module** to import only version 3.0.0.0 or greater of the module.
 
 You can also use the **RequiredVersion** parameter to import a particular version of a module, or use the **Module** and **Version** parameters of the **#Requires** keyword to require a particular version of a module in a script.
-### Example 10
+### Example 11
 ```
 The first command uses the New-PSSession cmdlet to create a remote session (PSSession) to the Server01 computer. The command saves the PSSession in the $s variable
 PS C:\> $s = New-PSSession -ComputerName Server01
@@ -365,7 +365,7 @@ This command uses the Implicit Remoting feature of Windows PowerShell.
 
 When you import modules from another session, you can use the cmdlets in the current session.
 However, commands that use the cmdlets actually run in the remote session.
-### Example 11
+### Example 12
 ```
 The first command uses the **New-CimSession** cmdlet to create a session on the RSDGF03 remote computer. The session connects to WMI on the remote computer. The command saves the CIM session in the $cs variable.
 PS C:\> $cs = New-CimSession -ComputerName RSDGF03