Skip to content

Commit

Permalink
Merge pull request #150 from sa-tre/spelling-and-grammar-fixes
Browse files Browse the repository at this point in the history
Standardise component structure
  • Loading branch information
jemrobinson authored Jul 6, 2023
2 parents b1a7c00 + c3c96fb commit 0125f9d
Show file tree
Hide file tree
Showing 9 changed files with 362 additions and 330 deletions.
25 changes: 13 additions & 12 deletions docs/source/contributing/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ We hope that the information provided in this document will make it as easy as p

We welcome contributions to this project via GitHub issues and pull requests.
Please follow these guidelines to make sure your contributions can be easily integrated into the project.
As you start contributing don't forget that your ideas are more important than perfectly formatted contributions :heart:.
As you start contributing, don't forget that your ideas are more important than perfectly formatted contributions :heart:.

If you have any questions that aren't discussed below, please let us know through one of the many ways to [get in touch](contributing-get-in-touch).

Expand Down Expand Up @@ -47,15 +47,15 @@ If you see a part of the specification you don't like, open an issue about it an

:::{important}
We are in a bootstrapping phase to get an initial specification written.
As part of this initial work we will propose a more formal governance model for the specification going forwards.
As part of this initial work, we will propose a more formal governance model for the specification going forwards.

We have chosen to keep all discussion to issues for now, so contributors have a single place to engage in conversation.
Pull requests are used when a specific change is ready to be proposed.
This can be without discussion, however, it is best for substantial or significant changes to be discussed first in an issue.
We have opted to not use GitHub Discussions at this point.

The community can suggest governance changes at any point.
This includes the SATRE team, and any decision must be openly documented in the repo.
This includes the SATRE team, and any decision must be openly documented in the repository.
:::

### Specification Format
Expand All @@ -78,18 +78,19 @@ Issues should be used to discuss ideas, potential changes and to ask questions.
Issue templates have been designed for common issue types to help collect the most important information and present it in a clear, consistent way.
It is possible, however, to open a blank issue if none of the templates are suitable.

While we encourage opening issues, we understand that some may be more comfortable contributing ideas in other ways such as through discussions and notes at SATRE Collaboration Cafés.
While we encourage opening issues, we understand that some may be more comfortable contributing ideas in other ways.
We support other methods of contribution such as discussions and notes taken at SATRE Collaboration Cafés.
The SATRE Team will aim to collate ideas and draft issues that welcome further discussion and attribute those involved in initial discussions.
The SATRE Team will try to capture the ideas as accurately as possible, in good faith, and be guided by the SATRE Community to correct any misconceptions.

When ready, changes will be proposed in pull requests.
Similarly to issues, there is a pull request template.
This template prompts contributors to include important details which helps explain the contribution and makes triage and review easier.
This template prompts contributors to include important details in order to explain the contribution and make triage and review easier.

Pull requests will be used to review changes.
During the review process, the pull request will be used for discussion, to suggest amendments and ultimately accept or reject the change.

We use this process to ensure that as much as possible of the discussion and decision making process can be public.
We use this process to ensure that as much as possible of the discussion and decision-making process can be public.
This is to provide as open and accessible as possible an environment for all contributors to engage in the conversation.

### Consensus Mechanism
Expand All @@ -109,15 +110,15 @@ GitHub also has a helpful page on [getting started with writing and formatting o
You can think of Markdown as a few little symbols around your text that instruct how to render the text.
For example, you could write words in **bold** (`**bold**`), in _italics_ (`_italics_`), or as a [link](https://medium.com/satre) (`[link](https://medium.com/satre)`) to another web page.

Also when writing in Markdown, please [start each new sentence on a new line](https://sembr.org/).
Also, when writing in Markdown, please [start each new sentence on a new line](https://sembr.org/).
Having each sentence on a new line will make no difference to how the text is displayed.
A blank line is needed to start a new paragraph.
However, it makes the source and [diffs produced during the pull request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-comparing-branches-in-pull-requests) review easier to read ✨!

### Linting and auto-formatting

We take advantage of pre-commit and related tools to help maintain consistent formatting within a repo, which improves review efficiency, and readability.
`pre-commit can be installed using pip:
We take advantage of `pre-commit` and related tools to help maintain consistent formatting within a repository, which improves review efficiency, and readability.
`pre-commit` can be installed using pip:

```sh
pip install pre-commit
Expand All @@ -134,7 +135,7 @@ See the [pre-commit](https://pre-commit.com/) documentation for more advanced us

## SATRE Team Contributions

SATRE team members are free to contribute to the repo in the same way as any contributor, following the process above.
SATRE team members are free to contribute to the repository in the same way as any contributor, following the process above.
The SATRE team is also doing ongoing work to identify the key features of this specification.
Some contributions by SATRE team members may represent the output of this work.
Any contribution that represents this work will be explicitly mentioned in the contribution.
Expand All @@ -143,7 +144,7 @@ This work is taking on two main forms:

1. Identifying what features the community feels are important for a TRE via the [features survey](https://dundee.onlinesurveys.ac.uk/satre-tre-operatorsbuilders-survey).
We will synthesise responses from this survey to suggest features here.
1. Evaluating the TREs used in production as part of [the Alan Turing Institute DSH](https://github.com/alan-turing-institute/data-safe-haven), [Microsoft's Azure TRE](https://github.com/microsoft/AzureTRE), and the [TREEHOOSE TRE](https://github.com/HicResearch/TREEHOOSE/tree/v1.0.0-beta1).
1. Evaluating the TREs used in production as part of [the Alan Turing Institute Data Safe Haven](https://github.com/alan-turing-institute/data-safe-haven), [Microsoft's Azure TRE](https://github.com/microsoft/AzureTRE), and the [TREEHOOSE TRE](https://github.com/HicResearch/TREEHOOSE/tree/v1.0.0-beta1).
The SATRE team will make recommendations for features of the specification based on similarities/differences across these three TRE provisions.

(contributing-get-in-touch)=
Expand Down Expand Up @@ -177,7 +178,7 @@ It is best to add each contributor in turn and merge the pull request before add
Otherwise, you can end up with merge conflicts.
Please check the open pull requests first to make sure there aren't any [open requests from the bot](https://github.com/sa-tre/satre-specification/pulls/app%2Fallcontributors) before adding another.

What happens if you accidentally run the bot before the previous run was merged and you got those pesky merge conflicts?
What happens if you accidentally run the bot before the previous run was merged and you get those pesky merge conflicts?
(Don't feel bad, we have all done it! 🙈)
Simply close the pull request and delete the branch (`all-contributors/add-<username>`).
If you are unable to do this for any reason, please let us know by opening an issue, and SATRE team members will be very happy to help!
Expand Down
Loading

0 comments on commit 0125f9d

Please sign in to comment.