From b3d5284674bde17e7070132a990f93bc7c202bbc Mon Sep 17 00:00:00 2001
From: psmith <psmith>
Date: Mon, 2 May 2011 15:11:23 +0000
Subject: [PATCH] Updated documentation to fix Savannah bugs #32058 and #31582

---
 ChangeLog     |  5 +++++
 doc/make.texi | 27 +++++++++++++++++++--------
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b3fed57..263aa2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-05-02  Paul Smith  <psmith@gnu.org>
 
+	* doc/make.texi (Special Variables): Add documentation for the new
+	words in .FEATURES.  Fixes Savannah bug #32058.
+	(Flavor Function): Rewrite the section on the flavor function.
+	Fixes Savannah bug #31582.
+
 	* function.c (func_sort): Use the same algorithm to count the
 	number of words we will get after the split, as we use to split.
 	Based on a patch from Matthias Hopf.  Fixes Savannah bug #33125.
diff --git a/doc/make.texi b/doc/make.texi
index e266707..c1ffb07 100644
--- a/doc/make.texi
+++ b/doc/make.texi
@@ -4,7 +4,7 @@
 
 @include version.texi
 @set EDITION 0.71
-@set RCSID $Id: make.texi,v 1.71 2011/04/18 01:25:21 psmith Exp $
+@set RCSID $Id: make.texi,v 1.72 2011/05/02 15:11:23 psmith Exp $
 
 @settitle GNU @code{make}
 @setchapternewpage odd
@@ -6183,17 +6183,29 @@ Syntax, ,Syntax of Conditionals}.
 Supports ``job server'' enhanced parallel builds.  @xref{Parallel,
 ,Parallel Execution}.
 
-@item second-expansion
-Supports secondary expansion of prerequisite lists.
+@item oneshell
+Supports the @code{.ONESHELL} special target.  @xref{One Shell, ,Using
+One Shell}.
 
 @item order-only
 Supports order-only prerequisites.  @xref{Prerequisite Types, ,Types
 of Prerequisites}.
 
+@item second-expansion
+Supports secondary expansion of prerequisite lists.
+
+@item shortest-stem
+Uses the ``shortest stem'' method of choosing which pattern, of
+multiple applicable options, will be used.  @xref{Pattern Match, ,How
+Patterns Match}.
+
 @item target-specific
 Supports target-specific and pattern-specific variable assignments.
 @xref{Target-specific, ,Target-specific Variable Values}.
 
+@item undefine
+Supports the @code{undefine} directive.  @xref{Undefine Directive}.
+
 @end table
 
 @vindex .INCLUDE_DIRS @r{(list of include directories)}
@@ -7595,11 +7607,10 @@ Here the redefinition takes place if @samp{$(origin bletch)} returns either
 @cindex variables, flavor of
 @cindex flavor of variable
 
-The @code{flavor} function is unlike most other functions (and like
-@code{origin} function) in that it does not operate on the values of
-variables; it tells you something @emph{about} a variable.
-Specifically, it tells you the flavor of a variable (@pxref{Flavors,
-,The Two Flavors of Variables}).
+The @code{flavor} function, like the @code{origin} function, does not
+operate on the values of variables but rather it tells you something
+@emph{about} a variable.  Specifically, it tells you the flavor of a
+variable (@pxref{Flavors, ,The Two Flavors of Variables}).
 
 The syntax of the @code{flavor} function is:
 
-- 
2.11.4.GIT