12 files changed, 61 insertions, 52 deletions
diff --git a/Doc/Zsh/compsys.yo b/Doc/Zsh/compsys.yo
index afe332544..65f596752 100644
--- a/Doc/Zsh/compsys.yo
+++ b/Doc/Zsh/compsys.yo
@@ -4279,8 +4279,8 @@ var(field)s for which the value is known).
 
 The matches generated will be taken from the value of the style.  These
 should contain the possible values for the combinations in the appropriate
-order (users, hosts, ports in the example above).  The different fields
-the values for the different fields are separated by colons.  This
+order (users, hosts, ports in the example above).
+The values for the different fields are separated by colons.  This
 can be altered with the option tt(-s) to tt(_combination) which specifies a
 pattern.  Typically this is a character class, as for example
 `tt(-s "[:@]")' in the case of the tt(users-hosts) style.    Each
diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo
index 35ce91575..0c2ba484c 100644
--- a/Doc/Zsh/contrib.yo
+++ b/Doc/Zsh/contrib.yo
@@ -847,22 +847,22 @@ In order to do that, you may use the tt(vcs_info) function.
 The following VCSs are supported, showing the abbreviated name by which
 they are referred to within the system:
 startsitem()
-sitem(Bazaar (tt(bzr)))(uref(http://bazaar.canonical.com/))
+sitem(Bazaar (tt(bzr)))(uref(https://bazaar.canonical.com/))
 sitem(Codeville (tt(cdv)))(uref(http://freecode.com/projects/codeville/))
-sitem(Concurrent Versioning System (tt(cvs)))(uref(http://www.nongnu.org/cvs/))
+sitem(Concurrent Versioning System (tt(cvs)))(uref(https://www.nongnu.org/cvs/))
 sitem(Darcs (tt(darcs)))(uref(http://darcs.net/))
-sitem(Fossil (tt(fossil)))(uref(http://fossil-scm.org/))
-sitem(Git (tt(git)))(uref(http://git-scm.com/))
-sitem(GNU arch (tt(tla)))(uref(http://www.gnu.org/software/gnu-arch/))
-sitem(Mercurial (tt(hg)))(uref(http://mercurial.selenic.com/))
-sitem(Monotone (tt(mtn)))(uref(http://monotone.ca/))
-sitem(Perforce (tt(p4)))(uref(http://www.perforce.com/))
-sitem(Subversion (tt(svn)))(uref(http://subversion.apache.org/))
-sitem(SVK (tt(svk)))(uref(http://svk.bestpractical.com/))
+sitem(Fossil (tt(fossil)))(uref(https://fossil-scm.org/))
+sitem(Git (tt(git)))(uref(https://git-scm.com/))
+sitem(GNU arch (tt(tla)))(uref(https://www.gnu.org/software/gnu-arch/))
+sitem(Mercurial (tt(hg)))(uref(https://www.mercurial-scm.org/))
+sitem(Monotone (tt(mtn)))(uref(https://monotone.ca/))
+sitem(Perforce (tt(p4)))(uref(https://www.perforce.com/))
+sitem(Subversion (tt(svn)))(uref(https://subversion.apache.org/))
+sitem(SVK (tt(svk)))(uref(https://svk.bestpractical.com/))
 endsitem()
 
 There is also support for the patch management system tt(quilt)
-(uref(http://savannah.nongnu.org/projects/quilt)). See
+(uref(https://savannah.nongnu.org/projects/quilt)). See
 ifzman(bf(Quilt Support))ifnzman(noderef(vcs_info Quilt Support))
 below for details.
 
diff --git a/Doc/Zsh/expn.yo b/Doc/Zsh/expn.yo
index 8b447e2c7..c79109700 100644
--- a/Doc/Zsh/expn.yo
+++ b/Doc/Zsh/expn.yo
@@ -2004,7 +2004,7 @@ The character is 7-bit, i.e. is a single-byte character without
 the top bit set.
 )
 item(tt([:blank:]))(
-The character is either space or tab
+The character is a blank character
 )
 item(tt([:cntrl:]))(
 The character is a control character
diff --git a/Doc/Zsh/ftp_sites.yo b/Doc/Zsh/ftp_sites.yo
deleted file mode 100644
index 804d975f3..000000000
--- a/Doc/Zsh/ftp_sites.yo
+++ /dev/null
@@ -1,15 +0,0 @@
-startitem()
-item(Primary site)(
-nofill(uref(ftp://ftp.zsh.org/pub/)
-uref(http://www.zsh.org/pub/))
-)
-item(Australia)(
-nofill(uref(ftp://ftp.zsh.org/pub/)
-uref(http://www.zsh.org/pub/)
-uref(http://mirror.dejanseo.com.au/pub/zsh/))
-)
-item(Hungary)(
-nofill(uref(ftp://ftp.cs.elte.hu/pub/zsh/)
-uref(http://www.cs.elte.hu/pub/zsh/))
-)
-enditem()
diff --git a/Doc/Zsh/intro.yo b/Doc/Zsh/intro.yo
index 510a7bda5..a7a2f3248 100644
--- a/Doc/Zsh/intro.yo
+++ b/Doc/Zsh/intro.yo
@@ -38,8 +38,13 @@ sect(Description)
 )\
 Zsh is a UNIX command interpreter (shell) usable as an interactive
 login shell and as a shell script command processor.  Of the standard shells,
-zsh most closely resembles bf(ksh) but includes many enhancements.  Zsh
-has command line editing, builtin spelling correction, programmable
+zsh most closely resembles bf(ksh) but includes many enhancements.  It
+does not provide compatibility with POSIX or other shells in its
+default operating mode:  see
+ifnzman(the section noderef(Compatibility))\
+ifzman(the section Compatibility below).
+
+Zsh has command line editing, builtin spelling correction, programmable
 command completion, shell functions (with autoloading), a history
 mechanism, and a host of other features.
 includefile(Zsh/metafaq.yo)
diff --git a/Doc/Zsh/metafaq.yo b/Doc/Zsh/metafaq.yo
index 6cb299ad1..c123a7cea 100644
--- a/Doc/Zsh/metafaq.yo
+++ b/Doc/Zsh/metafaq.yo
@@ -18,17 +18,17 @@ can be contacted at tt(<coordinator@zsh.org>), but matters relating to
 the code should generally go to the mailing list.
 texinode(Availability)(Mailing Lists)(Author)(Introduction)
 sect(Availability)
-Zsh is available from the following anonymous FTP sites.  These mirror
-sites are kept frequently up to date.  The sites marked with em((H)) may be
-mirroring tt(ftp.cs.elte.hu) instead of the primary site.
+Zsh is available from the following HTTP and anonymous FTP site.
 
 cindex(FTP sites for zsh)
 cindex(acquiring zsh by FTP)
 cindex(availability of zsh)
-INCLUDEFILE(Zsh/ftp_sites.yo)\
+nofill(uref(ftp://ftp.zsh.org/pub/)
+uref(https://www.zsh.org/pub/))
+)
 
 The up-to-date source code is available via Git from Sourceforge.  See
-uref(http://sourceforge.net/projects/zsh/) for details.  A summary of
+uref(https://sourceforge.net/projects/zsh/) for details.  A summary of
 instructions for the archive can be found at
 uref(http://zsh.sourceforge.net/).
 
@@ -75,7 +75,7 @@ maintained by Karsten Thygesen tt(<karthy@kom.auc.dk>).
 The mailing lists are archived; the archives can be accessed via the
 administrative addresses listed above.  There is also a hypertext
 archive, maintained by Geoff Wing tt(<gcw@zsh.org>), available at
-uref(http://www.zsh.org/mla/).
+uref(https://www.zsh.org/mla/).
 texinode(The Zsh FAQ)(The Zsh Web Page)(Mailing Lists)(Introduction)
 sect(The Zsh FAQ)
 Zsh has a list of Frequently Asked Questions (FAQ), maintained by
@@ -86,7 +86,7 @@ uref(http://www.zsh.org/FAQ/).  The contact address for FAQ-related matters
 is tt(<faqmaster@zsh.org>).
 texinode(The Zsh Web Page)(The Zsh Userguide)(The Zsh FAQ)(Introduction)
 sect(The Zsh Web Page)
-Zsh has a web page which is located at uref(http://www.zsh.org/).  This is
+Zsh has a web page which is located at uref(https://www.zsh.org/).  This is
 maintained by Karsten Thygesen tt(<karthy@zsh.org>), of SunSITE Denmark.
 The contact address for web-related matters is tt(<webmaster@zsh.org>).
 texinode(The Zsh Userguide)(See Also)(The Zsh Web Page)(Introduction)
@@ -98,7 +98,3 @@ cabbalistic, hierographic, or downright mystifying (for example, the word
 uref(http://zsh.sourceforge.net/Guide/).  At the time of writing, chapters
 dealing with startup files and their contents and the new completion system
 were essentially complete.
-sect(The Zsh Wiki)
-A `wiki' website for zsh has been created at uref(http://www.zshwiki.org/).
-This is a site which can be added to and modified directly by users without
-any special permission.  You can add your own zsh tips and configurations.
diff --git a/Doc/Zsh/mod_mathfunc.yo b/Doc/Zsh/mod_mathfunc.yo
index 8b72de3ab..428a5be47 100644
--- a/Doc/Zsh/mod_mathfunc.yo
+++ b/Doc/Zsh/mod_mathfunc.yo
@@ -24,9 +24,9 @@ The following functions take a single floating point argument: tt(acos),
 tt(acosh), tt(asin), tt(asinh), tt(atan), tt(atanh), tt(cbrt), tt(ceil),
 tt(cos), tt(cosh), tt(erf), tt(erfc), tt(exp), tt(expm1), tt(fabs),
 tt(floor), tt(gamma), tt(j0), tt(j1), tt(lgamma), tt(log), tt(log10),
