Skip to content

Commit 662a1bf

Browse files
Merge pull request #560 from InnerSourceCommons/fix-product-spelling
Spell checking and style checking of the English LP content (vale)
2 parents ffb389d + 3a52228 commit 662a1bf

22 files changed

+171
-49
lines changed

.github/vale/Vocab/Base/accept.txt

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
uplevel
2+
upleveled
3+
refactorization
4+
integrations
5+
6+
POs?
7+
Committer's
8+
9+
asciidoctor
10+
asciidoc
11+
Yonik
12+
reviewdog
13+
duplicative

.github/vale/Vocab/Base/reject.txt

Whitespace-only changes.

.github/workflows/vale.yml

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Spelling & Styles
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
paths:
8+
- '**.asciidoc'
9+
- '**.md'
10+
pull_request:
11+
branches:
12+
- main
13+
14+
jobs:
15+
vale:
16+
runs-on: ubuntu-latest
17+
18+
steps:
19+
- uses: actions/checkout@v3
20+
21+
- name: Vale Linting
22+
uses: errata-ai/vale-action@reviewdog
23+
with:
24+
# the folders to run the checks for
25+
files: '["docs/","introduction/", "trusted-committer/", "contributor/", "product-owner/", "project-leader/", "workbook/"]'
26+
# we want to check all files in the folders listed above, but exclude
27+
# a) any files in subfolders (these are translations)
28+
# b) any '-script.asciidoc' files
29+
# c) any '*.vtt' files
30+
vale_flags: '--glob=!{*/*/*,*/*-script.asciidoc,*/*.vtt}'
31+
# one of: added, diff_context, file, nofilter
32+
filter_mode: added
33+
debug: true

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ scripts/node_modules
44
scripts/learningpath
55
scripts/newsite
66
scripts/.env
7-
.vs
7+
.vs
8+
.github/vale

.vale.ini

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
StylesPath = .github/vale
2+
MinAlertLevel = suggestion
3+
4+
Packages = https://github.com/InnerSourceCommons/isc-styles/releases/latest/download/ISC.zip
5+
6+
Vocab = Base
7+
8+
[*]
9+
BasedOnStyles = ISC

contributor/02-becoming-a-contributor-article.asciidoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
== Becoming an InnerSource Contributor
22

3-
InnerSource contributors operate outside of regular team boundaries, they are the links crossing organisational silos. As such, they need to be aware of a few common practices that make this work more effective.
3+
InnerSource contributors operate outside of regular team boundaries, they are the links crossing organizational silos. As such, they need to be aware of a few common practices that make this work more effective.
44

55
=== Sharing Mindset
66

7-
So - you're implementing a new feature for your team's product. You need some functionality to get this feature working. Instead of jumping right into the implementation, slow down for a bit: does this functionality reflect a general issue? Is it something that other teams in your organisation face as well due to the shared business domain? Is this functionality orthogonal to the domain of your project? If any of that applies, then start looking beyond your own team: is there a shared solution that you can use or improve to fit your needs? Should there be one?
7+
So - you're implementing a new feature for your team's product. You need some functionality to get this feature working. Instead of jumping right into the implementation, slow down for a bit: does this functionality reflect a general issue? Is it something that other teams in your organization face as well due to the shared business domain? Is this functionality orthogonal to the domain of your project? If any of that applies, then start looking beyond your own team: is there a shared solution that you can use or improve to fit your needs? Should there be one?
88

99
=== Benefits to sharing solutions
1010

contributor/03-contributor-ethos-article.asciidoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ the software project to which they are contributing.
120120
As a result, the final call on what the contribution must look like is with the
121121
host team. It helps to approach the host team with a humble
122122
mindset, with the assumption that all are collaborating towards the purpose of
123-
the shared organisation. It helps to be open and transparent - not only about
123+
the shared organization. It helps to be open and transparent - not only about
124124
what was implemented and how, but also why the change was needed.
125125

126126
Treat any feedback as a gift: others are trying to improve your solution, saving

