Autogenerated HTML docs for v1.7.6-401-g6a319

1 files changed, 15 insertions, 12 deletions

diff --git a/gitattributes.html b/gitattributes.html
index fe9bd81f3..fca248c5f 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -497,7 +497,7 @@ for a single user should be placed in a file specified by the
 Attributes for all users on a system should be placed in the

 <tt>$(prefix)/etc/gitattributes</tt> file.</p></div>

 <div class="paragraph"><p>Sometimes you would need to override an setting of an attribute

-for a path to <tt>unspecified</tt> state.  This can be done by listing

+for a path to <tt>Unspecified</tt> state.  This can be done by listing

 the name of the attribute prefixed with an exclamation point <tt>!</tt>.</p></div>

 </div>

 <h2 id="_effects">EFFECTS</h2>

@@ -1307,7 +1307,7 @@ manually enable per-file encodings in its options.</p></div>
 <tt>gui.encoding</tt> configuration variable is used instead

 (See <a href="git-config.html">git-config(1)</a>).</p></div>

 </div>

-<h2 id="_using_attribute_macros">USING ATTRIBUTE MACROS</h2>

+<h2 id="_using_macro_attributes">USING MACRO ATTRIBUTES</h2>

 <div class="sectionbody">

 <div class="paragraph"><p>You do not want any end-of-line conversions applied to, nor textual diffs

 produced for, any binary file you track.  You would need to specify e.g.</p></div>

@@ -1316,21 +1316,24 @@ produced for, any binary file you track.  You would need to specify e.g.</p></di
 <pre><tt>*.jpg -text -diff</tt></pre>

 </div></div>

 <div class="paragraph"><p>but that may become cumbersome, when you have many attributes.  Using

-attribute macros, you can specify groups of attributes set or unset at

-the same time.  The system knows a built-in attribute macro, <tt>binary</tt>:</p></div>

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

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

+system knows a built-in macro attribute, <tt>binary</tt>:</p></div>

 <div class="listingblock">

 <div class="content">

 <pre><tt>*.jpg binary</tt></pre>

 </div></div>

-<div class="paragraph"><p>which is equivalent to the above.  Note that the attribute macros can only

-be "Set" (see the above example that sets "binary" macro as if it were an

-ordinary attribute --- setting it in turn unsets "text" and "diff").</p></div>

+<div class="paragraph"><p>Setting the "binary" attribute also unsets the "text" and "diff"

+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.</p></div>

 </div>

-<h2 id="_defining_attribute_macros">DEFINING ATTRIBUTE MACROS</h2>

+<h2 id="_defining_macro_attributes">DEFINING MACRO ATTRIBUTES</h2>

 <div class="sectionbody">

-<div class="paragraph"><p>Custom attribute macros can be defined only in the <tt>.gitattributes</tt> file

-at the toplevel (i.e. not in any subdirectory).  The built-in attribute

-macro "binary" is equivalent to:</p></div>

+<div class="paragraph"><p>Custom macro attributes can be defined only in the <tt>.gitattributes</tt>

+file at the toplevel (i.e. not in any subdirectory).  The built-in

+macro attribute "binary" is equivalent to:</p></div>

 <div class="listingblock">

 <div class="content">

 <pre><tt>[attr]binary -diff -text</tt></pre>

@@ -1398,7 +1401,7 @@ frotz   unspecified</tt></pre>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2011-05-25 23:59:09 UTC

+Last updated 2011-08-04 00:21:28 UTC

 </div>

 </div>

 </body>