Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging latest updates to Live #1947

Merged
merged 108 commits into from
Dec 12, 2017
Merged

Merging latest updates to Live #1947

merged 108 commits into from
Dec 12, 2017

Conversation

sdwheeler
Copy link
Contributor

No description provided.

matt9ucci and others added 30 commits November 7, 2017 09:42
The example is a `-DisplayError` parameter example. But it uses `-ShowError` parameter.
The example is a -DisplayError parameter example. But it uses -ShowError parameter.
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
- 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.
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
updating Out-* commands with -NoNewLine per Issue 1739
* Updating the help content for v6.

* Address code review comments

* Fix broken links
Example number '7' is duplicated.
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.
…roduced 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
Example number '4' is duplicated.
matt9ucci and others added 26 commits December 4, 2017 08:04
* fixing backlashes reported in PR1921

* found more backslashes
* Line 192  Single Quote Breaks Example

* clarified the example for -Regex
`-Exclude Get-*` is ineffective because there are no aliases that begin with `Get-`.
* Update Unregister-ScheduledJob.md

* Update Unregister-ScheduledJob.md

* Update Unregister-ScheduledJob.md

* Update Unregister-ScheduledJob.md
* Changed required PSGet version to 1.6.0

* Fixes to PSGet TOC and WMF 5.1 compat page
Proof-read some of the examples. The first two were wrong entirely: The user must be in the ps-test folder for the result shown to happen.
* Update about_Hash_Tables.md

corrected add to hash table example in 3.0

* Update about_Hash_Tables.md

corrected add to hash table examples in 4.0

* Update about_Hash_Tables.md

corrected add to hash table example in 5.0

* Update about_Hash_Tables.md

corrected add to hash table example in 5.1

* Update about_Hash_Tables.md

corrected add to hash table example in 6
@saldana
Copy link
Contributor

saldana commented Dec 12, 2017

❌ Validation status: errors

File Status Preview URL Details
❌Error Details

  • [Error] Cannot sync git repo to specified state. Please make sure the pull request is mergeable. Details: Git merge results in conflict, repository remote url: https://github.com/PowerShell/PowerShell-Docs, working directory: W:\eh4z-s, target branch: live, target branch commit: 2b207fe, source branch: staging, source branch commit: .

For more details, please refer to the build report.

Note: If you changed an existing file name or deleted a file, broken links in other files to the deleted or renamed file are listed only in the full build report.

@saldana
Copy link
Contributor

saldana commented Dec 12, 2017

⚠️ Validation status: warnings

