Skip to content

Merging latest updates to Live #2019

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 178 commits into from
Jan 6, 2018
Merged

Merging latest updates to Live #2019

merged 178 commits into from
Jan 6, 2018

Conversation

sdwheeler
Copy link
Contributor

Merging to get latest appveyor script published to live.

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 27 commits January 2, 2018 08:18
Match specified GetScript rule
The link "http://go.microsoft.com/fwlink/?LinkId=119096" is supposed to point to a page or a document about "Code-Signing Best Practices".
However, it points to a video about "Understanding Extension INFs and Component INFs".
I watched the whole video and there is nothing inside about "Code-Signing Best Practices".
The best match I have found is the following one: http://download.microsoft.com/download/a/f/7/af7777e5-7dcd-4800-8a0a-b18336565f5b/best_practices.doc
It would be a very good idea to make a web page from this document. Pieces of advice it contains are still accurate.
The existing example did not specify you needed to create the INF. This not only says so but does so using a script block piped to out-file
The CanPauseAndContinue property is a boolean so the correct comparison to use is $true rather than "True".
* Help doc correction

Removed an unwanted * from Notes section

Corrected intenting for last example

Removed unwanted ... from example 2

* Help doc wnhancements in all versions for ConvertFrom-StringData

Removed an unwanted * from Notes section

Corrected intenting for last example

Removed unwanted ... from example 2
* First draft of PowerShell 6 logging

* Fix style guideline issues.

* Document logging settings in PowerShellProperties.json

* Address PR Feedback
Limit lines to 80 columns, when possible
Insert <br> in selected locations to improve readability of rendered markdown.

* Reformatted tables

Reformatted tables to work with new processing of About_* topics
* Adding calling the ComputerName parameter to the example

* Changing quotes to brackets
The variable was declared but not used.  It also appears in the same place in Example 2 but is used later on.
* v4 about scrub missed files

* fixing broken links

* fix broken link
* v3 about scrub missed files

* fixing broken links

* fix broken link
* v5 about scrub missed files

* fixing broken links
* v6 about scrub missed files

* fixing broken links and removing non-v6 content
* Corrected Example 3

Example 3 is an example to remove the user from the group but instead it was removing the group completely.  This change adds the correct syntax to perform what was intended.

See #2001

* minor edits for spacing and metadata
* Enable running pandoc on about topic files

* Remove extra line

* Removed --ascii parameter from pandoc as it is not required
@saldana
Copy link
Contributor

saldana commented Jan 6, 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:\cwnd-s, target branch: live, target branch commit: c72c76f, 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 6, 2018

✅ Validation status: passed

File Status Preview URL Details
appveyor.ps1 ✅Succeeded

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 752430e into live Jan 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.