diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 0a142e4..de4bb02 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -9121,22 +9121,16 @@
     Example: >
 	:if has("gui_running")
 <							*has-patch*
-3.  Included patches.  The "patch123" feature means that patch 123 has been
-    included.  Note that this form does not check the version of Vim, you need
-    to inspect |v:version| for that.
-    Example (checking version 6.2.148 or later): >
-	:if v:version > 602 || v:version == 602 && has("patch148")
-<    Note that it's possible for patch 147 to be omitted even though 148 is
-    included.
-
-4.  Beyond a certain version or at a certain version and including a specific
-    patch.  The "patch-7.4.237" feature means that the Vim version is 7.5 or
-    later, or it is version 7.4 and patch 237 was included.
-    Note that this only works for patch 7.4.237 and later, before that you
-    need to use the example above that checks v:version.  Example: >
+3.  Beyond a certain version or at a certain version and including a specific
+    patch.  The "patch-7.4.248" feature means that the Vim version is 7.5 or
+    later, or it is version 7.4 and patch 248 was included.  Example: >
 	:if has("patch-7.4.248")
-<    Note that it's possible for patch 147 to be omitted even though 148 is
-    included.
+<    Note that it's possible for patch 248 to be omitted even though 249 is
+    included.  Only happens when cherry-picking patches.
+    Note that this form only works for patch 7.4.237 and later, before that
+    you need to check for the patch and the  v:version.  Example (checking
+    version 6.2.148 or later): >
+	:if v:version > 602 || (v:version == 602 && has("patch148"))
 
 Hint: To find out if Vim supports backslashes in a file name (MS-Windows),
 use: `if exists('+shellslash')`
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index eda14bc..13ab355 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -39,9 +39,10 @@
 -------------------- Known bugs and current work -----------------------
 
 Terminal emulator window:
-- Win32: Termdebug doesn't work, because gdb does not support mi2.  This
-  plugin: https://github.com/cpiger/NeoDebug  runs gdb as a job, redirecting
-  input and output.  Command I/O is in gdb window.
+- Win32: Termdebug doesn't work, because gdb does not support mi2.
+  This plugin: https://github.com/cpiger/NeoDebug  runs gdb as a job,
+  redirecting input and output.
+  Open new console for for program with: "set new-console on"
 - Win32: Redirecting input does not work, half of Test_terminal_redir_file()
   is disabled.
 - Win32: Redirecting output works but includes escape sequences.
@@ -65,6 +66,8 @@
 Crash when mixing matchadd and substitute()? (Max Christian Pohle, 2018 May
 13, #2910)  Can't reproduce?
 
+Deprecate using  has("patch213")  always include the version number.
+
 On Win32 when not in the console and t_Co >= 256, allow using 'tgc'.
 (Nobuhiro Takasaki, #2833)  Also check t_Co.
 
diff --git a/runtime/doc/version8.txt b/runtime/doc/version8.txt
index 8634c28..c091063 100644
--- a/runtime/doc/version8.txt
+++ b/runtime/doc/version8.txt
@@ -22104,7 +22104,7 @@
 Patch 8.0.1238
 Problem:    Incremental search only shows one match.
 Solution:   When 'incsearch' and 'hlsearch' are both set highlight all
-            matches. (haya14busa, itchyny closes #2198)
+            matches. (haya14busa, itchyny, closes #2198)
 Files:      runtime/doc/options.txt, src/ex_getln.c, src/proto/search.pro,
             src/search.c, src/testdir/test_search.vim
 
@@ -22595,7 +22595,7 @@
 Files:      src/os_macosx.m
 
 Patch 8.0.1316 (after 8.0.1312)
-Problem:    Build still fails on Mac. (chdiza)
+Problem:    Build still still fails on Mac. (chdiza)
 Solution:   Remove another bogus typedef.
 Files:      src/os_mac_conv.c
 
diff --git a/runtime/doc/vim-ja.UTF-8.1 b/runtime/doc/vim-ja.UTF-8.1
index 7742356..5b7798b 100644
--- a/runtime/doc/vim-ja.UTF-8.1
+++ b/runtime/doc/vim-ja.UTF-8.1
@@ -280,7 +280,7 @@
 ぐことができます。
 ファイルを保存したい場合は、":w!" のように、Ex コマンドに感嘆符を付けてくだ
 さい。
-\-R オプションは \-n オプションの効果も含んでいます (下記参照)。
+\-R オプションは \-n オプションの効果も含んでいます (上記参照)。
 オプション 'readonly' は ":set noro" でオフにできます。
 詳しくは ":help 'readonly'" を参照してください。
 .TP
diff --git a/runtime/doc/xxd-ja.UTF-8.1 b/runtime/doc/xxd-ja.UTF-8.1
index a4cc583..47688f8 100644
--- a/runtime/doc/xxd-ja.UTF-8.1
+++ b/runtime/doc/xxd-ja.UTF-8.1
@@ -76,6 +76,9 @@
 .RI < cols >
 オクテットで出力する。標準設定は 16 (\-i: 12, \-ps: 30, \-b: 6)。最大 256。
 .TP
+.IR \-C " | " \-capitalize
+\-i を使用した際に、C インクルードファイル形式の変数名を大文字にする。
+.TP
 .IR \-E " | " \-EBCDIC
 右端に出力される文字のエンコーディングを ASCII から EBCDIC に変更する。
 16 進ダンプの出力形式は変更されません。