diff --git a/changelog.md b/changelog.md
index 6adb9acc1328d2b5aa2be58f895f62a84202be35..62d9c36666a9dd9c8a70a5968c1a81e549f6150e 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,20 @@
 # changelog
 
+## 3.6.11
+`2023-2-13`
+* `CHG` completion: don't show loading process
+* `FIX` [#1886]
+* `FIX` [#1887]
+* `FIX` [#1889]
+* `FIX` [#1895]
+* `FIX` [#1902]
+
+[#1886]: https://github.com/LuaLS/lua-language-server/issues/1886
+[#1887]: https://github.com/LuaLS/lua-language-server/issues/1887
+[#1889]: https://github.com/LuaLS/lua-language-server/issues/1889
+[#1895]: https://github.com/LuaLS/lua-language-server/issues/1895
+[#1902]: https://github.com/LuaLS/lua-language-server/issues/1902
+
 ## 3.6.10
 `2023-2-7`
 * `FIX` [#1869]
diff --git a/client/3rd/vscode-lua-doc b/client/3rd/vscode-lua-doc
index ac128f4e47c019d41ec0d97adbf1a9a52a916e4e..208d871010255661ea9ea8933f426c12fb173af0 160000
--- a/client/3rd/vscode-lua-doc
+++ b/client/3rd/vscode-lua-doc
@@ -1 +1 @@
-Subproject commit ac128f4e47c019d41ec0d97adbf1a9a52a916e4e
+Subproject commit 208d871010255661ea9ea8933f426c12fb173af0
diff --git a/package.json b/package.json
index a6610e64f2029dacf357c5e3c3d6b0b5a128bd00..fd87707c3e73da087c7370ab4a097cddabdc964f 100644
--- a/package.json
+++ b/package.json
@@ -2682,7 +2682,8 @@
 								"xpcall",
 								"assert",
 								"error",
-								"type"
+								"type",
+								"os.exit"
 							],
 							"type": "string"
 						}
@@ -3054,5 +3055,5 @@
 	"sponsor": {
 		"url": "https://github.com/LuaLS/lua-language-server/issues/484"
 	},
-	"version": "3.6.10"
+	"version": "3.6.11"
 }
diff --git a/package/build.lua b/package/build.lua
index fb4603d3b2c349267dce2215529e9bd440b4d767..7cc74f7c4e9b371bebf0ba13ac5d5cf2112060f5 100644
--- a/package/build.lua
+++ b/package/build.lua
@@ -1,6 +1,6 @@
 local json = require 'json-beautify'
 
-local VERSION = "3.6.10"
+local VERSION = "3.6.11"
 
 local package = require 'package.package'
 local fsu     = require 'fs-utility'
diff --git a/server b/server
index 42f48c7777abe9243372688701f8609ce923168c..21420c986d807a55e22dd9b4261c3e3279a19eb0 160000
--- a/server
+++ b/server
@@ -1 +1 @@
-Subproject commit 42f48c7777abe9243372688701f8609ce923168c
+Subproject commit 21420c986d807a55e22dd9b4261c3e3279a19eb0
diff --git a/setting/schema-pt-br.json b/setting/schema-pt-br.json
index 48c13577d676ccfd5b15bf6fa8e0f7b94651e4d3..b2f916ebc475d64573a43fc59bb6194201760f9e 100644
--- a/setting/schema-pt-br.json
+++ b/setting/schema-pt-br.json
@@ -2857,7 +2857,8 @@
                         "xpcall",
                         "assert",
                         "error",
-                        "type"
+                        "type",
+                        "os.exit"
                     ],
                     "type": "string"
                 }
diff --git a/setting/schema-zh-cn.json b/setting/schema-zh-cn.json
index 36176f7b6950c21caa29f9e0502e2be13394174a..71ffe7f5ba04d7c3ea17b81cd17cd43b9cd3fe69 100644
--- a/setting/schema-zh-cn.json
+++ b/setting/schema-zh-cn.json
@@ -2857,7 +2857,8 @@
                         "xpcall",
                         "assert",
                         "error",
-                        "type"
+                        "type",
+                        "os.exit"
                     ],
                     "type": "string"
                 }
diff --git a/setting/schema-zh-tw.json b/setting/schema-zh-tw.json
index faf922ababd0da7a2d395d13756262be83e49d36..2ea9febd2a8a2f2718e8236cd13fd116005e6b39 100644
--- a/setting/schema-zh-tw.json
+++ b/setting/schema-zh-tw.json
@@ -2857,7 +2857,8 @@
                         "xpcall",
                         "assert",
                         "error",
-                        "type"
+                        "type",
+                        "os.exit"
                     ],
                     "type": "string"
                 }
diff --git a/setting/schema.json b/setting/schema.json
index e6459fa9aea212ea2781bbac7978cd1b92d005ef..f2af5c3826e76b77afdd2afe0a609f728ef535ec 100644
--- a/setting/schema.json
+++ b/setting/schema.json
@@ -2857,7 +2857,8 @@
                         "xpcall",
                         "assert",
                         "error",
-                        "type"
+                        "type",
+                        "os.exit"
                     ],
                     "type": "string"
                 }