From: Sanchith Hegde <sanchith.hegde01@gmail.com>
Date: Fri, 26 Feb 2021 07:08:12 +0000 (+0530)
Subject: docs(ide_assists): Change importMergeBehaviour to importMergeBehavior
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;ds=sidebyside;h=3eaec3cd3390baed7ca1e3bbf31a38f157c13af5;p=rust.git

docs(ide_assists): Change importMergeBehaviour to importMergeBehavior
---

diff --git a/crates/ide_assists/src/handlers/auto_import.rs b/crates/ide_assists/src/handlers/auto_import.rs
index e93901cb310..dc38f90e931 100644
--- a/crates/ide_assists/src/handlers/auto_import.rs
+++ b/crates/ide_assists/src/handlers/auto_import.rs
@@ -33,9 +33,9 @@
 // use super::AssistContext;
 // ```
 //
-// .Merge Behaviour
+// .Merge Behavior
 //
-// It is possible to configure how use-trees are merged with the `importMergeBehaviour` setting.
+// It is possible to configure how use-trees are merged with the `importMergeBehavior` setting.
 // It has the following configurations:
 //
 // - `full`: This setting will cause auto-import to always completely merge use-trees that share the
@@ -46,7 +46,7 @@
 // - `none`: This setting will cause auto-import to never merge use-trees keeping them as simple
 //  paths.
 //
-// In `VS Code` the configuration for this is `rust-analyzer.assist.importMergeBehaviour`.
+// In `VS Code` the configuration for this is `rust-analyzer.assist.importMergeBehavior`.
 //
 // .Import Prefix
 //