diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 2462c9cc..76c48ec3 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -6,7 +6,7 @@ We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, -nationality, personal appearance, race, caste, color, religion, or sexual +nationality, personal appearance, race, caste, colour, religion, or sexual identity and orientation. We pledge to act and interact in ways that contribute to an open, welcoming, @@ -14,7 +14,7 @@ diverse, inclusive, and healthy community. ## Our Standards -Examples of behavior that contributes to a positive environment for our +Examples of behaviour that contributes to a positive environment for our community include: - Demonstrating empathy and kindness toward other people @@ -25,7 +25,7 @@ community include: - Focusing on what is best not just for us as individuals, but for the overall community -Examples of unacceptable behavior include: +Examples of unacceptable behaviour include: - The use of sexualized language or imagery, and sexual attention or advances of any kind @@ -39,8 +39,8 @@ Examples of unacceptable behavior include: ## Enforcement Responsibilities Community leaders are responsible for clarifying and enforcing our standards of -acceptable behavior and will take appropriate and fair corrective action in -response to any behavior that they deem inappropriate, threatening, offensive, +acceptable behaviour and will take appropriate and fair corrective action in +response to any behaviour that they deem inappropriate, threatening, offensive, or harmful. Community leaders have the right and responsibility to remove, edit, or reject @@ -58,7 +58,7 @@ representative at an online or offline event. ## Enforcement -Instances of abusive, harassing, or otherwise unacceptable behavior may be +Instances of abusive, harassing, or otherwise unacceptable behaviour may be reported to the community leaders responsible for enforcement at `moderators@opentermsarchive.org`. 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: ### 1. Correction -**Community Impact**: Use of inappropriate language or other behavior deemed +**Community Impact**: Use of inappropriate language or other behaviour deemed unprofessional or unwelcome in the community. **Consequence**: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the -behavior was inappropriate. A public apology may be requested. +behaviour was inappropriate. A public apology may be requested. ### 2. Warning **Community Impact**: A violation through a single incident or series of actions. -**Consequence**: A warning with consequences for continued behavior. No +**Consequence**: A warning with consequences for continued behaviour. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels @@ -95,7 +95,7 @@ ban. ### 3. Temporary Ban **Community Impact**: A serious violation of community standards, including -sustained inappropriate behavior. +sustained inappropriate behaviour. **Consequence**: A temporary ban from any sort of interaction or public 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. ### 4. Permanent Ban **Community Impact**: Demonstrating a pattern of violation of community -standards, including sustained inappropriate behavior, harassment of an +standards, including sustained inappropriate behaviour, harassment of an individual, or aggression toward or disparagement of classes of individuals. **Consequence**: A permanent ban from any sort of public interaction within the diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e4fecd62..bc364c26 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,24 +1,71 @@ -# Contributing to this repository +# Contributing to the Open Terms Archive documentation -## 🚀 How to Contribute +First of all, thanks for taking the time to contribute! 🎉👍 -- You can check the open issues in this repository, comment to state your interest and solve them. -- You can also open issues to suggest additions or changes to this documentation website. +## Code of Conduct -## 📜 Read our Code of Conduct +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. -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. +## Architecture -## 💻 Need Help? +This documentation follows the [Diátaxis](https://diataxis.fr) approach and structures content in different categories: -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. +- **Tutorials:** step-by-step learning guides that help beginners get started with Open Terms Archive, providing foundational knowledge and hands-on experience. +- **How-to guides:** task-focused instructions that help experienced users accomplish specific goals efficiently and effectively. +- **References:** comprehensive technical documentation detailing configuration options and specifications for advanced users. +- **Explanations:** background knowledge that enables understanding the constraints and how choices that are made. -Your contribution, no matter its size, holds immense value. We eagerly await to see the impact you'll make in our community! 🚀 +## Copywriting -## List a new contributor in the Open Terms Archive website +- Use [British English spelling](https://en.wikipedia.org/wiki/American_and_British_English_spelling_differences), not American English. -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). +## Modifying content -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. +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). + +## Workflow + +### Pull requests + +We follow the [GitHub Flow](https://guides.github.com/introduction/flow/): all contributions are submitted via a pull request towards the `main` branch. + +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. + +#### Peer reviews + +All pull requests must be reviewed by at least one person who is not their original author. + +To help reviewers, make sure to describe your pull request with a **clear text explanation** of your changes. + +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. + +### Continuous delivery + +GitHub Actions is used to publish the documentation on every merge to the main branch. -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). +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. + +### Commit messages + +We strive to follow this [recommendation](https://chris.beams.io/posts/git-commit) to write our commit messages, which contains the following rules: + +- [Separate subject from body with a blank line](https://chris.beams.io/posts/git-commit/#separate). +- [Limit the subject line to 50 characters](https://chris.beams.io/posts/git-commit/#limit-50). +- [Capitalize the subject line](https://chris.beams.io/posts/git-commit/#capitalize). +- [Do not end the subject line with a period](https://chris.beams.io/posts/git-commit/#end). +- [Use the imperative mood in the subject line](https://chris.beams.io/posts/git-commit/#imperative). +- [Use the body to explain what and why vs. how](https://chris.beams.io/posts/git-commit/#why-not-how). + +Except this one: + +- ~~[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. + +We add these additional rules: + +- 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. + +## List contributors in the Open Terms Archive website + +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). + +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. diff --git a/content/_index.md b/content/_index.md index 59da69c2..1e05a4bc 100644 --- a/content/_index.md +++ b/content/_index.md @@ -29,7 +29,7 @@ This documentation follows the [Diátaxis](https://diataxis.fr) approach and str ### Table of contents -- **Analysis:** guidance on how to analyze terms changes, from navigating through the history of tracked terms to publishing memos about significant changes. +- **Analysis:** guidance on how to analyse terms changes, from navigating through the history of tracked terms to publishing memos about significant changes. - **Community:** information on how to participate in the Open Terms Archive community. - **Terms:** guidance on tracking and maintaining terms declarations. - **Collections:** guidance on creating and managing collections of tracked terms. diff --git a/content/analysis/how-to/navigate-history.md b/content/analysis/how-to/navigate-history.md index 350cb88b..e31e623a 100644 --- a/content/analysis/how-to/navigate-history.md +++ b/content/analysis/how-to/navigate-history.md @@ -40,7 +40,7 @@ For this guide, we will use the example of the Demo collection. The terms of thi ![One GitHub Privacy Policy change with source diff view](/images/navigate-history/source-diff.png) -- 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: +- 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: ![One GitHub Privacy Policy change with rich diff view](/images/navigate-history/rich-diff.png) diff --git a/content/collections/how-to/create-repositories.md b/content/collections/how-to/create-repositories.md index 8884aedd..1daad4cf 100644 --- a/content/collections/how-to/create-repositories.md +++ b/content/collections/how-to/create-repositories.md @@ -24,7 +24,7 @@ Before starting, ensure you have: ### Create from template 1. Go to the [`demo-declarations`](https://github.com/OpenTermsArchive/demo-declarations) repository -2. Click "Use this template" dropdown and select "Create a new repository" +2. Click the "Use this template" drop-down menu and select "Create a new repository" 3. Name it `-declarations` (e.g. `pga-declarations`) 4. Wait 1-2 minutes for automatic setup to complete (check `first-time-setup` action status) diff --git a/content/collections/how-to/terminate.md b/content/collections/how-to/terminate.md index 608e6cda..fe193b1c 100644 --- a/content/collections/how-to/terminate.md +++ b/content/collections/how-to/terminate.md @@ -5,7 +5,7 @@ weight: 4 # How to terminate a collection -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. +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. ## Steps diff --git a/content/collections/reference/roles.md b/content/collections/reference/roles.md index 0aac6725..7b7584d5 100644 --- a/content/collections/reference/roles.md +++ b/content/collections/reference/roles.md @@ -119,7 +119,7 @@ Analyses terms changes to identify significant changes and produce reports in va #### Responsibilities -- Identify and analyze meaningful terms changes +- Identify and analyse meaningful terms changes - Produce insights from changes #### Tasks diff --git a/content/collections/reference/status.md b/content/collections/reference/status.md index 8684e6b3..9ffc1b26 100644 --- a/content/collections/reference/status.md +++ b/content/collections/reference/status.md @@ -31,6 +31,6 @@ Collection may be functional but shows clear signs of neglect. Collection has voluntarily ceased all operational activities. -- No terms are tracked anymore, though historical records remain accessible for reference purposes. +- No terms are tracked any more, though historical records remain accessible for reference purposes. - No technical maintenance is performed. - All [roles]({{< relref "collections/reference/roles" >}}) are inactive. diff --git a/content/community/how-to/join.md b/content/community/how-to/join.md index 5ad18c0d..baa66094 100644 --- a/content/community/how-to/join.md +++ b/content/community/how-to/join.md @@ -15,13 +15,13 @@ The Open Terms Archive community concentrates interactions on an instant chat pl **Use this [invitation link](https://community.opentermsarchive.org/signup_user_complete/?id=fb1tb45hnfnk3c88btjhsjoomc&md=link&sbr=fa) and create an account.** -After successful login, you will be automatically be added to the **~Announcements** channel. +After successful login, you will be automatically be added to the **~Announcements** channel. ## 2. Profile setup -Once you're all set, the next thing is to set up your profile. A complete profile sets you up for meaningful interactions and connections with members interested in tracking the same terms. +The next thing is to set up your profile. A complete profile sets you up for meaningful interactions and connections with members interested in tracking the same terms. -This includes adding your full name, user name, pseudo (nickname), role, and profile picture. +This includes adding your full name, user name, nickname, role, and profile picture. New members can set up their profiles by following these steps: @@ -30,7 +30,7 @@ New members can set up their profiles by following these steps: ## 3. Introduce yourself -After joining the Open Terms Archive chat, members are encouraged to briefly introduce themselves in the **~Introductions** channel. +After joining the Open Terms Archive chat, members are encouraged to introduce themselves in the **~Introductions** channel. ## 4. Find your channels diff --git a/content/deployment/how-to/deploy.md b/content/deployment/how-to/deploy.md index ce2a5878..d862d0e2 100644 --- a/content/deployment/how-to/deploy.md +++ b/content/deployment/how-to/deploy.md @@ -156,7 +156,7 @@ This section uses [Ansible Vault](https://docs.ansible.com/ansible/latest/vault_ ansible-vault encrypt .env ``` - > **Note**: Running the command from the `deployment` folder will ensure that the `vault.key` file is used as vault key, since this folder contains an `ansible.cfg` file that explicitly configures this behavior. + > **Note**: Running the command from the `deployment` folder will ensure that the `vault.key` file is used as vault key, since this folder contains an `ansible.cfg` file that explicitly configures this behaviour. > > To decrypt an encrypted file, use: > diff --git a/content/deployment/reference/architecture.md b/content/deployment/reference/architecture.md index cb52c044..177e6003 100644 --- a/content/deployment/reference/architecture.md +++ b/content/deployment/reference/architecture.md @@ -67,7 +67,7 @@ The engine automatically creates issues in the declarations repository to notify ## Configuration files -The system's behavior is controlled through several key configuration files: +The system's behaviour is controlled through several key configuration files: - `inventory.yml`: Defines server address and deployment parameters - `production.json`: Stores application-specific settings diff --git a/content/deployment/reference/server-specifications.md b/content/deployment/reference/server-specifications.md index ace8b936..53b90b92 100644 --- a/content/deployment/reference/server-specifications.md +++ b/content/deployment/reference/server-specifications.md @@ -15,9 +15,9 @@ Approximately 750 MB of storage is required for the engine itself, with the rem ## Storage -Recommended storage: 10 GB, with resizable partitioning to enable growth over time. +Recommended storage: 10 GB, with resizeable partitioning to enable growth over time. -Storage usage typically grows at a rate of 0.5 MB per tracked terms per month on average for latin scripts. This growth rate varies depending on the type of service being tracked: +Storage usage typically grows at a rate of 0.5 MB per tracked terms per month on average for Latin scripts. This growth rate varies depending on the type of service being tracked: - Services with large legal teams and heavy website layouts: ~1 MB per terms per month - Smaller services: ~0.1-0.3 MB per terms per month diff --git a/content/federation/reference/criteria.md b/content/federation/reference/criteria.md index 15f31ab6..bf4e369b 100644 --- a/content/federation/reference/criteria.md +++ b/content/federation/reference/criteria.md @@ -15,7 +15,7 @@ A **collection** can **join** the Open Terms Archive **federation** if it abides 6. Public and open-licensed **snapshots**, as evidenced by the `LICENSE` file in the snapshots repository. 7. Public and open-licensed **versions**, as evidenced by the `LICENSE` file in the versions repository. 8. Regular, public, and open-licensed **dataset** releases, as evidenced by the `LICENSE` file in the datasets. -9. Publicly accessible API with median response time under 20ms, as evidenced by uptime tracking logs. +9. Publicly accessible API with median response time under 20 ms, as evidenced by uptime tracking logs. 10. Abide by all Open Terms Archive software and data licenses. For detailed instructions on joining the federation, refer to the [How to Join the Federation guide]({{< relref "federation/how-to/join" >}}). diff --git a/content/terms/guideline/choosing-selectors.md b/content/terms/guideline/choosing-selectors.md index 194e45b9..fe0d5949 100644 --- a/content/terms/guideline/choosing-selectors.md +++ b/content/terms/guideline/choosing-selectors.md @@ -15,7 +15,7 @@ Selectors are used in the [`select`]({{< relref "terms/reference#select" >}}) an The “selectors” referred to are defined by the [W3C Selectors standard](https://www.w3.org/TR/selectors/), more commonly known as “CSS Selectors”. -An easy-to-read introduction to CSS Selectors can be found on [mdn web docs](https://developer.mozilla.org/en-US/docs/Learn/CSS/Building_blocks/Selectors). +An easy-to-read introduction to CSS Selectors can be found on [MDN web docs](https://developer.mozilla.org/en-US/docs/Learn/CSS/Building_blocks/Selectors). ## Choosing durable selectors eases maintenance diff --git a/content/terms/guideline/declaring.md b/content/terms/guideline/declaring.md index a1cb0ee7..1c95c623 100644 --- a/content/terms/guideline/declaring.md +++ b/content/terms/guideline/declaring.md @@ -11,14 +11,14 @@ aliases: ### Casing -- In order to find the service name casing, rely first on the page title (easily found in search results). Do not rely on the logo as it can be stylized differently. Example with Facebook: -![facebook search](https://user-images.githubusercontent.com/222463/91416484-baaa3a00-e84f-11ea-94cf-8805d17aa711.png) -- If it is still ambiguous, rely on Wikipedia as a source. However, make sure to differentiate the _service_ from the _provider_ company's name. Example with “DeviantArt”, a service (which used to be stylized deviantArt until 2014) by the limited liability company “deviantArt”: +- In order to find the service name casing, rely first on the page title (easily found in search results). Do not rely on the logo as it can be stylised differently. Example with Facebook: +![Facebook search](https://user-images.githubusercontent.com/222463/91416484-baaa3a00-e84f-11ea-94cf-8805d17aa711.png) +- If it is still ambiguous, rely on Wikipedia as a source. However, make sure to differentiate the _service_ from the _provider_ company's name. Example with “DeviantArt”, a service (which used to be stylised deviantArt until 2014) by the limited liability company “deviantArt”: ![deviantArt search](https://user-images.githubusercontent.com/222463/91416936-5b98f500-e850-11ea-80fe-a50be27356e3.png) ### Terms used by several services -- If you want to add terms which happen to be shared with another service from the same parent company, be specific in naming the exact service you want to track. For instance, you may find that a company like Github uses the same terms for its code hosting and its AI assistant. While this does not mean that the terms for GitHub (code hosting) are the only terms of GitHub Copilot (assistant), it does mean that these two services have terms that are represented in the same document. In tracking terms for one of these services, say Github Copilot, be specific in naming it as the service you want to track. This way, if GitHub was to introduce dedicated terms for each of these services in the future, their locations can be updated without having to create new terms since the service already existed before. +- If you want to add terms which happen to be shared with another service from the same parent company, be specific in naming the exact service you want to track. For instance, you may find that a company like GitHub uses the same terms for its code hosting and its AI assistant. While this does not mean that the terms for GitHub (code hosting) are the only terms of GitHub Copilot (assistant), it does mean that these two services have terms that are represented in the same document. In tracking terms for one of these services, say GitHub Copilot, be specific in naming it as the service you want to track. This way, if GitHub was to introduce dedicated terms for each of these services in the future, their locations can be updated without having to create new terms since the service already existed before. - - - diff --git a/content/terms/guideline/reviewing.md b/content/terms/guideline/reviewing.md index 6a44399f..8148a534 100644 --- a/content/terms/guideline/reviewing.md +++ b/content/terms/guideline/reviewing.md @@ -75,7 +75,7 @@ The pull request created will consist of fewer checks than those that add declar For pull requests that update declarations, you should focus should be on two things: history file and declaration. - **History file:** The history file is a JSON file that keeps track of a service declaration changes. It contains a `validUntil` property that specifies the date a specific version of a service declaration was last effective. You have to confirm that this date is the same as the date in the issue opened for the declaration when the bot couldn't track it for the first time. This issue is usually included in the pull request message. The history file is updated with every `update` pull request. You can find more information about the history file [here]({{< relref "terms/explanation/declarations-maintenance" >}}). -- **Declaration:** for `update` pull requests, you only look at the selectors to make sure they are **simple** and also verify the **generated version** is ok. +- **Declaration:** for `update` pull requests, you only look at the selectors to make sure they are **simple** and also verify the **generated version** is okay. ### Step-by-step Review Guide @@ -102,7 +102,7 @@ Since the Service ID is used as the file name of the JSON file associated with t 1. Open the pull request associated with the contribution and service. 2. Navigate to the "Files changed" tab of the pull request. Here, you will see the files being changed by the contribution, including the JSON file of the service. -3. To edit the file, click on the three dots button on the right side of the file name and select "Edit file". This will open the file in the Github editor. +3. To edit the file, click on the three dots button on the right side of the file name and select "Edit file". This will open the file in the GitHub editor. 4. From here, you can change the file name from the current Service ID to the new Service ID, which represents the transliteration of the service name. 5. Once you have made the changes, commit them and review the pull request as usual. If everything checks out, you can merge the pull request. @@ -129,7 +129,7 @@ Once the pull request has been merged, delete the copy you made of the branch wi When tests fail, you can follow these steps to diagnose and address the issue: -1. Begin by analyzing any error messages or warnings provided by the test output. These messages can often provide meaningful information to identify the source of the problem. Pay attention to specific issues such as schema validation errors, inaccessible web locations or inaccessible content selection. +1. Begin by analysing any error messages or warnings provided by the test output. These messages can often provide meaningful information to identify the source of the problem. Pay attention to specific issues such as schema validation errors, inaccessible web locations or inaccessible content selection. 2. For a deeper investigation, you can access the snapshots and versions generated during the test run. Navigate to the summary page of the failing workflow. Scroll down to the "Artifacts" section located at the bottom of the page. Click on `snapshots_and_versions` to download them. @@ -153,7 +153,7 @@ For example, tests may fail in CI because of a 403 Access Denied error, but succ ## Merging the Pull Request Beyond status checks, additional restriction requires branches to be up to date before merging. This ensures that the contribution has been tested with the latest version of the collection. This appears as a _“This branch is out-of-date with the base branch”_ warning on a pull request. -You can fix this using the Github interface, by clicking on the arrow button next to the “Update Branch” button, and select “Update with Rebase”. +You can fix this using the GitHub interface, by clicking on the arrow button next to the “Update Branch” button, and select “Update with Rebase”. ## Contributions FAQ diff --git a/content/terms/how-to/terminate-a-service.md b/content/terms/how-to/terminate-a-service.md index 91f456a6..cfa740ab 100644 --- a/content/terms/how-to/terminate-a-service.md +++ b/content/terms/how-to/terminate-a-service.md @@ -6,7 +6,7 @@ weight: 6 # How to terminate a service -If the service provider stops offering a service, the associated terms will become unavailable. To mark that service termination in Open Terms Archive and ensure tracking tentatives are stopped, while maintaining the possibility to explore the history: +If the service provider stops offering a service, the associated terms will become unavailable. To mark that service termination in Open Terms Archive and ensure tracking attempts are stopped, while maintaining the possibility to explore the history: 1. Move the existing terms declaration to the service [history file](#terms-declaration-history). 2. Update the declaration to stop tracking all terms, by removing every `` entries from the `terms` key in the declaration: