3 files changed, 34 insertions, 6 deletions

diff --git a/docs/dev/architecture.md b/docs/dev/architecture.md
index 1201f6e5a..1ffabc6ef 100644
--- a/docs/dev/architecture.md
+++ b/docs/dev/architecture.md
@@ -79,9 +79,7 @@ Rust syntax tree structure and parser. See
 - `grammar.ron` RON description of the grammar, which is used to
   generate `syntax_kinds` and `ast` modules, using `cargo gen-syntax` command.
 - `algo`: generic tree algorithms, including `walk` for O(1) stack
-  space tree traversal (this is cool) and `visit` for type-driven
-  visiting the nodes (this is double plus cool, if you understand how
-  `Visitor` works, you understand the design of syntax trees).
+  space tree traversal (this is cool).
 
 Tests for ra_syntax are mostly data-driven: `test_data/parser` contains subdirectories with a bunch of `.rs`
 (test vectors) and `.txt` files with corresponding syntax trees. During testing, we check
diff --git a/docs/user/README.md b/docs/user/README.md
index 9d03cad1c..036b51d58 100644
--- a/docs/user/README.md
+++ b/docs/user/README.md
@@ -45,7 +45,7 @@ should adapt these manual installation instructions:
 ```
 $ git clone https://github.com/rust-analyzer/rust-analyzer.git --depth 1
 $ cd rust-analyzer
-$ cargo install --path ./crates/ra_lsp_server/ --force
+$ cargo install --path ./crates/ra_lsp_server/ --force --locked
 $ cd ./editors/code
 $ npm install
 $ ./node_modules/vsce/out/vsce package
@@ -116,6 +116,22 @@ to load path and require it in `init.el`
 [coc-vim-conf]: https://github.com/neoclide/coc.nvim/#example-vim-configuration
 [coc-rust-analyzer]: https://github.com/fannheyward/coc-rust-analyzer
 
+## Vim and NeoVim Alternative
+
+* Install LanguageClient-neovim by following the instructions [here][lang-client-neovim]
+  - No extra run-time is required as this server is written in Rust
+  - The github project wiki has extra tips on configuration
+
+* Configure by adding this to your vim/neovim config file (replacing the existing rust specific line if it exists):
+
+```
+let g:LanguageClient_serverCommands = {
+\ 'rust': ['ra_lsp_server'],
+\ }
+```
+
+[lang-client-neovim]: https://github.com/autozimu/LanguageClient-neovim
+
 
 ## Sublime Text 3
 
diff --git a/docs/user/features.md b/docs/user/features.md
index eb81cba26..757a02838 100644
--- a/docs/user/features.md
+++ b/docs/user/features.md
@@ -166,6 +166,20 @@ impl Foo for S {
 }
 ```
 
+- Apply [De Morgan's law](https://en.wikipedia.org/wiki/De_Morgan%27s_laws)
+
+```rust
+// before:
+fn example(x: bool) -> bool {
+    !x || !x
+}
+
+// after:
+fn example(x: bool) -> bool {
+    !(x && x)
+}
+```
+
 - Import path
 
 ```rust
@@ -353,9 +367,9 @@ impl VariantData {
 
 ```rust
 // before:
-use algo:<|>:visitor::{Visitor, visit};
+use crate:<|>:db::{RootDatabase, FileSymbol};
 // after:
-use algo::{<|>visitor::{Visitor, visit}};
+use crate::{<|>db::{RootDatabase, FileSymbol}};
 ```
 
 - Flip binary expression