Skip to content

Commit 93c647a

Browse files
author
Sean Wheeler
authored
Merging latest changes into Live (#1900)
* 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)\`. * Web Cmdlets 6.0.0 Documentation Refresh (#1870) * Web Cmdlets 6.0.0 Documentation Refresh * Address PR Feedback * Merge Example 4 and 5 in Get-Member.md (#1874) Example 4 and 5 in Get-Member.md v3.0 and v4.0 are almost the same. They should be merged as with v5.0. * Remove hash algorithms unsupported in v6.0 (#1873) MACTripleDES and RIPEMD160 are no longer supported in v6.0. * Update outputs of Get-Verb (#1872) Since v6.0, `Get-Verb` returns not MemberDefinition but VerbInfo that has Verb and Group properties. * Fix typo in ConvertTo-Html.md (UTF-x) (#1879) * Fix "Accept wildcard characters" in Get-Service.md v6 (#1878) * Fixed "False" -> "True" (`DisplayName`, `Exclude`, `Include`, and `Name`) * Removed `InformationAction` and `InformationVariable` * Fixed Get-WindowsFeature cmdlet HyperLink (#1877) * Fixed Get-WindowsFeature cmdlet HyperLink Minor edit. Update Get-WindowsFeature cmdlet HyperLink to https://technet.microsoft.com/library/jj205469(v=wps.630).aspx * Changed URL to new docs.microsoft.com location The TechNet URL did not work. TechNet and MSDN are being retired. * Update Get-WinEvent.md (#1876) Removed future tense in a couple of places to improve readability. Minor edit. * Update Example 8 in Get-Process.md (find the owner of a process) (#1875) * Update Example 8 in Get-Process.md (Find the owner of a process) * Update to attempt to avoid build errors It seems that the build system does not accept multiple script blocks per one Example header. * updated localmachine\Root to LocalMachine\My (#1880) The example where we import the PFX on the target node should import the cert into Personal store and not root. * Update Group property example in Get-Verb.md (#1881) * adding missing space (#1885) * removing stray character (#1886) * Update Example 9 in Get-Process.md (#1888) * powershell -> pwsh (only v6.0) * Windows PowerShell -> PowerShell * Remove "About ISE" files of v6.0 (#1891) * Remove "About ISE" files of v6.0 ISE is no longer bundled with PowerShell 6.0. * Remove links for "About ISE" files of v6.0 * Update Get-Process.md (#1890) Fixed name parameter details to show it accepts wildcards in the name * Update productincompat.md (#1892) The list of compatible systems should include Skype For Business Server 2015 and Lync Server 2013. * Update unapproved verbs examples in Get-Verb.md (#1896) * Updated Example 4 * Removed Example 5 * Removing extra space in the Example 5A script (#1894) It was highlighting as string in the documentation, I was trying to remove all the extra space. * fixing merge conflict * updates to style and contrib * tweak format * tweak format 2 * fix typo * fix number list example * adding review feedback * fix broken links * incorporating feedback from zach * reformatting About_* for 80 columns - part 1 * reformat about_* * reformatting About_* topics - Part 2 * fixing broken links * fixing more broken links * more broken links fixed
1 parent cd5a1f0 commit 93c647a

File tree

73 files changed

+6986
-7363
lines changed

Some content is hidden

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

73 files changed

+6986
-7363
lines changed

CONTRIBUTING.md

+7-106
Original file line numberDiff line numberDiff line change
@@ -1,108 +1,9 @@
1-
# Contributing to PowerShell Documentation
1+
# Contributor Guide
22

3-
Thank you for your interest in PowerShell documentation!
4-
See below for details on how you can contribute to our technical documentation.
3+
Thank you for your interest in contributing to quality documentations.
4+
As an open source project, we welcome input and updates from the community.
5+
The following topics explain how to contribute to the PowerShell documentation.
56

6-
>For general information about getting started with Git and GitHub, see [GitHub Help](https://help.github.com/).
7-
8-
## Sign a CLA
9-
10-
Before you can contribute to any PowerShell repositories, you must [sign a Microsoft Contribution Licensing Agreement (CLA)](https://cla.microsoft.com/).
11-
If you've already contributed to PowerShell repositories in the past, congratulations!
12-
You've already completed this step.
13-
14-
## Providing feedback on PowerShell documentation
15-
16-
You can point out errors, suggest changes, or request new topics by [creating an issue](https://help.github.com/articles/creating-an-issue/) on the
17-
[PowerShell-Docs repository issues page](https://github.com/PowerShell/PowerShell-Docs/issues).
18-
19-
Issues are reviewed regularly by members of the PowerShell documentation team, and are triaged, assigned, and addressed accordingly.
20-
21-
## Writing PowerShell documentation
22-
23-
One of the easiest ways to contribute to PowerShell is by helping to write and edit documentation.
24-
All of our documentation hosted on GitHub is written using [GitHub Flavored Markdown](https://help.github.com/articles/github-flavored-markdown/).
25-
26-
## Making minor edits to existing topics
27-
28-
To [edit an existing file](https://help.github.com/articles/editing-files-in-another-user-s-repository/), simply navigate to it and click the "Edit" button.
29-
GitHub will automatically create your own fork of our repository where you can make your changes.
30-
Once you're finished, save your edits and submit a [pull request](https://help.github.com/articles/creating-a-pull-request/) to the *staging* branch of the [PowerShell-Docs](https://github.com/PowerShell/PowerShell-Docs) repository.
31-
After your pull request is created, someone on the PowerShell documentation team will review your changes before merging them into the *staging* branch.
32-
33-
## Making major edits to existing topics
34-
35-
If you are making substantial changes to an existing article, adding or changing images, or contributing a new article, you will need to manually create your GitHub fork, then clone the fork down to your local computer.
36-
A fork is a GitHub-based replica of the main repository, under your GitHub account, which provides you with a working copy which you can use in isolation.
37-
You will create pull requests from your fork.
38-
Similarly, a clone is a local-based replica of the repository which, in this case, will be a clone of your fork.
39-
The clone allows you to work on Git repositories offline, and using more powerful native software/tools.
40-
41-
Here is the workflow for making major edits to existing documentation:
42-
43-
1. [Create a fork](https://help.github.com/articles/fork-a-repo/) of the [PowerShell-Docs](https://github.com/PowerShell/PowerShell-Docs) repository.
44-
2. [Create a clone of your fork](https://help.github.com/articles/cloning-a-repository/) on your local computer.
45-
3. Create a new local branch in your cloned repository.
46-
4. Make changes to the file(s) you want to update in a Markdown editor.
47-
See below for commonly used Markdown editors.
48-
5. [Push your local branch](https://help.github.com/articles/pushing-to-a-remote/) to your fork.
49-
6. [Create a pull request](https://help.github.com/articles/creating-a-pull-request/) to the *staging* branch of the [PowerShell-Docs](https://github.com/PowerShell/PowerShell-Docs) repository.
50-
51-
## Creating new topics
52-
53-
If you want to contribute new documentation, first check for [issues tagged as "in progress"](https://github.com/PowerShell/PowerShell-Docs/labels/in%20progress) to make sure you're not duplicating efforts.
54-
If no one seems to be working on what you have planned:
55-
56-
* Open a new issue and label it as "in progress" (if you are a member of the PowerShell organization) or add "in progress" as a comment to tell others what you're working on
57-
* Follow the same workflow as described above for making major edits to existing topics.
58-
* Edit the `TOC.md` topic (located in the top-level folder for each documentation set) to add your new topics to the table of contents.
59-
Determine where your new topic belongs in the table of contents, and add a heading of the appropriate level, with a link to your topic (`[My topic title](relative path to my topic)`).
60-
61-
## Markdown editors
62-
63-
Here are some Markdown editors you can try out:
64-
65-
* [Visual Studio Code](https://code.visualstudio.com)
66-
* [Markdown Pad](http://markdownpad.com/)
67-
* [Atom](https://atom.io/)
68-
* [Sublime Text](http://www.sublimetext.com/)
69-
70-
71-
## GitHub Flavored Markdown (GFM)
72-
73-
All of the articles in this repository use [GitHub Flavored Markdown (GFM)](https://help.github.com/articles/github-flavored-markdown/).
74-
75-
Some of the basic GFM syntax includes:
76-
77-
* **Line breaks vs. paragraphs:** In Markdown there is no HTML `<br />` or `<p />` element.
78-
Instead, a new paragraph is designated by an empty line between two blocks of text.
79-
80-
> **Note**: Please add a single newline after each sentence to simplify the command-line output of diffs and history.
81-
This is not currently adopted across all of PowerShell-Docs, but we will be working towards it over time.
82-
Feel free to help out.
83-
84-
* **Italics:** The HTML `<em>some text</em>` element is written as `*some text*`
85-
* **Bold:** The HTML `<strong>some text</strong>` element is written as `**some text**`
86-
* **Headings:** HTML headings are designated using `#` characters at the start of the line.
87-
The number of `#` characters corresponds to the hierarchical level of the heading (for example, `#` = `<h1>` and `###` = ```<h3>```).
88-
* **Numbered lists:** To make a numbered (ordered) list start the line with `1. `.
89-
If you want multiple elements within a single list element, format your list as follows:
90-
```
91-
1. For the first element (like this one), insert a tab stop after the 1.
92-
93-
To include a second element (like this one), insert a line break after the first and align indentations.
94-
```
95-
to get this output:
96-
97-
1. For the first element (like this one), insert a tab stop after the 1.
98-
99-
To include a second element (like this one), insert a line break after the first and align indentations.
100-
101-
* **Bulleted lists:** Bulleted (unordered) lists are almost identical to ordered lists except that the `1. ` is replaced with either `* `, `- `, or `+ `.
102-
Multiple element lists work the same way as with ordered lists.
103-
* **Links:** The syntax for a hyperlink is `[visible link text](link URL)`.
104-
* **Link to another topic within the same docset:** A docset is a top-level folder in this repository
105-
(for example, "dsc", "scripting").
106-
The syntax for a hyperlink to a topic within the same docset is `[topic title](relative path to topic)`.
107-
For more information, see [Relative links in READMEs](https://help.github.com/articles/relative-links-in-readmes/).
108-
To link to a topic in a different top-level folder, use the URL of the published page, as described above.
7+
1. [Get started](./contributing/GETSTARTED.md)
8+
2. [Writing PowerShell documentation](./contributing/WRITING.md)
9+
3. [Style Guide](./contributing/STYLE.md)

STYLE.md

-93
This file was deleted.

contributing/GETSTARTED.md

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
# Contributing to PowerShell Documentation
2+
3+
Thank you for your interest in PowerShell documentation!
4+
See below for details on how you can contribute to our technical documentation.
5+
6+
>For general information about getting started with Git and GitHub, see [GitHub Help][git-help].
7+
8+
## Sign a CLA
9+
10+
Before you can contribute to any PowerShell repositories, you must sign a
11+
[Microsoft Contribution Licensing Agreement (CLA)][cla].
12+
If you've already contributed to PowerShell repositories in the past, congratulations!
13+
You've already completed this step.
14+
15+
## Providing feedback on PowerShell documentation
16+
17+
You can point out errors, suggest changes, or request new topics by [creating an issue][new-issue]
18+
on the [PowerShell-Docs repository issues page][doc-issues].
19+
20+
Issues are reviewed regularly by members of the PowerShell documentation team.
21+
The issues are triaged, assigned, and addressed accordingly.
22+
23+
## Making minor edits to existing topics
24+
25+
To [edit an existing file][edit-file], simply navigate to it and click the "Edit" button.
26+
GitHub will automatically create your own fork of our repository where you can make your changes.
27+
Once you're finished, save your edits and submit a [pull request][pull] to the *staging* branch
28+
of the [PowerShell-Docs][docs-repo] repository.
29+
After your pull request is created, someone on the PowerShell documentation team reviews your changes
30+
before merging them into the *staging* branch.
31+
32+
## Making major edits to existing topics
33+
34+
If you are making substantial changes to an existing article, adding or changing images,
35+
or contributing a new article, you will need to manually create your GitHub fork,
36+
then clone the fork down to your local computer.
37+
A fork is a GitHub-based replica of the main repository, under your GitHub account,
38+
that provides you with a working copy which you can use in isolation.
39+
You will create pull requests from your fork.
40+
Similarly, a clone is a local-based replica of the repository which, in this case, will be a clone of your fork.
41+
The clone allows you to work on Git repositories offline, and using more powerful native software/tools.
42+
43+
Here is the workflow for making major edits to existing documentation:
44+
45+
1. [Create a fork][fork] of the [PowerShell-Docs][docs-repo] repository.
46+
2. [Create a clone of your fork][clone] on your local computer.
47+
3. Create a new local branch in your cloned repository.
48+
4. Make changes to the file(s) you want to update in a Markdown editor.
49+
5. [Push your local branch][push] to your fork.
50+
6. [Create a pull request][pull] to the *staging* branch of the [PowerShell-Docs][docs-repo] repository.
51+
52+
53+
## Next steps
54+
55+
See [Writing PowerShell documentation](WRITING.md).
56+
57+
<!-- External URLs -->
58+
[git-help]: https://help.github.com/
59+
[cla]: https://cla.microsoft.com/
60+
[new-issue]: https://help.github.com/articles/creating-an-issue/
61+
[doc-issues]: https://github.com/PowerShell/PowerShell-Docs/issues
62+
[edit-file]: https://help.github.com/articles/editing-files-in-another-user-s-repository/
63+
[docs-repo]: https://github.com/PowerShell/PowerShell-Docs
64+
[fork]: https://help.github.com/articles/fork-a-repo/
65+
[clone]: https://help.github.com/articles/cloning-a-repository/
66+
[push]: https://help.github.com/articles/pushing-to-a-remote/
67+
[pull]: https://help.github.com/articles/creating-a-pull-request/

0 commit comments

Comments
 (0)