-tt(log1p), tt(logb), tt(sin), tt(sinh), tt(sqrt), tt(tan), tt(tanh),
-tt(y0), tt(y1).  The tt(atan) function can optionally take a second
-argument, in which case it behaves like the C function tt(atan2).
+tt(log1p), tt(log2), tt(logb), tt(sin), tt(sinh), tt(sqrt), tt(tan),
+tt(tanh), tt(y0), tt(y1).  The tt(atan) function can optionally take a
+second argument, in which case it behaves like the C function tt(atan2).
 The tt(ilogb) function takes a single floating point argument, but
 returns an integer.
 
diff --git a/Doc/Zsh/mod_stat.yo b/Doc/Zsh/mod_stat.yo
index 96349061e..9caed1e45 100644
--- a/Doc/Zsh/mod_stat.yo
+++ b/Doc/Zsh/mod_stat.yo
@@ -114,7 +114,11 @@ named files; no list of file names is allowed in this case.
 )
 item(tt(-F) var(fmt))(
 Supplies a tt(strftime) (see manref(strftime)(3)) string for the
-formatting of the time elements.  The tt(-s) option is implied.
+formatting of the time elements.  The format string supports all of the
+zsh extensions described in
+ifzman(the section EXPANSION OF PROMPT SEQUENCES in zmanref(zshmisc))\
+ifnzman(noderef(Prompt Expansion)).
+The tt(-s) option is implied.
 )
 item(tt(-g))(
 Show the time elements in the GMT time zone.  The
diff --git a/Doc/Zsh/mod_system.yo b/Doc/Zsh/mod_system.yo
index 7f2009b43..a27bab47f 100644
--- a/Doc/Zsh/mod_system.yo
+++ b/Doc/Zsh/mod_system.yo
@@ -255,6 +255,11 @@ Returns the process ID of the parent of the current process, even in
 subshells.  Compare tt($PPID), which returns the process ID of the parent
 of the main shell process.
 )
+item(tt(procsubstpid))(
+Returns the process ID of the last process started for process
+substitution, i.e. the tt(<LPAR())var(...)tt(RPAR()) and
+tt(>LPAR())var(...)tt(RPAR()) expansions.
+)
 enditem()
 )
 enditem()
diff --git a/Doc/Zsh/mod_zutil.yo b/Doc/Zsh/mod_zutil.yo
index 8331eabb7..15f6ed365 100644
--- a/Doc/Zsh/mod_zutil.yo
+++ b/Doc/Zsh/mod_zutil.yo
@@ -172,6 +172,7 @@ printed below each other.  All strings without a colon are left
 unchanged and all strings with an empty var(right) string have the
 trailing colon removed.  In both cases the lengths of the strings
 are not used to determine how the other strings are to be aligned.
+A colon in the var(left) string can be escaped with a backslash.
 The resulting strings are stored in the var(array).
 )
 findex(zregexparse)
diff --git a/Doc/Zsh/prompt.yo b/Doc/Zsh/prompt.yo
index 3c8f2a094..909012c8e 100644
--- a/Doc/Zsh/prompt.yo
+++ b/Doc/Zsh/prompt.yo
@@ -198,11 +198,15 @@ endsitem()
 In addition, if the system supports the POSIX tt(gettimeofday) system
 call, tt(%.) provides decimal fractions of a second since the epoch with
 leading zeroes.  By default three decimal places are provided, but a
