Skip to content
This repository was archived by the owner on Feb 24, 2021. It is now read-only.

Commit ea8ee12

Browse files
PlagueHOgaelcolas
authored andcommitted
Clean up Markdown Rule Violations and change Chat Icons - Fixes #512 (#521)
* Clean up Markdown * Change Gitter Icon to Slack * Add Discord Icon * Changes as per PR comments
1 parent 5f4c587 commit ea8ee12

13 files changed

+905
-464
lines changed

.markdownlint.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"default": true,
3+
"MD029": {
4+
"style": "one"
5+
},
6+
"MD013": true,
7+
"MD024": false,
8+
"MD034": false,
9+
"no-hard-tabs": true
10+
}

Automation.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ Some areas and workflows of the DSC Resource Kit are automated, and future
44
automation will cover other areas. This document has both information around
55
present automations, and potential future automations.
66

7+
> Important note: the Waffle Board is being deprecated in favor of using a
8+
> [GitHub Project board](https://github.com/orgs/PowerShell/projects/1).
9+
> The documentation in this document is yet to be updated to reflect this
10+
> new board.
11+
712
## Table of Contents
813

914
- [Labels](#labels)

CONTRIBUTING.md

Lines changed: 385 additions & 185 deletions
Large diffs are not rendered by default.

CommunityAgenda.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,13 @@
88

99
- 08/07/19
1010

11-
All changes for the release should be merged into the `dev` branch before the release date.
12-
Resource modules that are not passing their tests in the release pull request from the `dev` branch to the `master` branch cannot be released.
13-
Resource modules with open issues labeled `blocking release` cannot be released.
14-
Individual resource module hotfixes for urgent issues may be released before the official release date on a case-by-case basis.
11+
All changes for the release should be merged into the `dev` branch before the
12+
release date.
13+
Resource modules that are not passing their tests in the release pull request
14+
from the `dev` branch to the `master` branch cannot be released.
15+
Resource modules with open issues labeled `blocking release` cannot be released.
16+
Individual resource module hotfixes for urgent issues may be released before the
17+
official release date on a case-by-case basis.
1518

1619
### Latest Release
1720

@@ -72,7 +75,8 @@ Individual resource module hotfixes for urgent issues may be released before the
7275
- [05/08/19 12PM-1PM PST](https://github.com/PowerShell/DscResources/blob/master/CommunityCalls/2019-05-08)
7376
- [03/27/19 12PM-1PM PST](https://github.com/PowerShell/DscResources/blob/master/CommunityCalls/2019-03-27)
7477
- [02/13/19 12PM-1PM PST](https://github.com/PowerShell/DscResources/blob/master/CommunityCalls/2019-02-13)
75-
- [01/09/19 12PM-1PM PST](https://github.com/PowerShell/DscResources/blob/master/CommunityCalls/2019-01-09) - [watch here](https://youtu.be/hH2XkR-YZNQ)
78+
- [01/09/19 12PM-1PM PST](https://github.com/PowerShell/DscResources/blob/master/CommunityCalls/2019-01-09)
79+
-- [watch here](https://youtu.be/hH2XkR-YZNQ)
7680
- 11/28/18 12-1PM PST - cancelled due to technical issues
7781
- [10/10/18 12-1PM PST](https://github.com/PowerShell/DscResources/blob/master/CommunityCalls/2018-10-10)
7882
- [08/29/18 12-1PM PST](https://github.com/PowerShell/DscResources/blob/master/CommunityCalls/2018-08-29)

GettingStartedWithGitHub.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,10 @@ to send changes there.
137137

138138
```plaintext
139139
> git remote -v
140-
myhttps://github.com/vors/xActiveDirectory (fetch)
141-
myhttps://github.com/vors/xActiveDirectory (push)
142-
originhttps://github.com/PowerShell/xActiveDirectory (fetch)
143-
originhttps://github.com/PowerShell/xActiveDirectory (push)
140+
my https://github.com/vors/xActiveDirectory (fetch)
141+
my https://github.com/vors/xActiveDirectory (push)
142+
origin https://github.com/PowerShell/xActiveDirectory (fetch)
143+
origin https://github.com/PowerShell/xActiveDirectory (push)
144144
```
145145

146146
Now you have two remote references:
@@ -497,4 +497,5 @@ In a PowerShell prompt, you need to do the following.
497497
git push my changes-from-PR#<number> --force # Change to the PR number, i.e. git push my changes-from-PR#34 --force
498498
```
499499

500-
1. Now, go to you forked repository on GitHub and create the pull request the normal way.
500+
1. Now, go to you forked repository on GitHub and create the pull request the
501+
normal way.

Maintainers.md

Lines changed: 90 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
# DSC Resource Kit Maintainers
22

3-
Maintainers are trusted contributors with knowledge in a resource module domain who have [write access](https://help.github.com/articles/permission-levels-for-an-organization-repository/) to one or more DSC Resource Kit repositories.
3+
Maintainers are trusted contributors with knowledge in a resource module domain
4+
who have [write access](https://help.github.com/articles/permission-levels-for-an-organization-repository/)
5+
to one or more DSC Resource Kit repositories.
46

57
Maintainers have the power to:
68

79
1. `push`.
8-
2. Merge pull requests.
9-
3. Assign labels, milestones and people to [issues](https://guides.github.com/features/issues/).
10+
1. Merge pull requests.
11+
1. Assign labels, milestones and people to [issues](https://guides.github.com/features/issues/).
1012

1113
## Table of Contents
1214

@@ -112,23 +114,33 @@ and Mariah Breakey ([@mbreakey3](https://github.com/mbreakey3)).
112114
If you are maintainer, please follow these rules:
113115

114116
1. **DO** take care of pull requests in a timely manner.
115-
1. **DO** ensure that each contributor has signed a valid Contributor License Agreement (CLA).
116-
1. **DO** reply to new issues and pull requests (after you finish reviewing and everything looks good to you, leave a comment like "Looks good to me" or "LGTM" so we know that someone has looked at it and approved it).
117+
1. **DO** ensure that each contributor has signed a valid Contributor License
118+
Agreement (CLA).
119+
1. **DO** reply to new issues and pull requests (after you finish reviewing and
120+
everything looks good to you, leave a comment like "Looks good to me" or "LGTM"
121+
so we know that someone has looked at it and approved it).
117122
1. **DO** make sure contributors are following the [contributor guidelines](https://github.com/PowerShell/DscResources/blob/master/CONTRIBUTING.md).
118123
1. **DO** ask people to resend a pull request, if it targets [the wrong branch](CONTRIBUTING.md#lifecycle-of-a-pull-request).
119124
1. **DO** require people to write Pester tests for all new/changed functionality.
120-
1. **DO** wait for the [CI system](CONTRIBUTING.md#appveyor) build to pass for pull requests.
121-
1. **DO** encourage contributors to refer to issues in PR title/description (e.g. `Fixes #11`, or `Closes #11`). Edit title if necessary.
122-
1. **DO** encourage contributors to create meaningful titles for all PRs. Edit title if necessary.
125+
1. **DO** wait for the [CI system](CONTRIBUTING.md#appveyor) build to pass for
126+
pull requests.
127+
1. **DO** encourage contributors to refer to issues in PR title/description
128+
(e.g. `Fixes #11`, or `Closes #11`). Edit title if necessary.
129+
1. **DO** encourage contributors to create meaningful titles for all PRs. Edit
130+
title if necessary.
123131
1. **DO** verify that all contributors are following the [style guidelines](https://github.com/PowerShell/DscResources/blob/master/StyleGuidelines.md).
124-
1. **DO** verify compliance with any third party code license terms (e.g., requiring attribution, etc.) if the contribution contains third party code.
132+
1. **DO** verify compliance with any third party code license terms (e.g.,
133+
requiring attribution, etc.) if the contribution contains third party code.
125134

126-
1. **DON'T** merge pull requests where the CLA status check (`license/cla`) is pending or the CLA status check is missing (updated by Microsoft CLA bot).
135+
1. **DON'T** merge pull requests where the CLA status check (`license/cla`) is
136+
pending or the CLA status check is missing (updated by Microsoft CLA bot).
127137
1. **DON'T** merge pull requests to **master** branch.
128138
1. **DON'T** merge pull requests with a failed CI build.
129-
1. **DON'T** merge pull requests that do not [include all meaningful changes](CONTRIBUTING.md#lifecycle-of-a-pull-request) under the **Unreleased** section in the repository's `README.md` or `CHANGELOG.md`.
139+
1. **DON'T** merge pull requests that do not [include all meaningful changes](CONTRIBUTING.md#lifecycle-of-a-pull-request)
140+
under the **Unreleased** section in the repository's `README.md` or `CHANGELOG.md`.
130141
1. **DON'T** merge your own pull requests before they are reviewed by someone else.
131-
- If there is **no one** else to review your pull request, please wait **24** hours to merge it in case anyone comes along and has a comment.
142+
- If there is **no one** else to review your pull request, please wait **24**
143+
hours to merge it in case anyone comes along and has a comment.
132144

133145
## Repeating Tasks
134146

@@ -175,30 +187,51 @@ Copyright (c) Microsoft Corporation. All rights reserved.
175187

176188
#### License File contents
177189

178-
The LICENSE file should appear as shown in [LICENSE](https://github.com/PowerShell/DscResources/blob/master/LICENSE), indentation included.
190+
The LICENSE file should appear as shown in [LICENSE](https://github.com/PowerShell/DscResources/blob/master/LICENSE),
191+
indentation included.
179192

180193
## Issue Workflow
181194

182195
1. Someone creates an issue.
183-
1. A maintainer assigns one of the following labels: ```bug```, ```enhancement```, ```discussion```, ```question```
184-
1. In some cases, other special labels may be used (e.g. ```module proposal``` for issues requesting new DSC resource modules in the DscResources repository)
185-
1. If the issue is a duplicate of another issue, the maintainer adds the ```duplicate``` label, references the issue this one is a duplicate of, and closes the issue.
186-
1. If the issue is external to your module, the maintainer adds the ```external``` label, comments with an explanation of why the issue will not be fixed, and closes the issue.
187-
1. If for some other reason an issue should not be fixed, the maintainer adds the ```not fixed``` label, comments with an explanation of why the issue will not be fixed, and closes the issue.
188-
1. A maintainer assigns the ```help wanted``` label to let contributors know this issue needs someone else to look at it
189-
1. Once a contributor volunteers to work on the issue, the maintainer removes the ```help wanted``` label, adds the ```in progress``` label, and assigns the issue to the volunteer.
190-
1. Once issue is fixed, the maintainer removes the ```in progress``` label and closes the issue.
196+
1. A maintainer assigns one of the following labels: ```bug```, ```enhancement```,
197+
```discussion```, ```question```
198+
1. In some cases, other special labels may be used (e.g. ```module proposal```
199+
for issues requesting new DSC resource modules in the DscResources repository)
200+
1. If the issue is a duplicate of another issue, the maintainer adds the ```duplicate```
201+
label, references the issue this one is a duplicate of, and closes the issue.
202+
1. If the issue is external to your module, the maintainer adds the ```external```
203+
label, comments with an explanation of why the issue will not be fixed, and
204+
closes the issue.
205+
1. If for some other reason an issue should not be fixed, the maintainer adds
206+
the ```not fixed``` label, comments with an explanation of why the issue will
207+
not be fixed, and closes the issue.
208+
1. A maintainer assigns the ```help wanted``` label to let contributors know this
209+
issue needs someone else to look at it
210+
1. Once a contributor volunteers to work on the issue, the maintainer removes the
211+
```help wanted``` label, adds the ```in progress``` label, and assigns the issue
212+
to the volunteer.
213+
1. Once issue is fixed, the maintainer removes the ```in progress``` label and
214+
closes the issue.
191215

192216
## Pull Request Workflow
193217

194218
1. A contributor opens a pull request.
195-
2. The contributor ensures that their pull request passes the [CI system](CONTRIBUTING.md#appveyor) build.
196-
- If the build fails, a maintainer adds the `waiting for code fix` label to the pull request. The contributor can then continue to update the pull request until the build passes.
197-
2. Once the build passes, the maintainer either reviews the pull request immediately or adds the ```needs review``` label.
198-
3. A maintainer or trusted contributor reviews the pull request code.
199-
- If the contributor does not meet the reviewer's standards, the reviewer makes comments. A maintainer then removes the the ```needs review``` label and adds the ```waiting for code fix``` label. The contributor must address the comments and repeat from step 2.
200-
- If the contributor meets the reviewer's standards, the reviewer comments that they are satisfied. A maintainer then removes the the ```needs review``` label.
201-
3. Once the code review is completed, a maintainer merges the pull request.
219+
1. The contributor ensures that their pull request passes the [CI system](CONTRIBUTING.md#appveyor)
220+
build.
221+
- If the build fails, a maintainer adds the `waiting for code fix` label to the
222+
pull request. The contributor can then continue to update the pull request
223+
until the build passes.
224+
1. Once the build passes, the maintainer either reviews the pull request immediately
225+
or adds the ```needs review``` label.
226+
1. A maintainer or trusted contributor reviews the pull request code.
227+
- If the contributor does not meet the reviewer's standards, the reviewer makes
228+
comments. A maintainer then removes the the ```needs review``` label and adds
229+
the ```waiting for code fix``` label. The contributor must address the comments
230+
and repeat from step 2.
231+
- If the contributor meets the reviewer's standards, the reviewer comments
232+
that they are satisfied. A maintainer then removes the the ```needs review```
233+
label.
234+
1. Once the code review is completed, a maintainer merges the pull request.
202235

203236
### Pull Requests waiting for CLA pass
204237

@@ -210,31 +243,49 @@ author should be closed.
210243

211244
### Abandoned Pull Requests
212245

213-
A pull request with the label `waiting for code fix` or `waiting for author response` for **more than 2 weeks** without word from the author is considered abandoned.
246+
A pull request with the label `waiting for code fix` or `waiting for author response`
247+
for **more than 2 weeks** without word from the author is considered abandoned.
214248

215249
In these cases:
216250

217251
1. Ping the author of PR to remind him of pending changes.
218-
- If the contributor responds, it's no longer an abandoned pull request, proceed as normal.
252+
- If the contributor responds, it's no longer an abandoned pull request, proceed
253+
as normal.
219254
1. If the contributor does not respond **within a week**:
220-
- If the reviewer's comments are very minor, merge the change, fix the code immediately, and create a new PR with the fixes addressing the minor comments.
221-
- If the changes required to merge the pull request are significant but needed, create a new branch with the changes and open an issue to merge the code into the dev branch. Mention the original pull request ID in the description of the new issue and close the abandoned pull request.
222-
- If the changes in an abandoned pull request are no longer needed (e.g. due to refactoring of the codebase or a design change), simply close the pull request.
255+
- If the reviewer's comments are very minor, merge the change, fix the code
256+
immediately, and create a new PR with the fixes addressing the minor comments.
257+
- If the changes required to merge the pull request are significant but needed,
258+
create a new branch with the changes and open an issue to merge the code into
259+
the dev branch. Mention the original pull request ID in the description of
260+
the new issue and close the abandoned pull request.
261+
- If the changes in an abandoned pull request are no longer needed (e.g. due
262+
to refactoring of the codebase or a design change), simply close the pull request.
223263

224264
## Breaking Changes
265+
225266
Breaking changes may be accepted if they make a resource better.
226267
Breaking changes usually include:
268+
227269
- Adding a new mandatory parameter
228270
- Changing an existing parameter
229271
- Removing an existing parameter
230272
- Fundamentally changing an existing functionality of a resource
231273

232274
If you need to accept a breaking change in your module please please ensure:
233-
1. Any issues or PRs associated with the breaking change include the ```breaking change``` label.
234-
2. At least one of the bullet points in the updated release notes starts with 'BREAKING CHANGE:'.
235-
3. The title of the PR that includes the breaking change starts with 'BREAKING CHANGE:'.
275+
276+
1. Any issues or PRs associated with the breaking change include the
277+
```breaking change``` label.
278+
1. At least one of the bullet points in the updated release notes starts with
279+
'BREAKING CHANGE:'.
280+
1. The title of the PR that includes the breaking change starts with 'BREAKING CHANGE:'.
236281

237282
Upon release, the version of a module with a breaking change will be updated as such:
238-
* Modules that still have the x... naming are incremented by a full version number if there is a breaking change (2.2.0.0 --> 3.0.0.0). All of these modules are still considered to be in the 'preview' or 'experimental' phase.
239-
* Modules that have the ...Dsc naming but are still in the 'preview' phase (prior to 1.0.0.0) are incremented only by a sub-version regardless of breaking changes until they are ready to come out of preview (0.3.0.0 --> 0.4.0.0).
240-
* Modules that have the ...Dsc naming and are out of the 'preview' phase (1.0.0.0 and after) are incremented by a full version number (2.2.0.0 --> 3.0.0.0).
283+
284+
- Modules that still have the x... naming are incremented by a full version number
285+
if there is a breaking change (2.2.0.0 --> 3.0.0.0). All of these modules are
286+
still considered to be in the 'preview' or 'experimental' phase.
287+
- Modules that have the ...Dsc naming but are still in the 'preview' phase (prior
288+
to 1.0.0.0) are incremented only by a sub-version regardless of breaking changes
289+
until they are ready to come out of preview (0.3.0.0 --> 0.4.0.0).
290+
- Modules that have the ...Dsc naming and are out of the 'preview' phase (1.0.0.0
291+
and after) are incremented by a full version number (2.2.0.0 --> 3.0.0.0).

Naming.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,11 @@ When DSC was originally introduced,
7979
it was communicated that new modules should be prefixed with an "x"
8080
to help identify that the work might not be suitable for use in a production environment.
8181

82-
The community has now matured and guidelines exist to hold project maintainers accountable
83-
through the use of CI process where tests are required and the results are publicly available.
84-
Anyone that would like to evaluate the quality of a module can view the project documentation,
85-
code, tests, and test results, to understand if the work is suitable for their environment.
82+
The community has now matured and guidelines exist to hold project maintainers
83+
accountable through the use of CI process where tests are required and the results
84+
are publicly available. Anyone that would like to evaluate the quality of a module
85+
can view the project documentation, code, tests, and test results, to understand
86+
if the work is suitable for their environment.
8687

8788
The "x" prefix is no longer required.
8889
Resources that include the prefix are free to deprecate the convention going forward.

NewResourceModuleSubmissions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ Prior to listing in DSC Resource repository under [DscResources](https://github.
1515
## First step
1616

1717
When you think your resource module is ready for listing in DSC Resource Kit,
18-
then the first step is to create a new issue using the *New resource module submission* issue
19-
template. It should include all the information needed to make a successful
18+
then the first step is to create a new issue using the *New resource module submission*
19+
issue template. It should include all the information needed to make a successful
2020
resource module submission (including the above information).
2121

2222
>***Note:** You can look at the template to get the information without submitting

0 commit comments

Comments
 (0)