Skip to content

Commit bea24a4

Browse files
authored
Merge branch 'main' into all-contributors/add-zenobioarn
2 parents faa1e0f + 4264227 commit bea24a4

File tree

23 files changed

+145
-52
lines changed

23 files changed

+145
-52
lines changed

.all-contributors.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ This file is required by [All Contributors](https://allcontributors.org/) to wor
1919
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Aysha-py"><img src="https://avatars.githubusercontent.com/u/64032658?v=4?s=100" width="100px;" alt="Aysha Muhammed"/><br /><sub><b>Aysha Muhammed</b></sub></a><br /><a href="https://github.com/OpenTermsArchive/docs/commits?author=Aysha-py" title="Documentation">📖</a> <a href="#promotion-Aysha-py" title="Promotion">📣</a></td>
2020
<td align="center" valign="top" width="14.28%"><a href="https://github.com/margelacool"><img src="https://avatars.githubusercontent.com/u/74462536?v=4?s=100" width="100px;" alt="margelacool "/><br /><sub><b>margelacool </b></sub></a><br /><a href="#ideas-margelacool" title="Ideas, Planning, & Feedback">🤔</a></td>
2121
<td align="center" valign="top" width="14.28%"><a href="https://github.com/zenobioarn"><img src="https://avatars.githubusercontent.com/u/189729038?v=4?s=100" width="100px;" alt="Zenobio de Almeida"/><br /><sub><b>Zenobio de Almeida</b></sub></a><br /><a href="#ideas-zenobioarn" title="Ideas, Planning, & Feedback">🤔</a></td>
22+
<td align="center" valign="top" width="14.28%"><a href="https://kcode.de/"><img src="https://avatars.githubusercontent.com/u/93181?v=4?s=100" width="100px;" alt="Jan Klass"/><br /><sub><b>Jan Klass</b></sub></a><br /><a href="https://github.com/OpenTermsArchive/docs/commits?author=Kissaki" title="Documentation">📖</a></td>
2223
</tr>
2324
</tbody>
2425
</table>

.all-contributorsrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,15 @@
108108
"contributions": [
109109
"ideas"
110110
]
111+
},
112+
{
113+
"login": "Kissaki",
114+
"name": "Jan Klass",
115+
"avatar_url": "https://avatars.githubusercontent.com/u/93181?v=4",
116+
"profile": "https://kcode.de/",
117+
"contributions": [
118+
"doc"
119+
]
111120
}
112121
],
113122
"repoType": "github",

CODE_OF_CONDUCT.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ We as members, contributors, and leaders pledge to make participation in our
66
community a harassment-free experience for everyone, regardless of age, body
77
size, visible or invisible disability, ethnicity, sex characteristics, gender
88
identity and expression, level of experience, education, socio-economic status,
9-
nationality, personal appearance, race, caste, color, religion, or sexual
9+
nationality, personal appearance, race, caste, colour, religion, or sexual
1010
identity and orientation.
1111

1212
We pledge to act and interact in ways that contribute to an open, welcoming,
1313
diverse, inclusive, and healthy community.
1414

1515
## Our Standards
1616

17-
Examples of behavior that contributes to a positive environment for our
17+
Examples of behaviour that contributes to a positive environment for our
1818
community include:
1919

2020
- Demonstrating empathy and kindness toward other people
@@ -25,7 +25,7 @@ community include:
2525
- Focusing on what is best not just for us as individuals, but for the overall
2626
community
2727

28-
Examples of unacceptable behavior include:
28+
Examples of unacceptable behaviour include:
2929

3030
- The use of sexualized language or imagery, and sexual attention or advances of
3131
any kind
@@ -39,8 +39,8 @@ Examples of unacceptable behavior include:
3939
## Enforcement Responsibilities
4040

4141
Community leaders are responsible for clarifying and enforcing our standards of
42-
acceptable behavior and will take appropriate and fair corrective action in
43-
response to any behavior that they deem inappropriate, threatening, offensive,
42+
acceptable behaviour and will take appropriate and fair corrective action in
43+
response to any behaviour that they deem inappropriate, threatening, offensive,
4444
or harmful.
4545

4646
Community leaders have the right and responsibility to remove, edit, or reject
@@ -58,7 +58,7 @@ representative at an online or offline event.
5858

5959
## Enforcement
6060

61-
Instances of abusive, harassing, or otherwise unacceptable behavior may be
61+
Instances of abusive, harassing, or otherwise unacceptable behaviour may be
6262
reported to the community leaders responsible for enforcement at
6363
6464
All complaints will be reviewed and investigated promptly and fairly.
@@ -73,19 +73,19 @@ the consequences for any action they deem in violation of this Code of Conduct:
7373

