Skip to content

Commit 60c6f9d

Browse files
author
Sean Wheeler
authored
Merging latest updates into Live (#1863)
* Update the example of `Where-Object -IsNot` (#1841) * Update Example 5 in Group-Object.md (#1845) * removing @{Text=} tags * fixing UTF8 characters * removed empty H3 * added H3 for input and output types * removed mangled UTF8 character * updating Out-* commands with -NoNewLine per Issue 1739 * Fix the example of `Format-Table -DisplayError` (#1848) The example is a `-DisplayError` parameter example. But it uses `-ShowError` parameter. * Fix the example of `Format-Wide -DisplayError` (#1850) * Fix the example of `Format-Custom -DisplayError` (#1849) The example is a -DisplayError parameter example. But it uses -ShowError parameter. * updating set-acl docs per PR#901 * using semantic link breaks * Fix the example of `Format-Wide -ShowError` (#1851) * Fixed Test-ScriptFileInfo example (#1852) * fixing issue 1768 * Formatting, example fix for Body parameter (#1847) 1. Replaced variable names with PascalCase convention and for consistency 2. Removed directory information [c:\] in the examples 3. Put powershell keyword for formatting examples 4. Replaced Invoke-RestMethod with Invoke-WebRequest in the Body example, added method Post 5. Removed InformationAction and InformationVariable parameters, which were mistakenly a copy of Body, included already in CommonVariables part * fixing style consistency across articles * Fix example numbers in Resume-Job.md (#1857) Example 4 is duplicated. * Fixes typo $WebSiteName in separatingEnvData.md (#1856) - Adds the website name to common node property inside configuration data. - Also, it is now referenced (e.g. $Node.WebSiteName) in the DSC configuration document in MyWebApp.ps1. * Updates configurations.md (#1855) Two set of changes made. - Example scripts e.g. MyDscConfiguration.ps1 define the configuration inside them and call the configuration at the end line. Removed the call to the configuration at the end. Since the article demonstrates dot-sourcing the file and calling the configuration explicitly. - Fixed typo in the file name (TEST-PC1.mof to localhost.mof ), since the ComputerName was not specified it should default to using 'localhost' as the default argument for it. P.S. - There is a comment on the web-page regarding the fixes made * Fix typo in comment (#1854) * Updating the help content for v6. (#1853) * Updating the help content for v6. * Address code review comments * Fix broken links * Fix example numbers in about_Transactions.md (#1859) Example number '7' is duplicated. * Update Alias-Provider.md (#1831) 1. Removed statement that an alias is to an executable, the definition cotnains the path. It may - but does not need to be. For example: Try Set-Alias np Notepad then look at the definition. 2. Clarified that an alias can also be to a powershell script (ps1 file). 3. Tidied up the language removing multiple 'And,' clauses to improve readability. * Add documentation of new -AsHashtable switch for ConvertFrom-Json introduced by PR #5043 (#1858) * add documentation of new -AsHashTable switch for ConvertFrom-Json and also document the behaviour in case of duplicate strings. * correct casing of -AsHashtable switch. * Address PR comments about -AsHashtable switch for ConvertFrom-Json.md * Accept pipeline input: False for -AsHashtable switch in ConvertFrom-Json.md * Revert "Accept pipeline input: False for -AsHashtable switch in ConvertFrom-Json.md" Accidentally change the wrong field. This reverts commit 6e76191. * Accept pipeline input: False for -AsHashtable switch in ConvertFrom-Json.md * Fix example numbers in Invoke-WebRequest.md (#1862) Example number '4' is duplicated. * reformatting and integrating changes from PR#1831 (#1860) * Fix example numbers in Get-Help.md (#1869) Example number 12 and 13 are missing. * Fix example numbers in Import-Module.md (#1868) Example number '10' is duplicated. * Fix example number in ConvertTo-Html.html (#1867) Example number '10' is duplicated. * Update dscCiCd.md (#1865) Missing a period on line 378. Should be `$(Build.ArtifactStagingDirectory)\` not `$(BuildArtifactStagingDirectory)\`.
1 parent 4807ab5 commit 60c6f9d

File tree

227 files changed

+4474
-4113
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

227 files changed

+4474
-4113
lines changed

dsc/authoringResourceComposite.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Configuration xVirtualMachine
9494
DependsOn = "[File]ParentVHDFile"
9595
}
9696
97-
# Creae VM specific diff VHD
97+
# Create VM specific diff VHD
9898
foreach ($Name in $VMName)
9999
{
100100
xVHD "VHD$Name"

dsc/configurations.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ Configuration MyDscConfiguration {
2828
}
2929
}
3030
31-
MyDscConfiguration
3231
```
3332

3433
Save the script as a .ps1 file.
@@ -62,7 +61,6 @@ Configuration MyDscConfiguration {
6261
}
6362
}
6463
65-
MyDscConfiguration
6664
```
6765

6866
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
9997
Directory: C:\users\default\Documents\DSC Configurations\MyDscConfiguration
10098
Mode LastWriteTime Length Name
10199
---- ------------- ------ ----
102-
-a---- 10/23/2015 4:32 PM 2842 TEST-PC1.mof
100+
-a---- 10/23/2015 4:32 PM 2842 localhost.mof
103101
```
104102

105103
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 {
140138
}
141139
}
142140
143-
DependsOnExample
144141
```
145142

146143
## Using new resources in Your configuration

dsc/dscCiCd.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ and stores the results in the `InfraDNS/Tests/Results/*.xml` folder.
375375
**\Integration\**
376376
```
377377
378-
1. Set **TargetFolder** to `$(BuildArtifactStagingDirectory)\`
378+
1. Set **TargetFolder** to `$(Build.ArtifactStagingDirectory)\`
379379
380380
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.
381381

dsc/separatingEnvData.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ We'll define the development and production environment data in a file namd `Dev
104104
SQLServerName = "MySQLServer"
105105
SqlSource = "C:\Software\Sql"
106106
DotNetSrc = "C:\Software\sxs"
107+
WebSiteName = "New website"
107108
},
108109
109110
@{
@@ -218,7 +219,7 @@ Configuration MyWebApp
218219
{
219220
220221
Ensure = 'Present'
221-
Name = $WebSiteName
222+
Name = $Node.WebSiteName
222223
State = 'Started'
223224
PhysicalPath = $Node.SitePath
224225
DependsOn = '[File]WebContent'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ $t.tostring()
579579

580580
Windows PowerShell
581581

582-
# EXAMPLE 7: MANAGING MULTI-SUBSCRIBER TRANSACTIONS
582+
# EXAMPLE 8: MANAGING MULTI-SUBSCRIBER TRANSACTIONS
583583

584584

585585
When you start a transaction while another transaction is in
@@ -663,7 +663,7 @@ RollbackPreference SubscriberCount Status
663663
------------------ --------------- ------
664664
Error 0 Committed
665665

666-
# EXAMPLE 8: MANAGING INDEPENDENT TRANSACTIONS
666+
# EXAMPLE 9: MANAGING INDEPENDENT TRANSACTIONS
667667

668668

669669
When you start a transaction while another transaction is in

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,15 +219,15 @@ PS C:\> Get-Help Get-Member -Online
219219
```
220220

221221
This command displays the online version of the help topic for the Get-Member cmdlet.
222-
### Example 14
222+
### Example 12
223223
```
224224
PS C:\> Get-Help remoting
225225
```
226226

227227
This command displays a list of topics that include the word "remoting."
228228

229229
When you enter a word that does not appear in any topic title, **Get-Help** displays a list of topics that include that word.
230-
### Example 15
230+
### Example 13
231231
```
232232
The first command uses the **Path** parameter of **Get-Help** to specify the provider path. This command can be entered at any path location.
233233
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*
282282

283283
You can also get provider-specific help for cmdlets online in the section that describes the provider.
284284
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.
285-
### Example 16
285+
### Example 14
286286
```
287287
PS C:\> Get-Help C:\PS-Test\MyScript.ps1
288288
```

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ This command imports the PSWorkflow module.
322322
It uses the **MinimumVersion** (alias=Version) parameter of **Import-Module** to import only version 3.0.0.0 or greater of the module.
323323

324324
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.
325-
### Example 10
325+
### Example 11
326326
```
327327
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
328328
PS C:\> $s = New-PSSession -ComputerName Server01
@@ -365,7 +365,7 @@ This command uses the Implicit Remoting feature of Windows PowerShell.
365365

366366
When you import modules from another session, you can use the cmdlets in the current session.
367367
However, commands that use the cmdlets actually run in the remote session.
368-
### Example 11
368+
### Example 12
369369
```
370370
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.
371371
PS C:\> $cs = New-CimSession -ComputerName RSDGF03

0 commit comments

Comments
 (0)