Skip to content

Merging latest changes into Live #2063

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 212 commits into from
Jan 17, 2018
Merged

Merging latest changes into Live #2063

merged 212 commits into from
Jan 17, 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.
Sean Wheeler and others added 20 commits January 11, 2018 10:41
* attempt to fix images

* update to docfx to support images

* update root docfx for images

* update docfx for image support
The original paged rendered badly - this edit is a move of a 'to do' comment in the MD so as to not break the sentence.
$PSVersionTable.OS is:
x [System.Environment]::OSVersion.VersionString
o [System.Runtime.InteropServices.RuntimeInformation]::OSDescription
The current example doesn't work for me when specifying the full file path.  It just outputs the file location rather than running the script.  I had to move to the location of the file and run it from there.

The parameter PowerShellVersion also doesn't appear to exist anymore so I have removed that.  

I've also changes file paths to match the 6.0.0 GA release rather than the previous alpha 9.
Updated Get-FormatData Markdown.  Fixes #1895
Updated Get-FormatData Markdown.  Fixes #1895
Updated Get-Runspace Markdown.  Fixes #1883
* attempt to fix images

* update to docfx to support images

* update root docfx for images

* update docfx for image support

* update docfx for images
* clean up warnings from build log

* clean up moniker mapping and add image types to config

* removing unneeded index pages

* fixing typos
Missing "are" between "they" and "effective".
* Update Add-Member.md

fixed layout of examples 1,2 ,3

* fixed format of example 5
#2057)

There is no need to have documentation for functions which do not exists in the product.
There is no need to specify in which version this feature was added. Otherwise we need to add such remarks to many other features as well
"Backwards compatibility with Windows PowerShell" anchor reference had incorrect Markdown syntax.
Update "On the Target Node: create and export the certificate" section
@saldana
Copy link
Contributor

saldana commented Jan 17, 2018

❌ 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:\hzbs-s, target branch: live, target branch commit: 12dcead, 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 Jan 17, 2018

❌ 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:\zach-s, target branch: live, target branch commit: 12dcead, 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.

@sdwheeler
Copy link
Contributor Author

Close/Reopen to try again.

@sdwheeler sdwheeler closed this Jan 17, 2018
@sdwheeler sdwheeler reopened this Jan 17, 2018
@saldana
Copy link
Contributor

saldana commented Jan 17, 2018

❌ 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:\hy4h-s, target branch: live, target branch commit: 12dcead, 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 Jan 17, 2018

⚠️ Validation status: warnings

