gitattributes: Reword "attribute macro" to "macro attribute"

The new wording makes it clearer that such a beast is an attribute in
addition to being a macro (as opposed to being only a macro that is
used for attributes).

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index ccb3f3f14ef0a6e4029c32c5971d7652017617df..2bbe76b5d88e4a38f22bdaef8612a48ddf1fe8ba 100644 (file)
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -79,7 +79,7 @@ Attributes for all users on a system should be placed in the
 `$(prefix)/etc/gitattributes` file.
 
 Sometimes you would need to override an setting of an attribute
 `$(prefix)/etc/gitattributes` file.
 
 Sometimes you would need to override an setting of an attribute

-for a path to `unspecified` state.  This can be done by listing
+for a path to `Unspecified` state.  This can be done by listing

 the name of the attribute prefixed with an exclamation point `!`.
 
 
 the name of the attribute prefixed with an exclamation point `!`.
 
 


@@ -868,7 +868,7 @@ If this attribute is not set or has an invalid value, the value of the
 (See linkgit:git-config[1]).
 
 
 (See linkgit:git-config[1]).
 
 

-USING ATTRIBUTE MACROS
+USING MACRO ATTRIBUTES

 ----------------------
 
 You do not want any end-of-line conversions applied to, nor textual diffs
 ----------------------
 
 You do not want any end-of-line conversions applied to, nor textual diffs


@@ -879,27 +879,27 @@ produced for, any binary file you track.  You would need to specify e.g.
 ------------
 
 but that may become cumbersome, when you have many attributes.  Using
 ------------
 
 but that may become cumbersome, when you have many attributes.  Using

-attribute macros, you can define an attribute that, when set, also
+macro attributes, you can define an attribute that, when set, also

 sets or unsets a number of other attributes at the same time.  The
 sets or unsets a number of other attributes at the same time.  The

-system knows a built-in attribute macro, `binary`:
+system knows a built-in macro attribute, `binary`:

 
 ------------
 *.jpg binary
 ------------
 
 Setting the "binary" attribute also unsets the "text" and "diff"
 
 ------------
 *.jpg binary
 ------------
 
 Setting the "binary" attribute also unsets the "text" and "diff"

-attributes as above.  Note that attribute macros can only be "Set",
+attributes as above.  Note that macro attributes can only be "Set",

 though setting one might have the effect of setting or unsetting other
 attributes or even returning other attributes to the "Unspecified"
 state.
 
 
 though setting one might have the effect of setting or unsetting other
 attributes or even returning other attributes to the "Unspecified"
 state.
 
 

-DEFINING ATTRIBUTE MACROS
+DEFINING MACRO ATTRIBUTES

 -------------------------
 
 -------------------------
 

-Custom attribute macros can be defined only in the `.gitattributes` file
-at the toplevel (i.e. not in any subdirectory).  The built-in attribute
-macro "binary" is equivalent to:
+Custom macro attributes can be defined only in the `.gitattributes`
+file at the toplevel (i.e. not in any subdirectory).  The built-in
+macro attribute "binary" is equivalent to:

 
 ------------
 [attr]binary -diff -text
 
 ------------
 [attr]binary -diff -text