24483: minor sectioning fixes in doc

24485: note on includes for term.h

4 files changed, 20 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 468ce0590..4fa17a5b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-01-29  Peter Stephenson  <pws@csr.com>
 
+	* 24485: INSTALL: note that term.h may need CPPFLAGS=-I...
+	if it's to be included from the curses library directory.
+
+	* 24483: Doc/Zsh/prompt.yo, Doc/Zsh/zle.yo: some minor
+	sectioning problems.
+
 	* users/12498: Doc/Zsh/contrib.yo: missing section spotted
 	by Vincent.
 
diff --git a/Doc/Zsh/prompt.yo b/Doc/Zsh/prompt.yo
index 17d17fbbb..456a0bc0e 100644
--- a/Doc/Zsh/prompt.yo
+++ b/Doc/Zsh/prompt.yo
@@ -1,8 +1,6 @@
 texinode(Prompt Expansion)(Expansion)(Conditional Expressions)(Top)
 chapter(Prompt Expansion)
-ifzman(\
-sect(Prompt Expansion)
-)\
+sect(Expansion of Prompt Sequences)
 cindex(prompt expansion)
 cindex(expansion, prompt)
 Prompt sequences undergo a special form of expansion.  This type of expansion
@@ -31,9 +29,13 @@ represented as `tt(!!)'.
 pindex(PROMPT_PERCENT, use of)
 If the tt(PROMPT_PERCENT) option is set, certain escape sequences that
 start with `tt(%)' are expanded.
-Some escapes take an optional integer argument, which
+Many escapes are followed by a single character, although some of these
+take an optional integer argument that
 should appear between the `tt(%)' and the next character of the
-sequence.  The following escape sequences are recognized:
+sequence.  More complicated escape sequences are available to provide
+conditional expansion.
+
+sect(Simple Prompt Escapes)
 
 subsect(Special characters)
 startitem()
@@ -188,7 +190,7 @@ position.  Brace pairs can nest.
 )
 enditem()
 
-subsect(Conditional substrings)
+sect(Conditional Substrings in Prompts)
 startitem()
 item(tt(%v))(
 vindex(psvar, use of)
diff --git a/Doc/Zsh/zle.yo b/Doc/Zsh/zle.yo
index db4becd74..edfc17ab4 100644
--- a/Doc/Zsh/zle.yo
+++ b/Doc/Zsh/zle.yo
@@ -784,7 +784,7 @@ defined with tt(zle -N) this is set to the empty string.  Read-only.
 )
 enditem()
 
-subsect(Special Widget)
+subsect(Special Widgets)
 
 There are a few user-defined widgets which are special to the shell.
 If they do not exist, no special action is taken.  The environment
diff --git a/INSTALL b/INSTALL
index 423a123e0..1791adcf2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -336,6 +336,11 @@ CPPFLAGS=-I/usr/local/include (or wherever the header is found) to
 configure.  Similarly, you may need to pass LDFLAGS=-L/usr/local/lib
 (or wherever) in order to find the library.
 
+You may also need to add headers if you need to include the file term.h
+from an installation of an ncurses variant instead of from the system
+directories.  For example, CPPFLAGS=-I/usr/local/include/ncursesw will
+force configure to search for term.h in the given directory.
+
 On some systems a suitable development package with a name such as
 curses-devel or ncurses-devel needs to be installed before zsh can
 be compiled.  This is likely to be contained on any installation media,