File Status Preview URL Details
dsc/DSCAutomationHostEnabled.md ⚠️Warning Details
dsc/DscForEngineers.md ⚠️Warning Details
dsc/PackageManagementDscResource.md ⚠️Warning Details
dsc/PackageManagementSourceDscResource.md ⚠️Warning Details
dsc/archiveResource.md ⚠️Warning Details
dsc/authoringResource.md ⚠️Warning Details
dsc/authoringResourceClass.md ⚠️Warning Details
dsc/authoringResourceComposite.md ⚠️Warning Details
dsc/authoringResourceMOF.md ⚠️Warning Details
dsc/authoringResourceMofCS.md ⚠️Warning Details
dsc/authoringResourceMofDesigner.md ⚠️Warning Details
dsc/azureDsc.md ⚠️Warning Details
dsc/bootstrapDsc.md ⚠️Warning Details
dsc/builtInResource.md ⚠️Warning Details
dsc/compositeConfigs.md ⚠️Warning Details
dsc/configData.md ⚠️Warning Details
dsc/configDataCredentials.md ⚠️Warning Details
dsc/configHelp.md ⚠️Warning Details
dsc/configurations.md ⚠️Warning Details
dsc/crossNodeDependencies.md ⚠️Warning Details
dsc/debugResource.md ⚠️Warning Details
dsc/decisionMaker.md ⚠️Warning Details
dsc/directCallResource.md ⚠️Warning Details
dsc/dscCiCd.md ⚠️Warning Details
dsc/dscExamples.md ⚠️Warning Details
dsc/enactingConfigurations.md ⚠️Warning Details
dsc/environmentResource.md ⚠️Warning Details
dsc/fileResource.md ⚠️Warning Details
dsc/gettingStarted.md ⚠️Warning Details
dsc/groupSetResource.md ⚠️Warning Details
dsc/lnxArchiveResource.md ⚠️Warning Details
dsc/lnxBuiltInResources.md ⚠️Warning Details
dsc/lnxEnvironmentResource.md ⚠️Warning Details
dsc/lnxFileLineResource.md ⚠️Warning Details
dsc/lnxFileResource.md ⚠️Warning Details
dsc/lnxGettingStarted.md ⚠️Warning Details
dsc/lnxGroupResource.md ⚠️Warning Details
dsc/lnxPackageResource.md ⚠️Warning Details
dsc/lnxScriptResource.md ⚠️Warning Details
dsc/lnxServiceResource.md ⚠️Warning Details
dsc/lnxSshAuthorizedKeysResource.md ⚠️Warning Details
dsc/lnxUserResource.md ⚠️Warning Details
dsc/logResource.md ⚠️Warning Details
dsc/metaConfig.md ⚠️Warning Details
dsc/metaConfig4.md ⚠️Warning Details
dsc/msft-dsclocalconfigurationmanager-applyconfiguration.md ⚠️Warning Details
dsc/msft-dsclocalconfigurationmanager-disabledebugconfiguration.md ⚠️Warning Details
dsc/msft-dsclocalconfigurationmanager-enabledebugconfiguration.md ⚠️Warning Details
dsc/msft-dsclocalconfigurationmanager-getconfiguration.md ⚠️Warning Details
dsc/msft-dsclocalconfigurationmanager-getconfigurationresultoutput.md ⚠️Warning Details

This comment lists only the first 50 files in the pull request.

dsc/DSCAutomationHostEnabled.md

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

dsc/DscForEngineers.md

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

dsc/PackageManagementDscResource.md

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

dsc/PackageManagementSourceDscResource.md

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

dsc/archiveResource.md

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

dsc/authoringResource.md

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

dsc/authoringResourceClass.md

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

dsc/authoringResourceComposite.md

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

dsc/authoringResourceMOF.md

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

dsc/authoringResourceMofCS.md

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

dsc/authoringResourceMofDesigner.md

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

dsc/azureDsc.md

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

dsc/bootstrapDsc.md

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

dsc/builtInResource.md

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

dsc/compositeConfigs.md

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

dsc/configData.md

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

dsc/configDataCredentials.md

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

dsc/configHelp.md

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

dsc/configurations.md

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

dsc/crossNodeDependencies.md

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

dsc/debugResource.md

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

dsc/decisionMaker.md

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

dsc/directCallResource.md

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

dsc/dscCiCd.md

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

dsc/dscExamples.md

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

dsc/enactingConfigurations.md

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

dsc/environmentResource.md

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

dsc/fileResource.md

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

dsc/gettingStarted.md

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

dsc/groupSetResource.md

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

dsc/lnxArchiveResource.md

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

dsc/lnxBuiltInResources.md

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

dsc/lnxEnvironmentResource.md

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

dsc/lnxFileLineResource.md

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

dsc/lnxFileResource.md

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

dsc/lnxGettingStarted.md

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

dsc/lnxGroupResource.md

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

dsc/lnxPackageResource.md

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

dsc/lnxScriptResource.md

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

dsc/lnxServiceResource.md

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

dsc/lnxSshAuthorizedKeysResource.md

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

dsc/lnxUserResource.md

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

dsc/logResource.md

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

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/msft-dsclocalconfigurationmanager-applyconfiguration.md

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

dsc/msft-dsclocalconfigurationmanager-disabledebugconfiguration.md

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

dsc/msft-dsclocalconfigurationmanager-enabledebugconfiguration.md

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

dsc/msft-dsclocalconfigurationmanager-getconfiguration.md

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

dsc/msft-dsclocalconfigurationmanager-getconfigurationresultoutput.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 a444406 into live Jan 17, 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.