Autogenerated HTML docs for v1.6.0.2-287-g3791f

1 files changed, 10 insertions, 10 deletions

diff --git a/gitattributes.html b/gitattributes.html
index 30d3c5d67..450859849 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -595,26 +595,26 @@ with the above configuration, i.e. <tt>j-c-diff</tt>, with 7
 parameters, just like <tt>GIT_EXTERNAL_DIFF</tt> program is called.

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

 <h4 id="_defining_a_custom_hunk_header">Defining a custom hunk-header</h4>

-<div class="para"><p>Each group of changes (called "hunk") in the textual diff output

+<div class="para"><p>Each group of changes (called a "hunk") in the textual diff output

 is prefixed with a line of the form:</p></div>

 <div class="literalblock">

 <div class="content">

 <pre><tt>@@ -k,l +n,m @@ TEXT</tt></pre>

 </div></div>

-<div class="para"><p>The text is called <em>hunk header</em>, and by default a line that

-begins with an alphabet, an underscore or a dollar sign is used,

-which matches what GNU <em>diff -p</em> output uses.  This default

-selection however is not suited for some contents, and you can

-use customized pattern to make a selection.</p></div>

-<div class="para"><p>First in .gitattributes, you would assign the <tt>diff</tt> attribute

+<div class="para"><p>This is called a <em>hunk header</em>.  The "TEXT" portion is by default a line

+that begins with an alphabet, an underscore or a dollar sign; this

+matches what GNU <em>diff -p</em> output uses.  This default selection however

+is not suited for some contents, and you can use a customized pattern

+to make a selection.</p></div>

+<div class="para"><p>First, in .gitattributes, you would assign the <tt>diff</tt> attribute

 for paths.</p></div>

 <div class="listingblock">

 <div class="content">

 <pre><tt>*.tex   diff=tex</tt></pre>

 </div></div>

-<div class="para"><p>Then, you would define "diff.tex.funcname" configuration to

+<div class="para"><p>Then, you would define a "diff.tex.funcname" configuration to

 specify a regular expression that matches a line that you would

-want to appear as the hunk header, like this:</p></div>

+want to appear as the hunk header "TEXT", like this:</p></div>

 <div class="listingblock">

 <div class="content">

 <pre><tt>[diff "tex"]

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

 <div id="footer">

 <div id="footer-text">

-Last updated 2008-09-13 06:06:59 UTC

+Last updated 2008-09-19 06:26:35 UTC

 </div>

 </div>

 </body>