6 files changed, 10 insertions, 13 deletions
diff --git a/lua/nvim_lsp/elmls.lua b/lua/nvim_lsp/elmls.lua
index 69a84f3e..46799c4a 100644
--- a/lua/nvim_lsp/elmls.lua
+++ b/lua/nvim_lsp/elmls.lua
@@ -57,7 +57,7 @@ skeleton[server_name] = {
     description = [[
 https://github.com/elm-tooling/elm-language-server#installation
 
-If you don't want to use neovim to install it, then you can use:
+If you don't want to use Nvim to install it, then you can use:
 ```sh
 npm install -g elm elm-test elm-format @elm-tooling/elm-language-server
 ```
diff --git a/lua/nvim_lsp/pyls_ms.lua b/lua/nvim_lsp/pyls_ms.lua
index eb352b11..3659b47e 100644
--- a/lua/nvim_lsp/pyls_ms.lua
+++ b/lua/nvim_lsp/pyls_ms.lua
@@ -113,8 +113,8 @@ skeleton[name] = {
   -- on_attach = function(client, bufnr) end;
   docs = {
     description = [[
-    https://github.com/Microsoft/python-language-server
-    `python-language-server`, a language server for Python.
+https://github.com/Microsoft/python-language-server
+`python-language-server`, a language server for Python.
     ]];
     default_config = {
       root_dir = "vim's starting directory";
diff --git a/lua/nvim_lsp/rls.lua b/lua/nvim_lsp/rls.lua
index 28067999..98a8a09c 100644
--- a/lua/nvim_lsp/rls.lua
+++ b/lua/nvim_lsp/rls.lua
@@ -18,11 +18,8 @@ https://github.com/rust-lang/rls
 
 rls, a language server for Rust
 
-Refer to the following for how to setup rls itself.
-https://github.com/rust-lang/rls#setup
-
-See below for rls specific settings.
-https://github.com/rust-lang/rls#configuration
+See https://github.com/rust-lang/rls#setup to setup rls itself.
+See https://github.com/rust-lang/rls#configuration for rls-specific settings.
 
 If you want to use rls for a particular build, eg nightly, set cmd as follows:
 
diff --git a/lua/nvim_lsp/rust_analyzer.lua b/lua/nvim_lsp/rust_analyzer.lua
index 648663bf..6f2f7eb7 100644
--- a/lua/nvim_lsp/rust_analyzer.lua
+++ b/lua/nvim_lsp/rust_analyzer.lua
@@ -15,10 +15,10 @@ skeleton.rust_analyzer = {
     description = [[
 https://github.com/rust-analyzer/rust-analyzer
 
-rust-analyzer(aka rls 2.0), a language server for Rust
+rust-analyzer (aka rls 2.0), a language server for Rust
+
+See [rls docs](https://github.com/rust-lang/rls#configuration) for rls-specific settings.
 
-See below for rls specific settings.
-https://github.com/rust-analyzer/rust-analyzer/tree/master/docs/user#settings
     ]];
     default_config = {
       root_dir = [[root_pattern("Cargo.toml")]];
diff --git a/lua/nvim_lsp/skeleton.lua b/lua/nvim_lsp/skeleton.lua
index ff26e14b..6859be69 100644
--- a/lua/nvim_lsp/skeleton.lua
+++ b/lua/nvim_lsp/skeleton.lua
@@ -40,7 +40,7 @@ function skeleton.__newindex(t, template_name, template)
     config.callbacks["window/logMessage"] = function(err, method, params, client_id)
       if params and params.type <= config.log_level then
         -- TODO(ashkan) remove this after things have settled.
-        assert(lsp.callbacks, "Please update neovim master. This is an incompatible interface.")
+        assert(lsp.callbacks, "Update to Nvim HEAD. This is an incompatible interface.")
         lsp.callbacks[method](err, method, params, client_id)
       end
     end
diff --git a/lua/nvim_lsp/util.lua b/lua/nvim_lsp/util.lua
index 0f96dd59..c57f21c7 100644
--- a/lua/nvim_lsp/util.lua
+++ b/lua/nvim_lsp/util.lua
@@ -327,7 +327,7 @@ function M.npm_installer(config)
   local function install()
     -- TODO(ashkan) need all binaries or just the first?
     if M.has_bins(unpack(config.binaries)) then
-      return print(config.server_name, "is already installed (not by neovim)")
+      return print(config.server_name, "is already installed (not by Nvim)")
     end
     if not M.has_bins("sh", "npm", "mkdir") then
       api.nvim_err_writeln('Installation requires "sh", "npm", "mkdir"')