contributor/05-benefits-of-contribution-article.asciidoc

+4-4
Original file line numberDiff line numberDiff line change
@@ -82,19 +82,19 @@ drain of energy that central dependencies bring to the table? Many open source
8282
projects are being used by a huge number of players - some of who participate
8383
in their design and development. Encouraging cross team collaboration in InnerSource
8484
projects at the corporate level means that you can drive central
85-
innovation from the edges of your organisation.
85+
innovation from the edges of your organization.
8686

8787
In general it is well understood that projects with a https://en.wikipedia.org/wiki/Bus_factor[bus
8888
factor] of one or two people pose a
89-
risk to the organisation - all the more, when that project turns out to be
89+
risk to the organization - all the more, when that project turns out to be
9090
central to the purpose of the business. InnerSource helps not only with making such
9191
projects transparent, but also provides tools to improve that situation by
9292
putting focus on mentoring and expanding the contributor base.
9393

9494
While cross team collaboration makes assessing individual contributions hard,
95-
it also enables learning and knowledge sharing within the organisation. As a
95+
it also enables learning and knowledge sharing within the organization. As a
9696
result, the impact of individuals will improve. Best practices and positive
97-
innovation will spread more easily across the entire organisation. As a side
97+
innovation will spread more easily across the entire organization. As a side
9898
effect, improvements to the work environment will more easily spread across the
9999
organization - helping retain employees.
100100

contributor/06-conclusion-article.asciidoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ We hope you've enjoyed watching the videos, and/or and reading the articles, and
1414

1515
If you haven't done so already, we would like to invite you to learn more about the other aspects of InnerSource in our InnerSource learning path: http://innersourcecommons.org/learningpath/
1616

17-
We invite you to check out the InnerSource group http://innersourcecommons.org[InnerSource Commons] online - feel free to join the discussion and share your experiences and lessons learnt in your organization.
17+
We invite you to check out the InnerSource group http://innersourcecommons.org[InnerSource Commons] online - feel free to join the discussion and share your experiences and lessons learned in your organization.
1818

1919
Live long and have prosperous projects!

contributor/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
---
22
title: Learning Path - Contributor
33
---
4-
The Contributor section covers what it means to be an InnerSource Contributor, the aspects of behaviour that will make you a successful Contributor, contribution mechanics and the benefits of InnerSource for your team and organization.
4+
The Contributor section covers what it means to be an InnerSource Contributor, the aspects of behavior that will make you a successful Contributor, contribution mechanics and the benefits of InnerSource for your team and organization.

docs/adding-trusted-committers.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
This document describes how to add a new Trusted Committer to the InnerSource Learning Path.
22

3-
1. Share your suggestion for new Trusted Commiter in the [:lock:learning-path-trusted-committers][learning-path-trusted-committers] private _Slack_ channel.
4-
2. If you have some agreeement (or even [lazy consensus](https://community.apache.org/committers/lazyConsensus.html)), then move forward.
3+
1. Share your suggestion for new Trusted Committer in the [:lock:learning-path-trusted-committers][learning-path-trusted-committers] private _Slack_ channel.
4+
2. If you have some agreement (or even [lazy consensus](https://community.apache.org/committers/lazyConsensus.html)), then move forward.
55
3. Create a pull request to the [Trusted Committers] section of the README with the new person.
66
4. Invite the person into the [:lock:learning-path-trusted-committers][learning-path-trusted-committers] _Slack_ channel.
77
5. Add the person to the [@InnerSourceCommons/learning-path] _GitHub_ team.

docs/spell-and-style-checking.md

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# Spell & Style Checking
2+
3+
To check both the spelling and the style of writing, we are using vale.
4+
5+
These checks are performed using the [isc-styles][] definitions that are maintained centrally, so that they can be applied to all projects of the InnerSource Commons.
6+
7+
Note that we have only started using vale recently (May 2023), and have only used it for the Patterns and the Learning Path so far. So some bumps in the road should be expected.
8+
9+
Further note that we are not sure yet which documentation is best to keep here versus keeping it centrally in the [isc-styles][]. So we might consolidate this documentation at a later point.
10+
11+
## Running the checks for the Learning Path content locally
12+
13+
To run the vale checks locally, you need to install:
14+
15+
* [vale](https://vale.sh/docs/vale-cli/installation/)
16+
* asciidoctor - `gem install asciidoctor`
17+
18+
Then synchronize your vale packages (i.e. download the [isc-styles][])
19+
20+
`$ vale sync`
21+
22+
Then run vale on the files that you want to check, e.g.:
23+
24+
`$ vale project-leader`
25+
26+
This will run the checks on all markdown and asciidoc files below the `/project-leader` folder.
27+
28+
Any issues found will be shown in the terminal like this:
29+
30+
```bash
31+
project-leader/outline.md
32+
3:42 error Did you really mean ISC.Spelling
33+
'intersting'?
34+
3:211 error Did you really mean ISC.Spelling
35+
'organisation'?
36+
5:154 error Did you really mean ISC.Spelling
37+
'consollidating'?
38+
```
39+
40+
## Checking new Learning Path content coming in via Pull Requests
41+
42+
This happens automatically, using GitHub Actions and this workflow [vale.yml](.github/workflows/vale.yml).
43+
44+
Output looks like this:
45+
46+
![Example of inline annotation](https://github.com/InnerSourceCommons/InnerSourceLearningPath/assets/163029/8dda3c81-634c-48db-9a2f-3f216b717e97)
47+
48+
Note that this highlighting will only be done for any issues found in lines that were changed in the given Pull Request. The idea here is that a contributor should only have to review style issues in the content that they have added themselves.
49+
50+
If you (e.g. as a maintainer) want to see all potential issues that vale has found in any file that it checked, you should check the "Filtered Findings" in the **reviewdog [vale] report** that is generated automatically for any PR as well.
51+
52+
That report looks like this:
53+
54+
![Example of reviewdog \[vale\] report](https://github.com/InnerSourceCommons/InnerSourceLearningPath/assets/163029/c0a478ea-4f01-4d2b-87a4-9340761221b8)
55+
56+
You should only have to adapt the GitHub Actions workflow in [vale.yml](.github/workflows/vale.yml) when adding entirely new sections to the Learning Path.
57+
58+
## How to add exceptions to the spell checker?
59+
60+
There may be times where the Learning Path wants to use spelling differently from what is defined in [isc-styles][]. (Note that we hope that this will be the exception, as otherwise it won't make sense to maintain the styles centrally).
61+
62+
To do so, add the exceptions that you want to make to [accept.txt](.github/vale/Vocab/Base/accept.txt) or [reject.txt](.github/vale/Vocab/Base/reject.txt)
63+
64+
Note: We need to add a more specific description here about when to add exceptions to `Vocab/Base` in this repo, or when to rather add them to the isc-styles repo. However we have to get more hands-on experience with vale before we can write a more helpful description of this approach.
65+
66+
[isc-styles]: https://github.com/InnerSourceCommons/isc-styles

introduction/07-faq.asciidoc

+7-7
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ It depends! An InnerSource project that encourages small pull requests and has c
1616
=== Why not just open source?
1717
By all means do so if the project makes sense! Some projects are specific to your company or are a competitive advantage, so you'll want to keep those as InnerSource. Some need to iterate more quickly than can be done in the open.
1818

19-
If your organisation isn't familiar with running open source projects, InnerSource can help people learn the skills required with a view to open sourcing in the future.
19+
If your organization isn't familiar with running open source projects, InnerSource can help people learn the skills required with a view to open sourcing in the future.
2020

2121
=== Will this slow us down?
2222
It depends on how far you're going. You'll probably be going a lot further than you think.
@@ -29,19 +29,19 @@ If so then your core team is understaffed. A healthy team is staffed so that the
2929
You can mitigate this by setting expectation, potentially via SLAs. If contributors expect PR reviews within an hour, maybe you will be stuck reviewing PRs all the time, but if you set an SLA of 1 day or 1 week, this won't be the case.
3030

3131
=== How do we convince management this is a good idea?
32-
Figure out what they want and get a https://innersourcecommons.org/stories[working example of InnerSource], preferably within your organisation, that shows them getting it. If your organization's OSPO manages InnerSource projects, reach out to them for support.
32+
Figure out what they want and get a https://innersourcecommons.org/stories[working example of InnerSource], preferably within your organization, that shows them getting it. If your organization's OSPO manages InnerSource projects, reach out to them for support.
3333

3434
=== How do we convince engineers this is a good idea?
35-
InnerSource gives engineers the opportunity to develop their career, both in terms of skills and https://patterns.innersourcecommons.org/p/praise-participants[recognition] within their organisation:
35+
InnerSource gives engineers the opportunity to develop their career, both in terms of skills and https://patterns.innersourcecommons.org/p/praise-participants[recognition] within their organization:
3636

3737
* Broadens their skillset by contributing to different projects, or even different tech stacks!
38-
* Scales the value they add to the organisation, by having their software run by more people
39-
* Opportunity to network and collaborate with others in their organisation that they wouldn't normally
38+
* Scales the value they add to the organization, by having their software run by more people
39+
* Opportunity to network and collaborate with others in their organization that they wouldn't normally
4040

4141
Also, many engineers value open source; InnerSource embraces open source practices, and can be a step towards open source for many projects.
4242

4343
=== What are the expectations on part of both host and contributor?
44-
Work together! This may be completely async via Pull Requests, or involve regular community catchups - whatever works for you.
44+
Work together! This may be completely async via Pull Requests, or involve regular community catch-ups - whatever works for you.
4545

4646
Communication and support must go in both directions and be open and collaborative, fostering a culture of psychological safety. Feedback on contributions, or existing code, must be approached with a growth mindset, and as partnership to make things better.
4747

@@ -56,4 +56,4 @@ You should also set clear contribution guidelines, and be transparent on the dir
5656

5757

5858
=== How do we get people to make contributions?
59-
Your team and wider organisation's culture must value collaboration. Focus on the business value - teams are able to unblock themselves where software they use have bugs or are missing required features. Where contributors have no immediate business need, you can https://patterns.innersourcecommons.org/p/gig-marketplace[advertise] you are looking for help.
59+
Your team and wider organization's culture must value collaboration. Focus on the business value - teams are able to unblock themselves where software they use have bugs or are missing required features. Where contributors have no immediate business need, you can https://patterns.innersourcecommons.org/p/gig-marketplace[advertise] you are looking for help.

project-leader/01-introduction.asciidoc

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Take.
2929
But let us start with a brief example. Imagine you are building a lovely
3030
new music app. In order to understand how your users are interacting
3131
with the app you start collecting some interaction logs. Over time, you
32-
dig deeper when analysing those, feeding your learnings back into
32+
dig deeper when analyzing those, feeding your learnings back into
3333
development. Now, imagine another team bringing content into your
3434
application also has a few needs - they may want to reward content
3535
creators based on how many users they reached. So them, too they start
@@ -41,12 +41,12 @@ Make the changes themselves - with your help. Sure, that may be slower
4141
than if you had made the changes. But it will still be faster than
4242
waiting for you to get around to making the modifications.
4343

44-
In an ideal InnerSource organisation you can scale that up even further:
44+
In an ideal InnerSource organization you can scale that up even further:
4545
Remember the last time you had to make cross cutting concern
4646
modifications across your entire platform? When going the "put it into
4747
the backlog of each team" this often feels like it's dragging on
48-
forever. On the other hand, it speeds things up substantialy to provide
48+
forever. On the other hand, it speeds things up substantially to provide
4949
those teams with a patch that implements the modification. The
5050
complexity of modifications in that approach depends on the maturity of
51-
the organisation and the maintainability/modularity of the code
51+
the organization and the maintainability/modularity of the code
5252
produced.

0 commit comments

Comments
 (0)