7474
### 1. Correction
7575

76-
**Community Impact**: Use of inappropriate language or other behavior deemed
76+
**Community Impact**: Use of inappropriate language or other behaviour deemed
7777
unprofessional or unwelcome in the community.
7878

7979
**Consequence**: A private, written warning from community leaders, providing
8080
clarity around the nature of the violation and an explanation of why the
81-
behavior was inappropriate. A public apology may be requested.
81+
behaviour was inappropriate. A public apology may be requested.
8282

8383
### 2. Warning
8484

8585
**Community Impact**: A violation through a single incident or series of
8686
actions.
8787

88-
**Consequence**: A warning with consequences for continued behavior. No
88+
**Consequence**: A warning with consequences for continued behaviour. No
8989
interaction with the people involved, including unsolicited interaction with
9090
those enforcing the Code of Conduct, for a specified period of time. This
9191
includes avoiding interactions in community spaces as well as external channels
@@ -95,7 +95,7 @@ ban.
9595
### 3. Temporary Ban
9696

9797
**Community Impact**: A serious violation of community standards, including
98-
sustained inappropriate behavior.
98+
sustained inappropriate behaviour.
9999

100100
**Consequence**: A temporary ban from any sort of interaction or public
101101
communication with the community for a specified period of time. No public or
@@ -106,7 +106,7 @@ Violating these terms may lead to a permanent ban.
106106
### 4. Permanent Ban
107107

108108
**Community Impact**: Demonstrating a pattern of violation of community
109-
standards, including sustained inappropriate behavior, harassment of an
109+
standards, including sustained inappropriate behaviour, harassment of an
110110
individual, or aggression toward or disparagement of classes of individuals.
111111

112112
**Consequence**: A permanent ban from any sort of public interaction within the

CONTRIBUTING.md

Lines changed: 60 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,71 @@
1-
# Contributing to this repository
1+
# Contributing to the Open Terms Archive documentation
22

3-
## 🚀 How to Contribute
3+
First of all, thanks for taking the time to contribute! 🎉👍
44

5-
- You can check the open issues in this repository, comment to state your interest and solve them.
6-
- You can also open issues to suggest additions or changes to this documentation website.
5+
## Code of Conduct
76

8-
## 📜 Read our Code of Conduct
7+
Before you begin coding and collaborating, please read our [Code of Conduct](./CODE_OF_CONDUCT.md) to understand the standards for interacting in this community. As a participant and contributor to this project, you agree to abide by our Code of Conduct.
98

10-
Before you begin coding and collaborating, please read our [Code of Conduct](./CODE_OF_CONDUCT.md) to understand the standards (that you are required to adhere to) for community engagement. As part of our open-source community, we hold ourselves and other contributors to a high standard of communication. As a participant and contributor to this project, you are agreeing to abide by our Code of Conduct.
9+
## Architecture
1110