-number of digits up to 6 may be given following the tt(%); hence tt(%6.)
-outputs microseconds.  A typical example of this is the format
-`tt(%D{%H:%M:%S.%.})'.
+number of digits up to 9 may be given following the tt(%); hence tt(%6.)
+outputs microseconds, and tt(%9.) outputs nanoseconds.  (The latter
+requires a nanosecond-precision tt(clock_gettime); systems lacking this
+will return a value multiplied by the appropriate power of 10.)  A typical
+example of this is the format `tt(%D{%H:%M:%S.%.})'.
 
-The GNU extension that a `tt(-)' between the tt(%) and the
+The GNU extension tt(%N) is handled as a synonym for tt(%9.).
+
+Additionally, the GNU extension that a `tt(-)' between the tt(%) and the
 format character causes a leading zero or space to be stripped
 is handled directly by the shell for the format characters tt(d), tt(f),
 tt(H), tt(k), tt(l), tt(m), tt(M), tt(S) and tt(y); any other format
diff --git a/Doc/Zsh/zle.yo b/Doc/Zsh/zle.yo
index bd0252f6e..6ae4863c6 100644
--- a/Doc/Zsh/zle.yo
+++ b/Doc/Zsh/zle.yo
@@ -342,7 +342,7 @@ findex(vared)
 cindex(parameters, editing)
 cindex(editing parameters)
 redef(SPACES)(0)(tt(ifztexi(NOTRANS(@ @ @ @ @ @ ))ifnztexi(      )))
-xitem(tt(vared )[ tt(-Aache) ] [ tt(-p) var(prompt) ] [ tt(-r) var(rprompt) ])
+xitem(tt(vared )[ tt(-Aacghe) ] [ tt(-p) var(prompt) ] [ tt(-r) var(rprompt) ])
 xitem(SPACES()[ tt(-M) var(main-keymap) ] [ tt(-m) var(vicmd-keymap) ])
 xitem(SPACES()[ tt(-i) var(init-widget) ] [ tt(-f) var(finish-widget) ])
 item(SPACES()[ tt(-t) var(tty) ] var(name))(
@@ -353,7 +353,9 @@ When the tt(-c) flag is given, the parameter is created if it doesn't
 already exist.  The tt(-a) flag may be given with tt(-c) to create
 an array parameter, or the tt(-A) flag to create an associative array.
 If the type of an existing parameter does not match the type to be
-created, the parameter is unset and recreated.
+created, the parameter is unset and recreated.  The tt(-g) flag may
+be given to suppress warnings from the tt(WARN_CREATE_GLOBAL)
+and tt(WARN_NESTED_VAR) options.
 
 If an array or array slice is being edited, separator characters as defined
 in tt($IFS) will be shown quoted with a backslash, as will backslashes
@@ -1083,6 +1085,13 @@ wrappers of tt(bracketed-paste).  See also tt(zle -f).
 
 tt(YANK_ACTIVE) is read-only.
 )
+vindex(ZLE_RECURSIVE)
+item(tt(ZLE_RECURSIVE) (integer))(
+Usually zero, but incremented inside any instance of
+tt(recursive-edit).  Hence indicates the current recursion level.
+
+tt(ZLE_RECURSIVE) is read-only.
+)
 vindex(ZLE_STATE)
 item(tt(ZLE_STATE) (scalar))(
 Contains a set of space-separated words that describe the current tt(zle)