Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

spelling fixes in documentation #10800

Merged
merged 1 commit into from Sep 6, 2021
Merged

spelling fixes in documentation #10800

merged 1 commit into from Sep 6, 2021

Conversation

dimag0g
Copy link
Contributor

@dimag0g dimag0g commented Jun 15, 2021

No description provided.

haslinghuis
haslinghuis previously approved these changes Jun 15, 2021
Copy link
Member

@haslinghuis haslinghuis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow, this was really bad. Thanks for taking the time to fix this!

docs/Cli.md Outdated
@@ -200,14 +200,14 @@ Click on a variable to jump to the relevant documentation page.
| `imu_dcm_kp` | Inertial Measurement Unit KP Gain | 0 | 20000 | 2500 | Master | UINT16 |
| `imu_dcm_ki` | Inertial Measurement Unit KI Gain | 0 | 20000 | 0 | Master | UINT16 |
| `alt_hold_deadband` | Altitude will be held when throttle is centered with an error margin defined in this parameter. | 1 | 250 | 40 | Profile | UINT8 |
| `alt_hold_fast_change` | Authorise fast altitude changes. Should be disabled when slow changes are prefered, for example for aerial photography. | OFF | ON | ON | Profile | UINT8 |
| `alt_hold_fast_change` | Authorize fast altitude changes. Should be disabled when slow changes are preferred, for example for aerial photography. | OFF | ON | ON | Profile | UINT8 |
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Authorise" is also correct.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Disagree ;-)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll revert this change. If there's no clear improvement in readability, the change is not useful.


Both modes utilise two channels to make an adjustment.
Both modes utilize two channels to make an adjustment.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Utilise" is also correct. In Betaflight we often use the Queen's english

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Disagree again ;-) But the queen is more vivid than the American president 🐰

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both spellings are valid and that's a fact lol. 😄

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True, welcome to Babylonia / Babilonia 🙄

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, I prefer to revert this one, no change is the best change. Oh, and God Save the Queen!

docs/Failsafe.md Outdated
@@ -103,7 +103,7 @@ Configure the RC switched failsafe action. It can be one of:

Time throttle level must have been below 'min_throttle' to _only disarm_ instead of _full failsafe procedure_.

Use standard RX usec values. See [Rx documentation](Rx.md).
Use standard RX used values. See [Rx documentation](Rx.md).
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually I think this is supposed to be "usec" as in microseconds.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting ! But then it should be microsecond values here

Copy link
Contributor Author

@dimag0g dimag0g Jun 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch! I suggest I put us, which is already used in cli.md. The other option would be to use the standard SI prefix, μs: https://en.wikipedia.org/wiki/Metric_prefix

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefer the latter. @klutvott123 ?

@Zuldan
Copy link

Zuldan commented Jun 16, 2021

“Color” is only used in the USA. “Colour” is used in the rest of the world. Since most of Betaflights user base are non-Amercian we should be using “Colour”.

@haslinghuis
Copy link
Member

haslinghuis commented Jun 16, 2021

@Zuldan The word color has its roots (unsurprisingly) in the Latin word color. English seems to be more conservative, hence the difference in units used in Betaflight between imperial, metric or british.

@Zuldan
Copy link

Zuldan commented Jun 16, 2021

@Zuldan The word color has its roots (unsurprisingly) in the Latin word color.

Oh common @haslinghuis. I’m trying to add fuel to the fire. What random website did you find that reference? Lol

@haslinghuis
Copy link
Member

Screenshot from 2021-06-16 22-49-05

@Zuldan
Copy link

Zuldan commented Jun 16, 2021

How about this!

image

@haslinghuis
Copy link
Member

Remove your cookies before the search :trollface:

@Zuldan
Copy link

Zuldan commented Jun 16, 2021

Remove your cookies before the search :trollface:

Hahah!

Copy link
Member

@klutvott123 klutvott123 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@dimag0g
Copy link
Contributor Author

dimag0g commented Jun 19, 2021

@klutvott123 Thanks for the review. Am I supposed to do something to get this PR merged, or just wait?

@haslinghuis
Copy link
Member

@dimag0g All is good, please just wait for merging.

@klutvott123
Copy link
Member

@dimag0g You don't have to do anything. We wait at least 24 hours after approval before merging but it can take longer. 🙂

@haslinghuis haslinghuis added this to the 4.2.10 milestone Jun 20, 2021
@blckmn blckmn merged commit 65c7b52 into betaflight:master Sep 6, 2021
@mikeller mikeller removed this from the 4.2.10 milestone Sep 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants