Skip to content

Commit ed53b4f

Browse files
authored
Merge pull request #64 from apupier/fixTypos
Fix typos
2 parents e0e6ccb + 712f8ae commit ed53b4f

File tree

7 files changed

+40
-40
lines changed

7 files changed

+40
-40
lines changed

docs/ACCESS_TOKENS.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ we know when they expire and if someone leaves the CoMPAS Organization which one
77

88
## Overview Access Tokens
99

10-
Below tokens are al registered under the CoMPAS Organisation as Action Secret.
10+
Below tokens are all registered under the CoMPAS Organisation as Action Secret.
1111

1212
| Token Name | Owner | Expire Date |
1313
|--------------------------|-----------------|-------------|
@@ -16,7 +16,7 @@ Below tokens are al registered under the CoMPAS Organisation as Action Secret.
1616
| ORG_GITHUB_ACTION_SECRET | Pascal Wilbrink | 30/06/2023 |
1717
| SONAR_TOKEN | Pascal Wilbrink | - |
1818

19-
Below tokens are al registered under the CoMPAS Organisation as Dependabot Secret.
19+
Below tokens are all registered under the CoMPAS Organisation as Dependabot Secret.
2020

2121
| Token Name | Owner | Expire Date |
2222
|--------------------------|-----------------|-------------|

docs/DEPENDABOT.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ updates:
4242
```
4343
4444
- (1): This configures the GitHub Maven Repository that Dependabot can use to search for new versions of CoMPAS Dependencies.
45-
- (2): This will check if the newest versions of GitHub Actions are used. Default it will scan the directory ".githuib/workflows"
45+
- (2): This will check if the newest versions of GitHub Actions are used. Default it will scan the directory ".github/workflows"
4646
under the directory defined here (in this case "/").
4747
- (3): This will scan the Maven Plugins and Dependencies defined in the pom.xml files. The GitHub Maven Repository is also
4848
defined here.
@@ -76,7 +76,7 @@ pull request to merge it into the default branch.
7676
7777
## Adding Dependabot Secret DB_GITHUB_PACKAGES
7878
79-
Tot access GitHub Packages a secret DB_GITHUB_PACKAGES needs to be created.
79+
To access GitHub Packages a secret DB_GITHUB_PACKAGES needs to be created.
8080
- First create a new personal access token from https://github.com/settings/tokens. Tokens can only be created as personal tokens.
8181
The token also must have the right "read:packages".
8282
- Next create a new organisation secret from https://github.com/organizations/com-pas/settings/secrets/dependabot with the value of

docs/DEPLOYMENT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
We deploy the (native) Docker image of all CoMPAS services to Docker Hub. This way, it can be pulled and deployed into environments of your choice (OpenShift for example).
33

44
## Quick Deployment instructions (under construction)
5-
The following instructions are terminal instructions for publishing a Quarkus docker image to Docker Hub. This should be done by a Github Action in the future.
5+
The following instructions are terminal instructions for publishing a Quarkus docker image to Docker Hub. This should be done by a GitHub Action in the future.
66

77
```
88
docker login # Creating a Docker session

