From b197c9dbfb79798cd48b49d2180ad212af6c9a46 Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikachu@gmail.com>
Date: Fri, 27 May 2011 15:57:50 +0000
Subject: 29385: document when local-directories is used instead of directories

---
 ChangeLog          | 5 ++++-
 Doc/Zsh/compsys.yo | 7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6c96647a4..94b52c503 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,9 @@
 	* 29387: Completion/Unix/Command/.distfiles,
 	Completion/Unix/Command/_at: Add completion for at and friends.
 
+	* 29385: Doc/Zsh/compsys.yo: Document when directories and
+	local-directories are used.
+
 2011-05-27  Barton E. Schaefer  <schaefer@zsh.org>
 
 	* 29382: Src/Modules/curses.c: apply 29374 to zccmd_input too.
@@ -14867,5 +14870,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5342 $
+* $Revision: 1.5343 $
 *****************************************************
diff --git a/Doc/Zsh/compsys.yo b/Doc/Zsh/compsys.yo
index e08892241..ad2562a26 100644
--- a/Doc/Zsh/compsys.yo
+++ b/Doc/Zsh/compsys.yo
@@ -786,7 +786,9 @@ for names of device special files
 )
 kindex(directories, completion tag)
 item(tt(directories))(
-for names of directories
+for names of directories DASH()- tt(local-directories) is used instead
+when completing arguments of tt(cd) and related builtin commands when
+the tt(cdpath) array is set
 )
 kindex(directory-stack, completion tag)
 item(tt(directory-stack))(
@@ -879,7 +881,8 @@ kindex(local-directories, completion tag)
 item(tt(local-directories))(
 for names of directories that are subdirectories of the current working
 directory when completing arguments of tt(cd) and related builtin
-commands (compare tt(path-directories))
+commands (compare tt(path-directories)) DASH()- when the tt(cdpath)
+array is unset, tt(directories) is used instead
 )
 kindex(manuals, completion tag)
 item(tt(manuals))(
-- 
cgit 1.4.1