4 files changed, 40 insertions, 8 deletions
diff --git a/Doc/Zsh/.distfiles b/Doc/Zsh/.distfiles
index 9ff58abbf..2cf686ec9 100644
--- a/Doc/Zsh/.distfiles
+++ b/Doc/Zsh/.distfiles
@@ -6,8 +6,8 @@ DISTFILES_SRC='
     mod_clone.yo mod_compctl.yo mod_complete.yo mod_complist.yo
     mod_computil.yo mod_deltochar.yo mod_example.yo mod_files.yo
     mod_mapfile.yo mod_mathfunc.yo mod_parameter.yo mod_sched.yo
-    mod_stat.yo mod_zftp.yo mod_zle.yo mod_zleparameter.yo mod_zutil.yo
-    mod_zprof.yo mod_zpty.yo
+    mod_stat.yo mod_termcap.yo mod_terminfo.yo mod_zftp.yo mod_zle.yo
+    mod_zleparameter.yo mod_zutil.yo mod_zprof.yo mod_zpty.yo
     modules.yo modlist.yo modmenu.yo manmodmenu.yo
     options.yo params.yo prompt.yo redirect.yo restricted.yo seealso.yo
     zftpsys.yo zle.yo contrib.yo
diff --git a/Doc/Zsh/builtins.yo b/Doc/Zsh/builtins.yo
index 42b189139..ec7c00830 100644
--- a/Doc/Zsh/builtins.yo
+++ b/Doc/Zsh/builtins.yo
@@ -258,12 +258,6 @@ The tt(-E) flag, or the tt(BSD_ECHO) option, can be used to disable
 these escape sequences.  In the latter case, tt(-e) flag can be used to
 enable them.
 )
-findex(echotc)
-cindex(termcap string, printing)
-item(tt(echotc) var(cap) [ var(arg) ... ])(
-Output the termcap string corresponding to the capability
-var(cap), with optional arguments.
-)
 findex(emulate)
 cindex(compatibility, sh)
 cindex(compatibility, ksh)
@@ -943,6 +937,8 @@ Suspend the execution of the shell (send it a tt(SIGTSTP))
 until it receives a tt(SIGCONT).
 Unless the tt(-f) option is given, this will refuse to suspend a login shell.
 )
+module(termcap)(zsh/termcap)
+module(terminfo)(zsh/terminfo)
 findex(test)
 xitem(tt(test) [ var(arg) ... ])
 item(tt([) [ var(arg) ... ] tt(]))(
diff --git a/Doc/Zsh/mod_termcap.yo b/Doc/Zsh/mod_termcap.yo
new file mode 100644
index 000000000..46ce79d68
--- /dev/null
+++ b/Doc/Zsh/mod_termcap.yo
@@ -0,0 +1,13 @@
+COMMENT(!MOD!zsh/termcap
+Interface to the termcap database.
+!MOD!)
+The tt(zsh/termcap) module makes available one builtin command:
+
+startitem()
+findex(echotc)
+cindex(termcap string, printing)
+item(tt(echotc) var(cap) [ var(arg) ... ])(
+Output the termcap string corresponding to the capability
+var(cap), with optional arguments.
+)
+enditem()
diff --git a/Doc/Zsh/mod_terminfo.yo b/Doc/Zsh/mod_terminfo.yo
new file mode 100644
index 000000000..9e0e6665a
--- /dev/null
+++ b/Doc/Zsh/mod_terminfo.yo
@@ -0,0 +1,23 @@
+COMMENT(!MOD!zsh/terminfo
+Interface to the terminfo database.
+!MOD!)
+The tt(zsh/terminfo) module makes available one builtin command:
+
+startitem()
+findex(echoti)
+cindex(terminfo string, printing)
+item(tt(echoti) var(cap))(
+Output the terminfo string corresponding to the capability
+var(cap).
+)
+enditem()
+
+The tt(zsh/terminfo) module makes available one parameter:
+
+startitem()
+vindex(terminfo)
+item(tt(terminfo))(
+An associative array that maps terminfo capability names to
+their values.
+)
+enditem()