docs/DEVELOPING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Username should be your GitHub username, password can both be your own [encrypte
8888
or a [Personal Access Token](https://docs.github.com/en/github/authenticating-to-github/keeping-your-account-and-data-secure/creating-a-personal-access-token).
8989

9090
## IDEs
91-
If your IDE is supported by sonarlint (both IntelliJ IDEA and the Eclipse IDE are supported), it is recommended to install it.
91+
If your IDE is supported by SonarLint (both IntelliJ IDEA and the Eclipse IDE are supported), it is recommended to install it.
9292
It provides immediate feedback on most sonar issues. Running tests individually is often possible in IDEs without invoking maven.
9393
Please consult the documentation of your IDE for setting up the project through maven integration.
9494

docs/GITHUB_ACTIONS.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
# Github Actions
2-
Every repository within the CoMPAS Github organization need a default set of Github Actions.
3-
[Github Actions](https://github.com/features/actions) are CI/CD steps within a Github Repository that you can configure. This way, you can ensure that certain steps (like building) are always triggered on for example a commit push.
1+
# GitHub Actions
2+
Every repository within the CoMPAS GitHub organization need a default set of GitHub Actions.
3+
[GitHub Actions](https://github.com/features/actions) are CI/CD steps within a GitHub Repository that you can configure. This way, you can ensure that certain steps (like building) are always triggered on for example a commit push.
44

5-
Within CoMPAS, we define the following 'must have' Github Actions:
5+
Within CoMPAS, we define the following 'must have' GitHub Actions:
66
- [Building](#building)
77
- [REUSE check](#reuse-check)
88
- [SonarCloud](#sonarcloud)
99
- [Docker Hub Deployment](#docker-hub-deployment)
1010

1111
More to follow.
1212

13-
Github Actions are configured using YAML files. These files are stored in the `.github/workflows` directory of a specific repository.
13+
GitHub Actions are configured using YAML files. These files are stored in the `.github/workflows` directory of a specific repository.
1414

1515
## Maven settings.xml during GitHub Action for GitHub Packages
1616
During multiple GitHub Actions (like building and SonarCloud analysis), the custom `settings.xml` file is needed because it needs access to the GitHub Packages
@@ -65,7 +65,7 @@ jobs:
6565

6666
A few points to remember:
6767
- (1): By default, all actions are triggered on a push action.
68-
- (2): This step creates a custom settings.xml for authenticating for Github Packages. For more information,
68+
- (2): This step creates a custom settings.xml for authenticating for GitHub Packages. For more information,
6969
check the [Contributing file](https://github.com/com-pas/contributing/blob/master/CONTRIBUTING.md).
7070
- (3): This is a default for building a Maven project. It may differ in some cases, please feel free to adjust it.
7171

@@ -92,7 +92,7 @@ A few points to remember:
9292
This is the only thing that has to be done. After this, it will be checked on every push.
9393

9494
### REUSE badge
95-
For transparancy, CoMPAS repositories also include a REUSE badge in their README for fast checking the REUSE compliance.
95+
For transparency, CoMPAS repositories also include a REUSE badge in their README for fast checking the REUSE compliance.
9696

9797
Two steps are needed to get a REUSE badge to work:
9898

@@ -110,11 +110,11 @@ After doing all these steps, everything is set up for the REUSE check.
110110
## SonarCloud
111111
For static code analysis, CoMPAS is using [SonarCloud](https://sonarcloud.io/). To configure this, there are several steps that needs to be done.
112112

113-
1. Go to the [CoMPAS Github organization settings](https://github.com/organizations/com-pas/settings/profile), and click on "Installed Github Apps". SonarCloud is listed here already (because we are already using it). Click on the 'configure' button next to it.
113+
1. Go to the [CoMPAS GitHub organization settings](https://github.com/organizations/com-pas/settings/profile), and click on "Installed GitHub Apps". SonarCloud is listed here already (because we are already using it). Click on the 'configure' button next to it.
114114
2. In the "Repository access" section, select the repository you want to add. By default, not every repository is added as an extra check.
115115
3. Create a new project in [SonarCloud](https://sonarcloud.io/projects/create).
116116
4. Select the repository to be analyzed, click Set Up.
117-
5. Choose the Analysis Method "With Github Actions".
117+
5. Choose the Analysis Method "With GitHub Actions".
118118
6. It first tells you to create a SONAR_TOKEN secret in your repo. Go to your repository -> Settings - Secrets -> New repository secret -> Name: SONAR_TOKEN. Value: Copy the value from the SonarCloud website into here. Then save the secret
119119
7. Select Maven as the option that best describes our build and **remember the projectKey**. and create a `sonarcloud_analysis.yml` file in the `.github/workflows` directory containing the following source code running.
120120

@@ -168,7 +168,7 @@ jobs:
168168

169169
A few points to remember:
170170
- (1): By default, all actions are triggered on a push action.
171-
- (2): Creates a custom `settings.xml` having the credentials for the Github Packages.
171+
- (2): Creates a custom `settings.xml` having the credentials for the GitHub Packages.
172172
For more information, check our [Contributing](https://github.com/com-pas/contributing/blob/master/CONTRIBUTING.md).
173173
- (3): Replace the `<insert project key>` with the project key you copied.
174174

@@ -219,10 +219,10 @@ jobs:
219219
```
220220

221221
A few points to remember:
222-
- (1): By default, the docker image is only deployed on release. This way we have a strict deployment flow, and versions always have the same content. For more information about types of releases, check the [Github Actions documentation](https://docs.github.com/en/actions/reference/events-that-trigger-workflows#release).
222+
- (1): By default, the docker image is only deployed on release. This way we have a strict deployment flow, and versions always have the same content. For more information about types of releases, check the [GitHub Actions documentation](https://docs.github.com/en/actions/reference/events-that-trigger-workflows#release).
223223
- (2): Before deploying to Docker Hub, we need to login first. This can be done by executing a GitHub Action. In this example, `DOCKER_HUB_USERNAME` and `DOCKER_HUB_PASSWORD` are used, which are secrets stored at [CoMPAS organization](https://github.com/organizations/com-pas/settings/secrets/actions). For more information about the username and password, ask in the the [Slack channel](https://app.slack.com/client/TLU68MTML).
224224
- (3): Extract the tag name from Git and use that as version to be set with Maven (${{ steps.extract_tagname.outputs.tagname }}).
225-
- (4): Creates a custom `settings.xml` having the credentials for the Github Packages.
225+
- (4): Creates a custom `settings.xml` having the credentials for the GitHub Packages.
226226
For more information, check our [Contributing](https://github.com/com-pas/contributing/blob/master/CONTRIBUTING.md).
227227
- (5): Building and publishing the docker image is build tool / framework specific. By default, CoMPAS services are using Quarkus and Maven. Deploying to Docker Hub is quite easy using Quarkus and maven, it's just a matter of building in combination with setting some properties. In this example, we use the `quarkus-profile` parameter instead of including all the parameters. This way, we can define profile specific properties in our `application.properties` file (For more information about this, check our [Docker Hub Deployment page](./DEPLOYMENT.md)):
228228

docs/HOME.md

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ Use your best judgment, and feel free to propose changes to this document in a p
2020
* [Copyright Guidelines](#definition-of-done)
2121
* [How-to begin](#how-to-begin)
2222
* [Copyright and Licensing](#copyright-and-licensing)
23-
* [Github Project Boards](#github-project-boards)
23+
* [GitHub Project Boards](#github-project-boards)
2424

25-
[Github Pages](#github-pages)
25+
[GitHub Pages](#github-pages)
2626

2727

2828
## Code of Conduct
@@ -36,7 +36,7 @@ Technical Steering Committee [[email protected]](mailto:CoMPAS-tsc@l
3636
By contributing to the CoMPAS project, you accept and agree to the following terms and conditions for your present and future contributions submitted to CoMPAS.
3737

3838
All contributions to this project are licensed under the license stipulated at the corresponding sub-repository.
39-
Except where otherwise explicitely indicated, CoMPAS is an open source project licensed under the [Apache License, version 2.0](http://www.apache.org/licenses/LICENSE-2.0/).
39+
Except where otherwise explicitly indicated, CoMPAS is an open source project licensed under the [Apache License, version 2.0](http://www.apache.org/licenses/LICENSE-2.0/).
4040

4141
The project requires the use of the [Developer Certificate of Origin (DCO)](https://developercertificate.org/).
4242
The DCO is a legally binding statement asserting that you are you have the right to submit your contribution and to license it under the project's applicable license.
@@ -61,15 +61,15 @@ Note that checks will be performed during the integration in order to require th
6161

6262
## Community refinements
6363

64-
Every monday there is a CoMPAS Community Refinement at 10AM CET. The event is available at the CoMPAS mailing list [calendar](https://lists.lfenergy.org/g/CoMPAS/calendar) and can be subscribed to.
64+
Every Monday there is a CoMPAS Community Refinement at 10AM CET. The event is available at the CoMPAS mailing list [calendar](https://lists.lfenergy.org/g/CoMPAS/calendar) and can be subscribed to.
6565

6666
### Prepared topics
6767

68-
Every friday before the refinement meeting on Monday, all topics are published on the #compas channel on our [LFEnergy Slack](https://lfenergy.slack.com/).
68+
Every Friday before the refinement meeting on Monday, all topics are published on the #compas channel on our [LFEnergy Slack](https://lfenergy.slack.com/).
6969

7070
### Add your own topics
7171

72-
Everybody can suggest topics for the refinement. To do this, join the [LFEnergy Slack](https://lfenergy.slack.com/) if not already, and put your topics in the #compas channel. You can just do this by writing a message like "I want to add something to the refinement this monday, namely..." or add a comment to the already prepared topics if available (see [Prepared topics](#prepared-topics)).
72+
Everybody can suggest topics for the refinement. To do this, join the [LFEnergy Slack](https://lfenergy.slack.com/) if not already, and put your topics in the #compas channel. You can just do this by writing a message like "I want to add something to the refinement this Monday, namely..." or add a comment to the already prepared topics if available (see [Prepared topics](#prepared-topics)).
7373

7474
### Reporting Bugs and Suggesting Enhancements
7575

@@ -116,7 +116,7 @@ Continuous integration is set up to run on all branches automatically and will o
116116

117117
Continuous integration is setup automatically on all contributions. However, it's faster to iterate locally to fix problems than waiting for the status checks to finish.
118118
There are many tools that can be used to do the verifications that are enforced by all status checks. The most simple and universal tool is maven, but IDE integrations
119-
can be used to get more immediate feedback. Most of the team uses IntelliJ IDEA, but others IDEs can be used, for exemple the Eclipse IDE.
119+
can be used to get more immediate feedback. Most of the team uses IntelliJ IDEA, but others IDEs can be used, for example the Eclipse IDE.
120120

121121
### Definition of Done
122122

@@ -144,7 +144,7 @@ On the [developing](DEVELOPING.md) page information about tooling can be found.
144144

145145
#### Open Community Calls
146146

147-
It's good to know that every other monday, we are having a so called Open Community Call. Everyone participating in the CoMPAS project can join
147+
It's good to know that every other Monday, we are having a so called Open Community Call. Everyone participating in the CoMPAS project can join
148148
and talk about and ask question about the CoMPAS project.
149149

150150
When the Open Community Calls are taking place, can be found at the [General CoMPAS mailing list calendar](https://lists.lfenergy.org/g/CoMPAS/calendar).
@@ -157,7 +157,7 @@ If you have something to add, please add it to the agenda and notify everyone on
157157

158158
One of the first important things, is to meet the community. Feel free to introduce yourself by joining the channel 'compas' on [LF Energy Slack](https://slack.lfenergy.org/)!
159159

160-
The Slack channel is the first communication platform within the CoMPAS project (besides email and the Github platform), so if you need help for example you can use Slack!
160+
The Slack channel is the first communication platform within the CoMPAS project (besides email and the GitHub platform), so if you need help for example you can use Slack!
161161

162162
#### Documenting
163163
A good (open source) project requires documentation. We have two places for our documentation
@@ -170,33 +170,33 @@ about CoMPAS in general (like roadmap and the community call agendas).
170170
#### Architecture and technologies
171171

172172
For all architecture and technology choices (for example frameworks, build tools, database choices, etcetera),
173-
please check the source code (duh!) and our [CoMPAS Architecture Github Pages](https://com-pas.github.io/compas-architecture/).
173+
please check the source code (duh!) and our [CoMPAS Architecture GitHub Pages](https://com-pas.github.io/compas-architecture/).
174174

175175
### Copyright and Licensing
176176

177177
Copyright and license information is done on per-file basis. We use the specification of [REUSE](https://reuse.software/spec/)
178-
to ensure that copyright information of the project is clear and can be analuzed in an automated fashion.
178+
to ensure that copyright information of the project is clear and can be analyzed in an automated fashion.
179179

180-
Every source code repository within CoMPAS has a Github Action for checking against the REUSE specification.
180+
Every source code repository within CoMPAS has a GitHub Action for checking against the REUSE specification.
181181

182182
For more information, check the [Copyright Guidelines](STYLEGUIDE.md#copyright-guidelines) section.
183183

184-
### Github Project Boards
184+
### GitHub Project Boards
185185

186186
For managing the CoMPAS issues created in all the separate repositories, we use the [Projects Board](https://github.com/orgs/com-pas/projects) of Github.
187187
CoMPAS uses 2 different Project Boards: One for [Pull Requests](https://github.com/orgs/com-pas/projects/2) and one for the [Issues](https://github.com/orgs/com-pas/projects/1).
188188

189189
When creating Pull Requests or Issues, it will automatically create issues or Pull Requests on the Project Boards.
190-
This is done by the Automate Projects Github Action (take a look at the [action from the Data Service](https://github.com/com-pas/compas-core/blob/master/.github/workflows/automate-projects.yml) for example).
191-
Changing the status of Issues / Pull Requests is also handled automatically by the Github Action.
190+
This is done by the Automate Projects GitHub Action (take a look at the [action from the Data Service](https://github.com/com-pas/compas-core/blob/master/.github/workflows/automate-projects.yml) for example).
191+
Changing the status of Issues / Pull Requests is also handled automatically by the GitHub Action.
192192

193193
Issues and Pull Requests can be moved on both the Project Boards and on the boards of the specific repository itself. It synchronizes automatically.
194194

195-
## Github Pages
195+
## GitHub Pages
196196

197-
This site is provided as a [github pages site](https://com-pas.github.io/contributing/).
198-
The content is maintained and edited on [Github](https://github.com/com-pas/contributing) in the directory "docs".
199-
Contributors are only allowed to contribute by editing the content on Github and must do so by presenting their modifications as *pull-request* to the community.
197+
This site is provided as a [GitHub pages site](https://com-pas.github.io/contributing/).
198+
The content is maintained and edited on [GitHub](https://github.com/com-pas/contributing) in the directory "docs".
199+
Contributors are only allowed to contribute by editing the content on GitHub and must do so by presenting their modifications as *pull-request* to the community.
200200
The diagrams on this page are created using [DrawIO](https://github.com/jgraph/drawio-desktop/releases)
201201
and follow [Unified Modeling Language (UML)](https://www.omg.org/spec/UML/).
202202
The drawIO design file is available on this site: [/blob-files/CoMPAS.drawio](blob-files/CoMPAS.drawio).

0 commit comments

Comments
 (0)