[PATCH] Update some comments to make sense for -D.

[Joel E. Denny]

I pushed this to branch-2.5 and a similar patch to master.

>From 246c4efafed178058a22b96d7a046340f6119057 Mon Sep 17 00:00:00 2001
From: Joel E. Denny <address@hidden>
Date: Fri, 22 May 2009 01:39:07 -0400
Subject: [PATCH] Update some comments to make sense for -D.

* data/bison.m4 (b4_check_user_names): In header comments, say
"user occurrence" instead of "grammar occurrence".
* src/muscle_tab.h (muscle_percent_define_insert): Likewise.
(muscle_percent_code_grow): Likewise just for consistency.

diff --git a/data/bison.m4 b/data/bison.m4
index 00a42e2..585fb1d 100644
--- a/data/bison.m4
+++ b/data/bison.m4
@@ -317,8 +317,8 @@ b4_define_user_code([stype])
 # but is not used by Bison (as recorded by macros in the namespace
 # BISON-NAMESPACE).
 #
-# USER-LIST must expand to a list specifying all grammar occurrences of all
-# names of type WHAT.   Each item in the list must be a triplet specifying one
+# USER-LIST must expand to a list specifying all user occurrences of all names
+# of type WHAT.   Each item in the list must be a triplet specifying one
 # occurrence: name, start boundary, and end boundary.  Empty string names are
 # fine.  An empty list is fine.
 #
diff --git a/src/muscle_tab.h b/src/muscle_tab.h
index 19fba8b..21249b7 100644
--- a/src/muscle_tab.h
+++ b/src/muscle_tab.h
@@ -1,5 +1,6 @@
 /* Muscle table manager for Bison,
-   Copyright (C) 2001, 2002, 2003, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2006, 2007, 2009 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -123,9 +124,9 @@ void muscle_user_name_list_grow (char const *key, char 
const *user_name,
                                  location loc);
 
 /* Define the muscle for the %define variable VARIABLE appearing at
-   VARIABLE_LOC in the grammar file with value VALUE.  Warn if VARIABLE is
-   already defined.  Record this as a grammar occurrence of VARIABLE by
-   invoking muscle_user_name_list_grow.  */
+   VARIABLE_LOC with value VALUE.  Warn if VARIABLE is already defined.
+   Record this as a user occurrence of VARIABLE by invoking
+   muscle_user_name_list_grow.  */
 void muscle_percent_define_insert (char const *variable, location variable_loc,
                                    char const *value);
 
@@ -185,9 +186,10 @@ void muscle_percent_define_default (char const *variable, 
char const *value);
    output.  */
 void muscle_percent_define_check_values (char const * const *values);
 
-/* Grow the muscle for the %code qualifier QUALIFIER appearing at QUALIFIER_LOC
-   in the grammar file with code CODE appearing at CODE_LOC.  Record this as a
-   grammar occurrence of VARIABLE by invoking muscle_user_name_list_grow.  */
+/* Grow the muscle for the %code qualifier QUALIFIER appearing at
+   QUALIFIER_LOC with code CODE appearing at CODE_LOC.  Record this as a
+   user occurrence of QUALIFIER by invoking
+   muscle_user_name_list_grow.  */
 void muscle_percent_code_grow (char const *qualifier, location qualifier_loc,
                                char const *code, location code_loc);
 
-- 
1.5.4.3