File Status Preview URL Details
dsc/metaConfig.md ⚠️Warning Details
reference/3.0/Microsoft.PowerShell.Core/About/about_Hash_Tables.md ⚠️Warning Details
reference/4.0/Microsoft.PowerShell.Core/About/about_Hash_Tables.md ⚠️Warning Details
reference/5.0/Microsoft.PowerShell.Core/About/about_Hash_Tables.md ⚠️Warning Details
reference/5.1/Microsoft.PowerShell.Core/About/about_For.md ⚠️Warning Details
reference/5.1/Microsoft.PowerShell.Core/About/about_Hash_Tables.md ⚠️Warning Details
reference/5.1/Microsoft.PowerShell.Core/About/about_Switch.md ⚠️Warning Details
reference/6/Microsoft.PowerShell.Core/About/about_Hash_Tables.md ⚠️Warning Details
gallery/TOC.md ✅Succeeded
reference/3.0/Microsoft.PowerShell.Utility/Add-Member.md ✅Succeeded
reference/3.0/Microsoft.PowerShell.Utility/ConvertFrom-Csv.md ✅Succeeded
reference/3.0/Microsoft.PowerShell.Utility/ConvertTo-Xml.md ✅Succeeded
reference/3.0/Microsoft.PowerShell.Utility/Get-Alias.md ✅Succeeded
reference/3.0/Microsoft.PowerShell.Utility/Select-Object.md ✅Succeeded
reference/3.0/PSScheduledJob/Unregister-ScheduledJob.md ✅Succeeded
reference/4.0/Microsoft.PowerShell.Utility/Add-Member.md ✅Succeeded
reference/4.0/Microsoft.PowerShell.Utility/ConvertFrom-Csv.md ✅Succeeded
reference/4.0/Microsoft.PowerShell.Utility/ConvertTo-Xml.md ✅Succeeded
reference/4.0/Microsoft.PowerShell.Utility/Get-Alias.md ✅Succeeded
reference/4.0/Microsoft.PowerShell.Utility/Select-Object.md ✅Succeeded
reference/4.0/PSScheduledJob/Unregister-ScheduledJob.md ✅Succeeded
reference/5.0/Microsoft.PowerShell.Utility/Add-Member.md ✅Succeeded
reference/5.0/Microsoft.PowerShell.Utility/ConvertFrom-Csv.md ✅Succeeded
reference/5.0/Microsoft.PowerShell.Utility/ConvertTo-Xml.md ✅Succeeded
reference/5.0/Microsoft.PowerShell.Utility/Format-Hex.md ✅Succeeded
reference/5.0/Microsoft.PowerShell.Utility/Get-Alias.md ✅Succeeded
reference/5.0/Microsoft.PowerShell.Utility/Select-Object.md ✅Succeeded
reference/5.0/PSScheduledJob/Unregister-ScheduledJob.md ✅Succeeded
reference/5.1/Microsoft.PowerShell.Management/Get-Item.md ✅Succeeded
reference/5.1/Microsoft.PowerShell.Utility/Add-Member.md ✅Succeeded
reference/5.1/Microsoft.PowerShell.Utility/ConvertFrom-Csv.md ✅Succeeded
reference/5.1/Microsoft.PowerShell.Utility/ConvertTo-Xml.md ✅Succeeded
reference/5.1/Microsoft.PowerShell.Utility/Format-Hex.md ✅Succeeded
reference/5.1/Microsoft.PowerShell.Utility/Get-Alias.md ✅Succeeded
reference/5.1/Microsoft.PowerShell.Utility/Select-Object.md ✅Succeeded
reference/5.1/PSScheduledJob/Unregister-ScheduledJob.md ✅Succeeded
reference/6/Microsoft.PowerShell.Management/Get-Process.md ✅Succeeded
reference/6/Microsoft.PowerShell.Utility/Add-Member.md ✅Succeeded
reference/6/Microsoft.PowerShell.Utility/ConvertFrom-Csv.md ✅Succeeded
reference/6/Microsoft.PowerShell.Utility/ConvertTo-Xml.md ✅Succeeded
reference/6/Microsoft.PowerShell.Utility/Format-Hex.md ✅Succeeded
reference/6/Microsoft.PowerShell.Utility/Get-Alias.md ✅Succeeded
reference/6/Microsoft.PowerShell.Utility/Select-Object.md ✅Succeeded
wmf/5.1/productincompat.md ✅Succeeded

dsc/metaConfig.md

  • [Warning] Ignore metadata: ms.locale. They are generated by open publish.
  • [Warning] Author eslesar;mgreenegit cannot be recognized in GitHub.
  • [Warning] Can't find output file for bread/toc.json

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

  • [Warning] Ignore metadata: locale. They are generated by open publish.

reference/4.0/Microsoft.PowerShell.Core/About/about_Hash_Tables.md

  • [Warning] Ignore metadata: locale. They are generated by open publish.

reference/5.0/Microsoft.PowerShell.Core/About/about_Hash_Tables.md

  • [Warning] Ignore metadata: locale. They are generated by open publish.

reference/5.1/Microsoft.PowerShell.Core/About/about_For.md

  • [Warning] Ignore metadata: locale. They are generated by open publish.

reference/5.1/Microsoft.PowerShell.Core/About/about_Hash_Tables.md

  • [Warning] Ignore metadata: locale. They are generated by open publish.

reference/5.1/Microsoft.PowerShell.Core/About/about_Switch.md

  • [Warning] Ignore metadata: locale. They are generated by open publish.

reference/6/Microsoft.PowerShell.Core/About/about_Hash_Tables.md

  • [Warning] Ignore metadata: locale. They are generated by open publish.

For more details, please refer to the build report.

Note: If you changed an existing file name or deleted a file, broken links in other files to the deleted or renamed file are listed only in the full build report.

@sdwheeler sdwheeler merged commit ea01285 into live Dec 12, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.