Skip to content

Merging latest into Live #2104

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

Merged
merged 243 commits into from
Feb 6, 2018
Merged

Merging latest into Live #2104

merged 243 commits into from
Feb 6, 2018

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.
J. Keith Bankston [MSFT] and others added 26 commits January 19, 2018 10:25
* Changed required PSGet version to 1.6.0

* New doc explaining how manifests affect Gallery UI

* Adding new topic to TOC
This change makes content in this brackets displayable
* Update metaConfig.md

* Update metaConfig.md
* Fix example VB code

This VB code writen in a line is not compilable. `VBFromFilePublic` also requires a space.

* Fix example 4 VB code for all versions

* Remove the mentioning of version 2.0
)

* Add SslProtocol parameter.

* Add libcurl note to Certificate parameter.
* address example formatting
Also includes some update to wording that I'll expand on in PR.

* Start on update formatting for 3.0 doc

* More formatting

* Correcting examples and format of them.

* 3.0 update format example 1

* 3.0 update to example 2

* 3.0 update example 4

* 4.0 update example 1-4

* 5.0 update example 3 and 4

* 5.1 update example 4 paragraph format

* 3.0 update example 5

* 4.0 update example 5

* 5.0 update example 5

* 5.1 update example 5

* 5.1 update example 6

* 5.0 update example 6

* 4.0 update example 6

* 3.0 update example 6

* 3.0 update format of param Delimiter and Encoding

* 4.0 update format of param Delimiter and Encoding

* 5.0 update format of param Encoding

* 5.1 update format of param Encoding

* 5.0 update param header

* 4.0 update param header info

* 3.0 update param header info

* 5.1 update remaining parameter format

* 5.0 update remaining parameter format

* 4.0 update remaining parameter format

* 3.0 update remaining parameter format

* 3.0 update remaining parameter format

* 5.1 update notes format and add related link

* 5.0 update notes format and add related link

* 4.0 update notes format and add related link

* 3.0 update notes format and add related link

* update to example 1 across 3.0 to 5.1

* 6.0 Updates to description and example 1

* 4.0 update to example 1

* 3.0 - 5.1 update case of file name

* 6.0 update example 2 and 3

* 3.0 - 5.1 update case of file name

* 6.0 working on updating example 4
This example does not give same results I have on 6.0.1. Think other examples are going to be bad as well, have to go back and test those.

* update example 4

* update example 5

* 6.0 example 6 and parameter format

* addtional touchups on format
Links to about_Object_Creation.md were malformed in all references versions.
There is no MacOS part in linux.md, now
* improve clarity on pull service

* remove line at top of page

* add community references

* remove extra lines

* fixed line break in bolded text

This should remove the build warning.
@zjalexander
Copy link
Contributor

❌ 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:\5y1k-s, target branch: live, target branch commit: 18e3bfa, 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.

@zjalexander
Copy link
Contributor

⚠️ Validation status: warnings

File Status Preview URL Details
dsc/metaConfig.md ⚠️Warning Details
dsc/metaConfig4.md ⚠️Warning Details
dsc/pullServer.md ⚠️Warning Details
reference/5.1/Microsoft.PowerShell.Management/Join-Path.md ✅Succeeded
reference/5.1/Microsoft.PowerShell.Management/New-PSDrive.md ✅Succeeded
reference/5.1/Microsoft.PowerShell.Security/Get-PfxCertificate.md ✅Succeeded
reference/6/Microsoft.PowerShell.Core/mkdir.md ✅Succeeded
reference/6/Microsoft.PowerShell.Utility/Invoke-WebRequest.md ✅Succeeded
reference/docs-conceptual/setup/Installing-Windows-PowerShell.md ✅Succeeded

dsc/metaConfig.md

  • [Warning] Can't find output file for bread/toc.json

dsc/metaConfig4.md

  • [Warning] Can't find output file for bread/toc.json

dsc/pullServer.md

  • [Warning] Can't find output file for bread/toc.json

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 aa71285 into live Feb 6, 2018
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.