4 files changed, 23 insertions, 12 deletions
diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo
index db0940d94..741d4ad07 100644
--- a/Doc/Zsh/contrib.yo
+++ b/Doc/Zsh/contrib.yo
@@ -1339,7 +1339,7 @@ tt(formats) and tt(actionformats) and will be available in the global
 tt(backend_misc) array as tt(${backend_misc[bookmarks]}).
 )
 item(tt(gen-applied-string))(
-Called in the tt(git) (with tt(stgit) or during rebase), and tt(hg)
+Called in the tt(git) (with tt(stgit) or during rebase or merge), and tt(hg)
 (with tt(mq)) backends and in tt(quilt) support when the tt(applied-string)
 is generated; the tt(use-quilt) zstyle must be true for tt(quilt) (the tt(mq)
 and tt(stgit) backends are active by default).
diff --git a/Doc/Zsh/manual.yo b/Doc/Zsh/manual.yo
index e0b0f14cb..86c72c0ff 100644
--- a/Doc/Zsh/manual.yo
+++ b/Doc/Zsh/manual.yo
@@ -61,8 +61,6 @@ menu(The Zsh Web Page)
 menu(The Zsh Userguide)
 menu(See Also)
 
-Roadmap
-
 Invocation
 
 menu(Compatibility)
@@ -107,12 +105,10 @@ menu(Single Letter Options)
 
 Zsh Line Editor
 
-menu(Movement)
-menu(History Control)
-menu(Modifying Text)
-menu(Arguments)
-menu(Completion)
-menu(Miscellaneous)
+menu(Keymaps)
+menu(Zle Builtins)
+menu(Zle Widgets)
+menu(Character Highlighting)
 
 Completion Widgets
 
@@ -143,6 +139,14 @@ Zsh Modules
 
 includefile(Zsh/manmodmenu.yo)
 
+Calendar Function System
+
+menu(Calendar File and Date Formats)
+menu(Calendar System User Functions)
+menu(Calendar Styles)
+menu(Calendar Utility Functions)
+menu(Calendar Bugs)
+
 TCP Function System
 
 menu(TCP Functions)
@@ -159,8 +163,14 @@ menu(Miscellaneous Features)
 User Contributions
 
 menu(Utilities)
+menu(Recent Directories)
+menu(Version Control Information)
 menu(Prompt Themes)
 menu(ZLE Functions)
+menu(Exception Handling)
+menu(MIME Functions)
+menu(Mathematical Functions)
+menu(User Configuration Functions)
 menu(Other Functions)
 
 endmenu()
diff --git a/Doc/Zsh/params.yo b/Doc/Zsh/params.yo
index a4067883a..ba2856b34 100644
--- a/Doc/Zsh/params.yo
+++ b/Doc/Zsh/params.yo
@@ -60,7 +60,7 @@ When the integer attribute, tt(-i), or a floating point attribute, tt(-E)
 or tt(-F), is set for var(name), the var(value) is subject to arithmetic
 evaluation.  Furthermore, by replacing `tt(=)' with `tt(+=)', a parameter
 can be incremented or appended to.  See noderef(Array Parameters) and
-ifzman(em(Arithmetic Evaluation) LPAR()in zmanref(zshexpn)RPAR())\
+ifzman(em(Arithmetic Evaluation) LPAR()in zmanref(zshmisc)RPAR())\
 ifnzman(noderef(Arithmetic Evaluation))
 for additional forms of assignment.
 
diff --git a/Doc/Zsh/zle.yo b/Doc/Zsh/zle.yo
index c06e2260e..4e9369508 100644
--- a/Doc/Zsh/zle.yo
+++ b/Doc/Zsh/zle.yo
@@ -34,7 +34,8 @@ The parameter tt(zle_highlight) is also used by the line editor; see
 ifzman(em(Character Highlighting) below)\
 ifnzman(noderef(Character Highlighting)).  Highlighting
 of special characters and the region between the cursor and the
-mark (as set with tt(set-mark-command) in Emacs mode) is enabled
+mark (as set with tt(set-mark-command) in Emacs mode, or by tt(visual-mode)
+in Vi mode) is enabled
 by default; consult this reference for more information.  Irascible
 conservatives will wish to know that all highlighting may be disabled by
 the following setting:
@@ -43,7 +44,7 @@ example(zle_highlight=(none))
 
 In many places, references are made to the tt(numeric argument).  This can
 by default be entered in emacs mode by holding the alt key and typing
-a number, or pressing escape before each number, and in vi command mode
+a number, or pressing escape before each digit, and in vi command mode
 by typing the number before entering a command.  Generally the numeric
 argument causes the next command entered to be repeated the specified
 number of times, unless otherwise noted below. See also