Merge branch 'master' into master

1 files changed, 7 insertions, 7 deletions

diff --git a/scripts/docgen.lua b/scripts/docgen.lua
index fb373f9e..b2e12b23 100644
--- a/scripts/docgen.lua
+++ b/scripts/docgen.lua
@@ -1,6 +1,6 @@
-require 'nvim_lsp'
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+require 'lspconfig'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 local inspect = vim.inspect
 local uv = vim.loop
 local fn = vim.fn
@@ -68,7 +68,7 @@ local lsp_section_template = [[
 
 {{preamble}}
 ```lua
-require'nvim_lsp'.{{template_name}}.setup{}
+require'lspconfig'.{{template_name}}.setup{}
 
 {{body}}
 ```
@@ -76,9 +76,9 @@ require'nvim_lsp'.{{template_name}}.setup{}
 
 local function require_all_configs()
   -- Configs are lazy-loaded, tickle them to populate the `configs` singleton.
-  for _,v in ipairs(vim.fn.glob('lua/nvim_lsp/*.lua', 1, 1)) do
+  for _,v in ipairs(vim.fn.glob('lua/lspconfig/*.lua', 1, 1)) do
     local module_name = v:gsub('.*/', ''):gsub('%.lua$', '')
-    require('nvim_lsp/'..module_name)
+    require('lspconfig/'..module_name)
   end
 end
 
@@ -138,7 +138,7 @@ local function make_lsp_sections()
           local package_json_name = util.path.join(tempdir, template_name..'.package.json');
           if docs.package_json then
             if not util.path.is_file(package_json_name) then
-              os.execute(string.format("curl -L -o %q %q", package_json_name, docs.package_json))
+              os.execute(string.format("curl -v -L -o %q %q", package_json_name, docs.package_json))
             end
             if not util.path.is_file(package_json_name) then
               print(string.format("Failed to download package.json for %q at %q", template_name, docs.package_json))