From 338dec41ab45ed6b6a323cc565ff6a714756a0bb Mon Sep 17 00:00:00 2001 From: fetsorn Date: Thu, 6 Jan 2022 18:28:05 +0000 Subject: [PATCH] Fix typo "incase"->"in case" --- .gitlab-ci.yml | 2 +- .gitlab/issue_templates/Bug.md | 2 +- common/assets/src/lib.rs | 2 +- voxygen/src/menu/main/mod.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 96ca76c55b..4ff0b86e94 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ variables: default: # https://docs.gitlab.com/ee/ci/pipelines/settings.html#auto-cancel-pending-pipelines interruptible: true - # Retry automatically incase the runner times out or there's a runner failure + # Retry automatically in case the runner times out or there's a runner failure retry: max: 2 when: diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md index a4906f02be..f694041db9 100644 --- a/.gitlab/issue_templates/Bug.md +++ b/.gitlab/issue_templates/Bug.md @@ -32,7 +32,7 @@ logs, and code as it's tough to read otherwise.) #### System details -(Include important system details like OS and incase it's a graphical issue the gpu) +(Include important system details like OS and in case it's a graphical issue the gpu) #### Veloren version diff --git a/common/assets/src/lib.rs b/common/assets/src/lib.rs index 4801a8c84c..594edc6864 100644 --- a/common/assets/src/lib.rs +++ b/common/assets/src/lib.rs @@ -214,7 +214,7 @@ lazy_static! { /// 1. Running through airshipper (`assets` next to binary) /// 2. Install with package manager and run (assets probably in `/usr/share/veloren/assets` while binary in `/usr/bin/`) /// 3. Download & hopefully extract zip (`assets` next to binary) - /// 4. Running through cargo (`assets` in workspace root but not always in cwd incase you `cd voxygen && cargo r`) + /// 4. Running through cargo (`assets` in workspace root but not always in cwd in case you `cd voxygen && cargo r`) /// 5. Running executable in the target dir (`assets` in workspace) /// 6. Running tests (`assets` in workspace root) pub static ref ASSETS_PATH: PathBuf = { diff --git a/voxygen/src/menu/main/mod.rs b/voxygen/src/menu/main/mod.rs index ba85ee38fb..22aed22d1c 100644 --- a/voxygen/src/menu/main/mod.rs +++ b/voxygen/src/menu/main/mod.rs @@ -174,7 +174,7 @@ impl PlayState for MainMenuState { self.init = InitState::None; error!(?e, "Client Init failed raw error"); let e = get_client_msg_error(e, &global_state.i18n); - // Log error for possible additional use later or incase that the error + // Log error for possible additional use later or in case that the error // displayed is cut of. error!(?e, "Client Init failed"); global_state.info_message = Some(