Skip to content

Commit 9d79758

Browse files
committed
Improve overall template wording
Backport various wording improvements made throughout various other repos
1 parent 2136600 commit 9d79758

11 files changed

+85
-110
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

+8-4
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ A clear and concise description of what the bug is.
1414

1515
Steps to reproduce the behavior:
1616

17-
1. Deploy this project using ...
18-
2. View output/logs/configuration on ...
17+
1. Deploy this project using [...]
18+
2. View output/logs/configuration on [...]
1919
3. See error
2020

2121
### Expected behavior
@@ -24,10 +24,14 @@ A clear and concise description of what you expected to happen.
2424

2525
### Your environment
2626

27-
- Version/release of this project or specific commit
28-
<!-- - Version/release of any relevant project languages -->
27+
- Version of this project or specific commit
28+
<!-- - Version of any relevant project languages -->
2929
- Target deployment platform
3030

3131
### Additional context
3232

3333
Add any other context about the problem here.
34+
35+
### Sensitive Information
36+
37+
Remember to redact any sensitive information such as authentication credentials or license keys.

.github/ISSUE_TEMPLATE/feature_request.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ assignees: ""
88

99
### Is your feature request related to a problem? Please describe
1010

11-
A clear and concise description of what the problem is. Ex. I'm always frustrated when ...
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
1212

1313
### Describe the solution you'd like
1414

.github/pull_request_template.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
### Proposed changes
22

3-
Describe the use case and detail of the change. If this PR addresses an issue on GitHub, make sure to include a link to that issue using one of the [supported keywords](https://docs.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue) here in this description (not in the title of the PR).
3+
Describe the use case and detail of the change. If this PR addresses an issue on GitHub, make sure to include a link to that issue using one of the [supported keywords](https://docs.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue) in this PR's description or commit message.
44

55
### Checklist
66

7-
Before creating a PR, run through this checklist and mark each as complete.
7+
Before creating a PR, run through this checklist and mark each as complete:
88

9-
- [ ] I have read the [`CONTRIBUTING`](https://github.com/{{REPOSITORY_OWNER}}/{{REPOSITORY_URL}}/blob/main/CONTRIBUTING.md) document
10-
- [ ] If applicable, I have added tests that prove my fix is effective or that my feature works
11-
- [ ] If applicable, I have checked that any relevant tests pass after adding my changes
12-
- [ ] I have updated any relevant documentation ([`README.md`](https://github.com/{{REPOSITORY_OWNER}}/{{REPOSITORY_URL}}/blob/main/README.md) and [`CHANGELOG.md`](https://github.com/{{REPOSITORY_OWNER}}/{{REPOSITORY_URL}}/blob/main/CHANGELOG.md))
9+
- [ ] I have read the [contributing guidelines](/CONTRIBUTING.md).
10+
- [ ] If applicable, I have added tests that prove my fix is effective or that my feature works.
11+
- [ ] If applicable, I have checked that any relevant tests pass after adding my changes.
12+
- [ ] I have updated any relevant documentation ([`README.md`](/README.md) and [`CHANGELOG.md`](/CHANGELOG.md)).

.github/workflows/ossf_scorecard.yml

+17-24
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,32 @@
1-
# This workflow uses actions that are not certified by GitHub. They are provided
2-
# by a third-party and are governed by separate terms of service, privacy
3-
# policy, and support documentation.
1+
---
2+
# This workflow uses actions that are not certified by GitHub. They are provided by a third-party and are governed by separate terms of service, privacy policy, and support documentation.
43
name: OSSF Scorecard
54
on:
6-
# For Branch-Protection check. Only the default branch is supported. See
7-
# https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
5+
# For Branch-Protection check. Only the default branch is supported. See https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection.
86
branch_protection_rule:
9-
# To guarantee Maintained check is occasionally updated. See
10-
# https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
7+
# To guarantee Maintained check is occasionally updated. See https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained.
118
schedule:
129
- cron: "0 0 * * 1"
1310
push:
1411
branches: [main, master]
12+
workflow_dispatch:
1513
# Declare default permissions as read only.
1614
permissions: read-all
1715
jobs:
1816
analysis:
1917
name: Scorecard analysis
2018
runs-on: ubuntu-22.04
2119
permissions:
22-
# Needed if using Code scanning alerts
20+
# Needed if using Code Scanning alerts.
2321
security-events: write
24-
# Needed for GitHub OIDC token if publish_results is true
22+
# Needed for GitHub OIDC token if publish_results is true.
2523
id-token: write
26-
# Uncomment the permissions below if installing in a private repository.
27-
# contents: read
28-
# actions: read
29-
# issues: read # To allow GraphQL ListCommits to work
30-
# pull-requests: read # To allow GraphQL ListCommits to work
31-
# checks: read # To detect SAST tools
24+
# Delete the permissions below if you are using the OSSF Scorecard on a public repository.
25+
contents: read
26+
actions: read
27+
issues: read # To allow GraphQL ListCommits to work
28+
pull-requests: read # To allow GraphQL ListCommits to work
29+
checks: read # To detect SAST tools
3230
steps:
3331
- name: Check out the codebase
3432
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
@@ -40,20 +38,15 @@ jobs:
4038
with:
4139
results_file: results.sarif
4240
results_format: sarif
43-
# (Optional) fine-grained personal access token. Uncomment the `repo_token` line below if:
44-
# - you want to enable the Branch-Protection check on a *public* repository, or
45-
# - you are installing Scorecard on a *private* repository
41+
# (Optional) fine-grained personal access token. Uncomment the `repo_token` line below if you want to enable the Branch-Protection or Webhooks check on a *private* repository.
4642
# To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-fine-grained-pat-optional.
4743
# repo_token: ${{ secrets.SCORECARD_TOKEN }}
4844

49-
# Publish the results for public repositories to enable scorecard badges. For more details, see
50-
# https://github.com/ossf/scorecard-action#publishing-results.
51-
# For private repositories, `publish_results` will automatically be set to `false`, regardless
52-
# of the value entered here.
45+
# Publish the results for public repositories to enable scorecard badges. For more details, see https://github.com/ossf/scorecard-action#publishing-results.
46+
# For private repositories, `publish_results` will automatically be set to `false`, regardless of the value entered here.
5347
publish_results: true
5448

55-
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
56-
# format to the repository Actions tab.
49+
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF format to the repository Actions tab.
5750
- name: Upload artifact
5851
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
5952
with:

.github/workflows/scripts/rename_project.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ do
2727
echo "Renamed $filename"
2828
done
2929

30-
# This command runs only once on GHA!
30+
# This command runs only once on GitHub Actions!
3131
rm -f .github/workflows/rename_template.yml
3232
rm -rf .github/workflows/scripts

CODE_OF_CONDUCT.md

+10-11
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,19 @@ We pledge to act and interact in ways that contribute to an open, welcoming, div
1010

1111
Examples of behavior that contributes to a positive environment for our community include:
1212

13-
- Demonstrating empathy and kindness toward other people
14-
- Being respectful of differing opinions, viewpoints, and experiences
15-
- Giving and gracefully accepting constructive feedback
16-
- Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
17-
- Focusing on what is best not just for us as individuals, but for the overall community
13+
- Demonstrating empathy and kindness toward other people.
14+
- Being respectful of differing opinions, viewpoints, and experiences.
15+
- Giving and gracefully accepting constructive feedback.
16+
- Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience.
17+
- Focusing on what is best not just for us as individuals, but for the overall community.
1818

1919
Examples of unacceptable behavior include:
2020

21-
- The use of sexualized language or imagery, and sexual attention or advances of
22-
any kind
23-
- Trolling, insulting or derogatory comments, and personal or political attacks
24-
- Public or private harassment
25-
- Publishing others' private information, such as a physical or email address, without their explicit permission
26-
- Other conduct which could reasonably be considered inappropriate in a professional setting
21+
- The use of sexualized language or imagery, and sexual attention or advances of any kind.
22+
- Trolling, insulting or derogatory comments, and personal or political attacks.
23+
- Public or private harassment.
24+
- Publishing others' private information, such as a physical or email address, without their explicit permission.
25+
- Other conduct which could reasonably be considered inappropriate in a professional setting.
2726

2827
## Enforcement Responsibilities
2928

CONTRIBUTING.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,30 @@ The following is a set of guidelines for contributing to this project. We really
1010

1111
[Code Guidelines](#code-guidelines)
1212

13-
[Code of Conduct](https://github.com/{{REPOSITORY_OWNER}}/{{REPOSITORY_URL}}/blob/main/CODE_OF_CONDUCT.md)
13+
[Code of Conduct](/CODE_OF_CONDUCT.md)
1414

1515
## Getting Started
1616

17-
Follow our [Getting Started Guide](https://github.com/{{REPOSITORY_OWNER}}/{{REPOSITORY_URL}}/blob/main/README.md#Getting-Started) to get this project up and running.
17+
Follow the instructions on the README's [Getting Started](/README.md#Getting-Started) section to get this project up and running.
1818

1919
<!-- ### Project Structure (OPTIONAL) -->
2020

2121
## Contributing
2222

2323
### Report a Bug
2424

25-
To report a bug, open an issue on GitHub with the label `bug` using the available bug report issue template. Please ensure the bug has not already been reported. **If the bug is a potential security vulnerability, please report it using our [security policy](https://github.com/{{REPOSITORY_OWNER}}/{{REPOSITORY_URL}}/blob/main/SECURITY.md).**
25+
To report a bug, open an issue on GitHub with the label `bug` using the available bug report issue template. Please ensure the bug has not already been reported. **If the bug is a potential security vulnerability, please report it using our [security policy](/SECURITY.md).**
2626

2727
### Suggest a Feature or Enhancement
2828

29-
To suggest a feature or enhancement, please create an issue on GitHub with the label `enhancement` using the available [feature request template](https://github.com/{{REPOSITORY_OWNER}}/{{REPOSITORY_URL}}/blob/main/.github/feature_request_template.md). Please ensure the feature or enhancement has not already been suggested.
29+
To suggest a feature or enhancement, please create an issue on GitHub with the label `enhancement` using the available [feature request template](/.github/feature_request_template.md). Please ensure the feature or enhancement has not already been suggested.
3030

31-
### Open a Pull Request
31+
### Open a Pull Request (PR)
3232

33-
- Fork the repo, create a branch, implement your changes, add any relevant tests, submit a PR when your changes are **tested** and ready for review.
34-
- Fill in [our pull request template](https://github.com/{{REPOSITORY_OWNER}}/{{REPOSITORY_URL}}/blob/main/.github/pull_request_template.md).
33+
- Fork the repo, create a branch, implement your changes, add any relevant tests, and submit a PR when your changes are **tested** and ready for review.
34+
- Fill in the [PR template](/.github/pull_request_template.md).
3535

36-
Note: if you'd like to implement a new feature, please consider creating a [feature request issue](https://github.com/{{REPOSITORY_OWNER}}/{{REPOSITORY_URL}}/blob/main/.github/feature_request_template.md) first to start a discussion about the feature.
36+
**Note:** If you'd like to implement a new feature, please consider creating a [feature request issue](/.github/feature_request_template.md) first to start a discussion about the feature.
3737

3838
## Code Guidelines
3939

@@ -42,8 +42,8 @@ Note: if you'd like to implement a new feature, please consider creating a [feat
4242
### Git Guidelines
4343

4444
- Keep a clean, concise and meaningful git commit history on your branch (within reason), rebasing locally and squashing before submitting a PR.
45-
- If possible and/or relevant, use the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) format when writing a commit message, so that changelogs can be automatically generated
46-
- Follow the guidelines of writing a good commit message as described here <https://chris.beams.io/posts/git-commit/> and summarised in the next few points:
45+
- If possible and/or relevant, use the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) format when writing a commit message, so that changelogs can be automatically generated.
46+
- Follow the guidelines of writing a good commit message as described here <https://chris.beams.io/posts/git-commit/> and summarized in the next few points:
4747
- In the subject line, use the present tense ("Add feature" not "Added feature").
4848
- In the subject line, use the imperative mood ("Move cursor to..." not "Moves cursor to...").
4949
- Limit the subject line to 72 characters or less.

LICENSE

-25
Original file line numberDiff line numberDiff line change
@@ -174,28 +174,3 @@
174174
of your accepting any such warranty or additional liability.
175175

176176
END OF TERMS AND CONDITIONS
177-
178-
APPENDIX: How to apply the Apache License to your work.
179-
180-
To apply the Apache License to your work, attach the following
181-
boilerplate notice, with the fields enclosed by brackets "[]"
182-
replaced with your own identifying information. (Don't include
183-
the brackets!) The text should be enclosed in the appropriate
184-
comment syntax for the file format. We also recommend that a
185-
file or class name and description of purpose be included on the
186-
same "printed page" as the copyright notice for easier
187-
identification within third-party archives.
188-
189-
Copyright [yyyy] [name of copyright owner]
190-
191-
Licensed under the Apache License, Version 2.0 (the "License");
192-
you may not use this file except in compliance with the License.
193-
You may obtain a copy of the License at
194-
195-
http://www.apache.org/licenses/LICENSE-2.0
196-
197-
Unless required by applicable law or agreed to in writing, software
198-
distributed under the License is distributed on an "AS IS" BASIS,
199-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200-
See the License for the specific language governing permissions and
201-
limitations under the License.

0 commit comments

Comments
 (0)