[PATCH] Docs: `and' -> `but'; add missing `the'

[Michael Witten]

Signed-off-by: Michael Witten <address@hidden>
---
 doc/make.texi |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/doc/make.texi b/doc/make.texi
index 298d0ce..13cecbd 100644
--- a/doc/make.texi
+++ b/doc/make.texi
@@ -7554,7 +7554,7 @@ 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
+The @code{flavor} function is unlike most other functions (but like the
 @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,
-- 
1.7.4.18.g68fe8