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>
Michael Haggerty committed
Aug 3, 2011 at 15:41 UTC
0922570c76ae407e30477d27d72bb9d72c4b65f9
1 file changed
+9
-9
Documentation/gitattributes.txt
+9
-9
@@ -79,7 +79,7 @@ Attributes for all users on a system should be placed in the
79
`$(prefix)/etc/gitattributes` file.
80
81
Sometimes you would need to override an setting of an attribute
82
-for a path to `unspecified` state. This can be done by listing
82
+for a path to `Unspecified` state. This can be done by listing
83
the name of the attribute prefixed with an exclamation point `!`.
84
85
@@ -868,7 +868,7 @@ If this attribute is not set or has an invalid value, the value of the
868
(See linkgit:git-config[1]).
869
870
871
-USING ATTRIBUTE MACROS
871
+USING MACRO ATTRIBUTES
872
----------------------
873
874
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.
879
------------
880
881
but that may become cumbersome, when you have many attributes. Using
882
-attribute macros, you can define an attribute that, when set, also
882
+macro attributes, you can define an attribute that, when set, also
883
sets or unsets a number of other attributes at the same time. The
884
-system knows a built-in attribute macro, `binary`:
884
+system knows a built-in macro attribute, `binary`:
885
886
------------
887
*.jpg binary
888
------------
889
890
Setting the "binary" attribute also unsets the "text" and "diff"
891
-attributes as above. Note that attribute macros can only be "Set",
891
+attributes as above. Note that macro attributes can only be "Set",
892
though setting one might have the effect of setting or unsetting other
893
attributes or even returning other attributes to the "Unspecified"
894
state.
895
896
897
-DEFINING ATTRIBUTE MACROS
897
+DEFINING MACRO ATTRIBUTES
898
-------------------------
899
900
-Custom attribute macros can be defined only in the `.gitattributes` file
901
-at the toplevel (i.e. not in any subdirectory). The built-in attribute
902
-macro "binary" is equivalent to:
900
+Custom macro attributes can be defined only in the `.gitattributes`
901
+file at the toplevel (i.e. not in any subdirectory). The built-in
902
+macro attribute "binary" is equivalent to:
903
904
------------
905
[attr]binary -diff -text