uk -> us (#203)

Co-authored-by: Bruce M. Axtens <bugmagnet@outlook.com>
exercism · Aug 26, 2021 · 53632ab · 53632ab
1 parent 879eeb0
commit 53632ab
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 40 deletions.
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -12,7 +12,7 @@ If you see or experience abuse, harassment, discrimination, or feel unsafe or up
 
 We actively monitor for Code of Conduct (CoC) violations and take any reports of violations extremely seriously. We have banned contributors, mentors and users due to violations.
 
-After we receive a report of a CoC violation, we view that person's conversation history on Exercism and related communication channels and attempt to understand whether someone has deliberately broken the CoC, or accidently crossed a line. We generally reach out to the person who has been reported to discuss any concerns we have and warn them that repeated violations will result in a ban. Sometimes we decide that no violation has occurred and that no action is required and sometimes we will also ban people on a first offence. We strive to be fair, but will err on the side of protecting the culture of our community.
+After we receive a report of a CoC violation, we view that person's conversation history on Exercism and related communication channels and attempt to understand whether someone has deliberately broken the CoC, or accidentally crossed a line. We generally reach out to the person who has been reported to discuss any concerns we have and warn them that repeated violations will result in a ban. Sometimes we decide that no violation has occurred and that no action is required and sometimes we will also ban people on a first offense. We strive to be fair, but will err on the side of protecting the culture of our community.
 
 Exercism's leadership reserve the right to take whatever action they feel appropriate with regards to CoC violations.
 
@@ -44,7 +44,7 @@ As someone who is part of this community, you agree that:
 - We have zero tolerance for abuse, harassment, or discrimination.
 - We respect people’s boundaries and identities.
 - We refrain from using language that can be considered offensive or oppressive (systemically or otherwise), eg. sexist, racist, homophobic, transphobic, ableist, classist, etc. - this includes (but is not limited to) various slurs.
-- We avoid using offensive topics as a form of humour.
+- We avoid using offensive topics as a form of humor.
 
 We actively work towards:
 
@@ -72,11 +72,11 @@ If you say something that is found offensive, and you are called out on it, try
 
 - Listen without interruption.
 - Believe what the person is saying & do not attempt to disqualify what they have to say.
-- Ask for tips / help with avoiding making the offence in the future.
-- Apologise and ask forgiveness.
+- Ask for tips / help with avoiding making the offense in the future.
+- Apologize and ask forgiveness.
 
 ## History
 
 This policy was initially adopted from the Front-end London Slack community and has been modified since. A version history can be seen on [GitHub](https://github.com/exercism/website-copy/edit/main/pages/code_of_conduct.md).
 
-_This policy is a "living" document, and subject to refinement and expansion in the future. This policy applies to the Exercism website, the Exercism GitHub organisation, any other Exercism-related communication channels (e.g. Slack, Twitter, email) and any other Exercism entity or event._
+_This policy is a "living" document, and subject to refinement and expansion in the future. This policy applies to the Exercism website, the Exercism GitHub organization, any other Exercism-related communication channels (e.g. Slack, Twitter, email) and any other Exercism entity or event._
diff --git a/building/tooling/analyzers/feedback-guidelines.md b/building/tooling/analyzers/feedback-guidelines.md
@@ -11,7 +11,7 @@ more about the [goal of exercism here](https://github.com/exercism/docs/blob/mas
 
 In the following paragraphs, keywords such as **MUST**, **SHOULD**, **MAY**
 are to be interpreted as in [RFC2119](https://www.ietf.org/rfc/rfc2119.txt);
-given that we recognise the following four output states and their restrictions:
+given that we recognize the following four output states and their restrictions:
 
 - `approve`: **MUST** be an approvable solution, **MAY** be with comment.
 - `disapprove`: **MUST** be with comment
@@ -23,7 +23,7 @@ Per [RFC2119](https://www.ietf.org/rfc/rfc2119.txt), if **MUST** is used, it is
 a guarantee that the rule is always so, and does not need to be guarded for. For
 example, **MUST** be without comment means that the website could crash if an
 analyzer sends a comment anyway. **SHOULD** indicates any consumer of the output
-must still guard against unwanted behaviour.
+must still guard against unwanted behavior.
 
 ### Approvability
 
@@ -43,17 +43,17 @@ In this document, **de facto** is defined as follows:
   position by public acceptance or market forces. Unofficial customs that are
   widely accepted.
 
-In other words, if a nearly all developers (non-hobyists) who write code in a
+In other words, if a nearly all developers (non-hobbyists) who write code in a
 certain language have established certain rules, these rules are a **de facto
-standard** and become idiomatic use. Example: **Ruby** uses 2 space identation.
+standard** and become idiomatic use. Example: **Ruby** uses 2 space indentation.
 
 Some rules are language features, even if they are not documented well. These
 language features are part of "idiomatic rules" and not stylistic choices.
 Example: **Ruby**'s MRI treats variables named `_` differently.
 
 Finally there are rules that are pure preferences, even though they might be
-adopted by large bodies such as organisations and corporations. These rules
-are usually part of _competing_ standards. Exercism does not favour one over
+adopted by large bodies such as organizations and corporations. These rules
+are usually part of _competing_ standards. Exercism does not favor one over
 another. Example: **TypeScript** has a linter `tslint` (or `eslint` + plugin)
 which is maintained by a company that is not Microsoft. It competes with other
 linters such as `xo`. Most of the rules are not language features or idiomatic
@@ -101,21 +101,21 @@ to the official rules.
 > - :speech*balloon: if it's a \_stylistic* preference, **and** there is _one
 >   clear standard_, comment on it. These rules enforce idiomatic code.
 > - :question: If it's a _stylistic_ preference, **and** there is no clear
->   standard, but most to all non-hobyist have adopted the same style, this
+>   standard, but most to all non-hobbyist have adopted the same style, this
 >   might be idiomatic. Comment at your discretion.
 
 #### Examples
 
 - **Ruby** has a language feature where `_` is treated differently,
   - :-1: if a student uses `_` for a variable name, but then uses it.
-- **Ruby** recognises `constants` only if they start with a **C**apital Letter,
+- **Ruby** recognizes `constants` only if they start with a **C**apital Letter,
   - :-1: if a student uses `snake_case` for a `class` name
 - **Ruby** has _de facto_ standards on `cAsInG` and `name-ing`,
   - :speech_balloon: you **SHOULD** guide students that `snake_case` is to be
     expected by most IDEs and highlighting on exercism in code blocks.
 - **JavaScript** IDEs highlight variables which are not used, except for those
   prefixed with an underscore (`_`).
-  - :speech*balloon: note that this behaviour exist so it might help them to use
+  - :speech*balloon: note that this behavior exist so it might help them to use
     a different naming strategy. They might think that prefixing with `*`means `private`, which is not the case in JavaScript.
 - **TypeScript** has a _de facto_ standard lint tool provided by Palantir,
   - :no_bell: If a student does not follow these rules as the lint tool is not

diff --git a/building/tracks/presentation.md b/building/tracks/presentation.md
@@ -1,6 +1,6 @@
 # Presentation
 
-This document decribes how the various exercise and track files are presented to the student, taking into account whether the student is using the CLI or the editor.
+This document describes how the various exercise and track files are presented to the student, taking into account whether the student is using the CLI or the editor.
 
 ## Documentation
 

diff --git a/mentoring/choosing_a_solution.md b/mentoring/choosing_a_solution.md
@@ -17,7 +17,7 @@ The main table shows the exercise, the student and when they requested mentoring
 Hovering on a row gives you lots more detail.
 You can see more about the user: their name, location, and reputation (which is an indicator of whether they are a contributor or mentor themselves) as well as how many times they've been mentored before.
 You'll also see some blurb they've written explaining what they're looking to get out of the track.
-As you start mentoring people, you'll also see whether you've mentored them before, and if you've favourited them.
+As you start mentoring people, you'll also see whether you've mentored them before, and if you've favorited them.
 
 The blurb on the tooltip is a first indicator about whether this student is right for you.
 Do their knowledge gaps match your expertise?
@@ -53,7 +53,7 @@ The UI will look something like this:
    If they failed, clicking on this indicator will open a modal that shows you the specific details of their test run, so you can see what they did wrong.
 
 On the right hand side, you'll see three tabs.
-The overview tab will contain the same information about the user that you saw on the toolip.
+The overview tab will contain the same information about the user that you saw on the tooltip.
 Below that you'll see a comment for the user about what it is that they want to learn from this specific solution.
 (For some older solutions, this might be missing).
 This is a key indicator as to whether this solution is right for you.

diff --git a/using/faqs.md b/using/faqs.md
@@ -10,8 +10,8 @@ When programming, her focus is on automation, workflow optimization, and refacto
 She cares deeply about open source and contributes to several projects outside of Exercism.
 
 In 2016, [Jeremy](https://ihid.info) joined as co-founder, and he is currently Exercism's CEO.
-Jeremy is a social entrepeneur and software developer, passionate about equality and creating opportunity for everyone.
-In addition to Exericsm, he is the co-founder of the [Wellbeing and Teambuilding platform](https://kaido.org), Kaido.
+Jeremy is a social entrepreneur and software developer, passionate about equality and creating opportunity for everyone.
+In addition to Exercism, he is the co-founder of the [Wellbeing and Teambuilding platform](https://kaido.org), Kaido.
 
 In addition to this [leadership team](/team), Exercism has a [small full- and part-time team](/team/staff), and is supported by thousands of wonderful volunteers who have crafted the various language tracks and exercises that made Exercism so popular.
 

diff --git a/using/feedback/README.md b/using/feedback/README.md
@@ -9,7 +9,7 @@ There are three types of feedback you can get on a solution:
 ## What is the difference between Automated Feedback and Mentor Feedback?
 
 Automated feedback is generated immediately when you submit an iteration.
-Our analysis platform looks at your code and tries to find useful actional feedback that you can use to iterate further.
+Our analysis platform looks at your code and tries to find useful actionable feedback that you can use to iterate further.
 
 Mentor feedback is written by our team of volunteer mentors who will look at your solution and make suggestions on to how to improve it.
 Mentors are able to write more targeted feedback and engage in a discussion with you, but you will have to wait for a mentor to respond to you, which can take hours or days depending on the length of the queue.

diff --git a/using/feedback/guide-to-being-mentored.md b/using/feedback/guide-to-being-mentored.md
@@ -23,7 +23,7 @@ Every time you submit a new iteration your mentor will be alerted and they’ll
 Our mentors are volunteers so sometimes it might take a couple of days before they’ll have chance to get back to you, but that’s pretty normal - you can just explore other exercises in the meantime.
 
 Once you’ve improved your solution, either you or your mentor might choose that the conversation has gone far enough.
-Either of you can end the discussion and you’ll be given the chance to rate the mentoring you ve received and leave a testimonial for the mentor if they’ve helped you.
+Either of you can end the discussion and you’ll be given the chance to rate the mentoring you have received and leave a testimonial for the mentor if they’ve helped you.
 If you have a bad experience with a mentor, please tell us when you finish the conversation.
 We don’t vet out mentors and occasionally people do have bad experiences, but by alerting us we can stop it happening again.
 And please remember that it’s always better to walk away from a conversation than getting into an argument.

diff --git a/using/feedback/private.md b/using/feedback/private.md
@@ -8,5 +8,5 @@ If you are using Exercism as part of a Bootcamp or course, this feature allows y
 
 ## Abusing this feature
 
-Please do **not** send our mentors links to your solutions to try and jump the queue, unless they have explictely given you permission to do so.
+Please do **not** send our mentors links to your solutions to try and jump the queue, unless they have explicitly given you permission to do so.
 Doing so is likely to be considered spam, which will annoy the mentors and result in you having a slower response time.
diff --git a/using/legal/code-of-conduct.md b/using/legal/code-of-conduct.md
@@ -12,7 +12,7 @@ If you see or experience abuse, harassment, discrimination, or feel unsafe or up
 
 We actively monitor for Code of Conduct (CoC) violations and take any reports of violations extremely seriously. We have banned contributors, mentors and users due to violations.
 
-After we receive a report of a CoC violation, we view that person's conversation history on Exercism and related communication channels and attempt to understand whether someone has deliberately broken the CoC, or accidently crossed a line. We generally reach out to the person who has been reported to discuss any concerns we have and warn them that repeated violations will result in a ban. Sometimes we decide that no violation has occurred and that no action is required and sometimes we will also ban people on a first offence. We strive to be fair, but will err on the side of protecting the culture of our community.
+After we receive a report of a CoC violation, we view that person's conversation history on Exercism and related communication channels and attempt to understand whether someone has deliberately broken the CoC, or accidentally crossed a line. We generally reach out to the person who has been reported to discuss any concerns we have and warn them that repeated violations will result in a ban. Sometimes we decide that no violation has occurred and that no action is required and sometimes we will also ban people on a first offense. We strive to be fair, but will err on the side of protecting the culture of our community.
 
 Exercism's leadership reserve the right to take whatever action they feel appropriate with regards to CoC violations.
 
@@ -44,7 +44,7 @@ As someone who is part of this community, you agree that:
 - We have zero tolerance for abuse, harassment, or discrimination.
 - We respect people’s boundaries and identities.
 - We refrain from using language that can be considered offensive or oppressive (systemically or otherwise), eg. sexist, racist, homophobic, transphobic, ableist, classist, etc. - this includes (but is not limited to) various slurs.
-- We avoid using offensive topics as a form of humour.
+- We avoid using offensive topics as a form of humor.
 
 We actively work towards:
 
@@ -72,11 +72,11 @@ If you say something that is found offensive, and you are called out on it, try
 
 - Listen without interruption.
 - Believe what the person is saying & do not attempt to disqualify what they have to say.
-- Ask for tips / help with avoiding making the offence in the future.
-- Apologise and ask forgiveness.
+- Ask for tips / help with avoiding making the offense in the future.
+- Apologize and ask forgiveness.
 
 ## History
 
 This policy was initially adopted from the Front-end London Slack community and has been modified since. A version history can be seen on [GitHub](https://github.com/exercism/website-copy/edit/main/pages/code_of_conduct.md).
 
-_This policy is a "living" document, and subject to refinement and expansion in the future. This policy applies to the Exercism website, the Exercism GitHub organisation, any other Exercism-related communication channels (e.g. Slack, Twitter, email) and any other Exercism entity or event._
+_This policy is a "living" document, and subject to refinement and expansion in the future. This policy applies to the Exercism website, the Exercism GitHub organization, any other Exercism-related communication channels (e.g. Slack, Twitter, email) and any other Exercism entity or event._
diff --git a/using/legal/privacy-policy.md b/using/legal/privacy-policy.md
@@ -60,15 +60,15 @@ The GDPR (General Data Protection Regulation) is UK legislation that governs how
 3. **Right of portability:** We can provide you with a copy of your personal data in a machine readable format. Please contact privacy@exercism.io for more information.
 4. **Right to Erasure:** We can remove your personal data from our systems so that you can no longer be personally identified to your solutions. Please contact privacy@exercism.io for more information.
 
-It is important to note that any content you upload to the site (including, but not limited to, solutions to exercises, comments, and mentor feedback) is transferred to us under a non-revokable license and therefore cannot be deleted from the Platform.
+It is important to note that any content you upload to the site (including, but not limited to, solutions to exercises, comments, and mentor feedback) is transferred to us under a non-revocable license and therefore cannot be deleted from the Platform.
 
 ### Cookies
 
 Please refer to our [Cookie Policy](/docs/using/legal/cookie-policy) for details on the cookies we store.
 
 ## How we use the information we've collected
 
-To understand, improve, and develop our Platform and associated services. As detailed in our values, we aim to build a **positive and caring community** to help people **improve their programming skills**. In support of these aims, we may use the data we collect to improve the quality of our Users' learning and feedback. This may include performing data analysis on anonymised datasets.
+To understand, improve, and develop our Platform and associated services. As detailed in our values, we aim to build a **positive and caring community** to help people **improve their programming skills**. In support of these aims, we may use the data we collect to improve the quality of our Users' learning and feedback. This may include performing data analysis on anonymized datasets.
 
 ## Sharing and transferring data