12-
## 💻 Need Help?
11+
This documentation follows the [Diátaxis](https://diataxis.fr) approach and structures content in different categories:
1312

14-
We are more than happy to help you. If you are facing problems while working on any issue, don’t hesitate to ask for help.
13+
- **Tutorials:** step-by-step learning guides that help beginners get started with Open Terms Archive, providing foundational knowledge and hands-on experience.
14+
- **How-to guides:** task-focused instructions that help experienced users accomplish specific goals efficiently and effectively.
15+
- **References:** comprehensive technical documentation detailing configuration options and specifications for advanced users.
16+
- **Explanations:** background knowledge that enables understanding the constraints and how choices that are made.
1517

16-
Your contribution, no matter its size, holds immense value. We eagerly await to see the impact you'll make in our community! 🚀
18+
## Copywriting
1719

18-
## List a new contributor in the Open Terms Archive website
20+
- Use [British English spelling](https://en.wikipedia.org/wiki/American_and_British_English_spelling_differences), not American English.
1921

20-
We acknowledge the efforts of our contributors by listing them on our [website](https://opentermsarchive.org) and this is made possible by the use of the [All Contributors bot](https://allcontributors.org/docs/en/bot/overview).
22+
## Modifying content
2123

22-
All Contributors enables adding a contributor with a comment on an issue or pull request, without writing code. To do this, please use the [dedicated issue](https://github.com/OpenTermsArchive/docs/issues/134) on this repository.
24+
Start by identifying the page you would like to add the content to by [navigating the documentation](https://docs.opentermsarchive.org). Once you have found the best location, find the [associated source document](https://github.com/OpenTermsArchive/docs/tree/main/content) and edit it. If there is no existing best location, think of the page where you would like to find it and create that page by clicking “Add file” in the [source folder](https://github.com/OpenTermsArchive/docs/tree/main/content).
25+
26+
## Workflow
27+
28+
### Pull requests
29+
30+
We follow the [GitHub Flow](https://guides.github.com/introduction/flow/): all contributions are submitted via a pull request towards the `main` branch.
31+
32+
Opening a pull request means you want that code to be merged. If you want to only discuss it, send a link to your branch along with your questions through whichever communication channel you prefer.
33+
34+
#### Peer reviews
35+
36+
All pull requests must be reviewed by at least one person who is not their original author.
37+
38+
To help reviewers, make sure to describe your pull request with a **clear text explanation** of your changes.
39+
40+
For pull requests of new contributors, if errors or areas for improvement are identified in their contributions, the Open Terms Archive team can initially handle them. This is intended to speed up the delivery process and help the contributor acclimatise to the project. As they become more involved and learn more, they will be encouraged to take on more responsibility by implementing the changes themselves. The aim is to support growth and confidence in the contribution to the project while promoting quick delivery.
41+
42+
### Continuous delivery
43+
44+
GitHub Actions is used to publish the documentation on every merge to the main branch.
2345

24-
Please read the following [contributing guide](https://github.com/OpenTermsArchive/opentermsarchive.org/blob/main/CONTRIBUTING.md#list-a-new-contributor-in-the-open-terms-archive-website).
46+
Branch protection is active, meaning that a merge to the main branch can only take place once all tests pass in CI, and that the peer review policy has been fulfilled.
47+
48+
### Commit messages
49+
50+
We strive to follow this [recommendation](https://chris.beams.io/posts/git-commit) to write our commit messages, which contains the following rules:
51+
52+
- [Separate subject from body with a blank line](https://chris.beams.io/posts/git-commit/#separate).
53+
- [Limit the subject line to 50 characters](https://chris.beams.io/posts/git-commit/#limit-50).
54+
- [Capitalize the subject line](https://chris.beams.io/posts/git-commit/#capitalize).
55+
- [Do not end the subject line with a period](https://chris.beams.io/posts/git-commit/#end).
56+
- [Use the imperative mood in the subject line](https://chris.beams.io/posts/git-commit/#imperative).
57+
- [Use the body to explain what and why vs. how](https://chris.beams.io/posts/git-commit/#why-not-how).
58+
59+
Except this one:
60+
61+
- ~~[Wrap the body at 72 characters](https://chris.beams.io/posts/git-commit/#wrap-72)~~: As URLs might be used for references in commit messages, the body text is not wrapped to 72 characters to ensure links are clickable in Git user interfaces.
62+
63+
We add these additional rules:
64+
65+
- Do not rely on GitHub issue reference numbers in commit messages, as we have no guarantee the host system and its autolinking will be stable in time. Make sure the context is self-explanatory. If an external reference is given, use its full URL.
66+
67+
## List contributors in the Open Terms Archive website
68+
69+
We acknowledge the efforts of our contributors by listing them on our [website](https://opentermsarchive.org) through [All Contributors](https://allcontributors.org/docs/en/bot/overview).
70+
71+
All Contributors enables adding a contributor with a comment on an issue or pull request, without writing code. To do this, please use the [dedicated issue](https://github.com/OpenTermsArchive/docs/issues/134) on this repository.

content/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ This documentation follows the [Diátaxis](https://diataxis.fr) approach and str
2929

3030
### Table of contents
3131

32-
- **Analysis:** guidance on how to analyze terms changes, from navigating through the history of tracked terms to publishing memos about significant changes.
32+
- **Analysis:** guidance on how to analyse terms changes, from navigating through the history of tracked terms to publishing memos about significant changes.
3333
- **Community:** information on how to participate in the Open Terms Archive community.
3434
- **Terms:** guidance on tracking and maintaining terms declarations.
3535
- **Collections:** guidance on creating and managing collections of tracked terms.

content/analysis/how-to/navigate-history.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ For this guide, we will use the example of the Demo collection. The terms of thi
4040

4141
![One GitHub Privacy Policy change with source diff view](/images/navigate-history/source-diff.png)
4242

43-
- You can choose from two types of display with the icons in the grey bar above the document. The first one (which is also the default one), named _source diff_ displays the previous version and the next one either [side by side](https://github.com/OpenTermsArchive/demo-versions/commit/e9a781797041a6b593967ba9e7bb2c7404390e76?diff=split) or in a [consolidated way (with one line under the other)](https://github.com/OpenTermsArchive/demo-versions/commit/e9a781797041a6b593967ba9e7bb2c7404390e76?diff=unified). The second one, named _rich diff_ displays all the changes [in a single document](https://github.com/OpenTermsArchive/demo-versions/commit/e9a781797041a6b593967ba9e7bb2c7404390e76?short_path=060f2c2#diff-060f2c2cc43c2415e0d388f0061c37472277e76eafc9c0df269713b150a52909). In this view, beyond green and red, the yellow color shows modified paragraphs. Be careful, this display does not show some changes such as hyperlinks and text style's changes:
43+
- You can choose from two types of display with the icons in the grey bar above the document. The first one (which is also the default one), named _source diff_ displays the previous version and the next one either [side by side](https://github.com/OpenTermsArchive/demo-versions/commit/e9a781797041a6b593967ba9e7bb2c7404390e76?diff=split) or in a [consolidated way (with one line under the other)](https://github.com/OpenTermsArchive/demo-versions/commit/e9a781797041a6b593967ba9e7bb2c7404390e76?diff=unified). The second one, named _rich diff_ displays all the changes [in a single document](https://github.com/OpenTermsArchive/demo-versions/commit/e9a781797041a6b593967ba9e7bb2c7404390e76?short_path=060f2c2#diff-060f2c2cc43c2415e0d388f0061c37472277e76eafc9c0df269713b150a52909). In this view, beyond green and red, the yellow colour shows modified paragraphs. Be careful, this display does not show some changes such as hyperlinks and text style's changes:
4444

4545
![One GitHub Privacy Policy change with rich diff view](/images/navigate-history/rich-diff.png)
4646

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
title: Explanations
3+
weight: 4
4+
---
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
title: Reporting
3+
weight: 1
4+
---
5+
6+
# Reporting
7+
8+
Once services are declared in a collection and this collection starts tracking these terms, it becomes crucial to monitor whether the tracking is functioning properly. It is important to know if there are any terms whose tracking has been interrupted or has failed.
9+
10+
## How the reporting system works
11+
12+
To address this need, the Open Terms Archive engine implements an automated reporting system that creates issues in the declarations repository. This system helps maintainers stay informed about which terms are not being tracked and why.
13+
14+
When tracking is interrupted for a specific term, the system opens an issue that explains why the term is not being tracked and associates labels to categorize the cause of the tracking interruption. The system automatically closes issues when tracking resumes after declarations are fixed and deployed.
15+
16+
## Understanding labels
17+
18+
The reporting system uses labels to categorize issues and indicate what action is needed.
19+
20+
### Auto-managed labels
21+
22+
All labels that are marked with `- Auto-managed by OTA engine` visible in their description on hover are automatically managed by the engine.
23+
24+
**These labels should not be manually added to issues, modified or removed from them, nor should their descriptions or colors be edited by maintainers.**
25+
26+
The engine will automatically manage these labels as needed.
27+
28+
### Issues requiring intervention
29+
30+
The label `⚠ needs intervention` indicates that manual contributor intervention is required to restore tracking. When this label appears on an issue, it means the problem won't be resolved automatically and requires human action to fix the declarations or configuration.
31+
32+
Issues without this label represent tracking interruptions that need investigation to determine the appropriate course of action. These issues may resolve themselves automatically once the underlying problem (such as a temporary network outage or service downtime) is fixed. However, some may not be fixable at all, for example when the tracking engine is detected and blocked as a bot by the target service.

content/collections/how-to/create-repositories.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Before starting, ensure you have:
2424
### Create from template
2525

2626
1. Go to the [`demo-declarations`](https://github.com/OpenTermsArchive/demo-declarations) repository
27-
2. Click "Use this template" dropdown and select "Create a new repository"
27+
2. Click the "Use this template" drop-down menu and select "Create a new repository"
2828
3. Name it `<collection_id>-declarations` (e.g. `pga-declarations`)
2929
4. Wait 1-2 minutes for automatic setup to complete (check `first-time-setup` action status)
3030

content/collections/how-to/terminate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ weight: 4
55

66
# How to terminate a collection
77

8-
If you don't have the resources to maintain a collection anymore, follow these steps to properly terminate it. This will make it clear to users and potential successors that it is no longer actively maintained and can be taken over.
8+
If you don't have the resources to maintain a collection any more, follow these steps to properly terminate it. This will make it clear to users and potential successors that it is no longer actively maintained and can be taken over.
99

1010
## Steps
1111

0 commit comments

Comments
 (0)