Autogenerated HTML docs for v1.6.2.1-299-g88f78

1 files changed, 37 insertions, 38 deletions

diff --git a/git-blame.html b/git-blame.html
index 8ea9dbb20..586583dd1 100644
--- a/git-blame.html
+++ b/git-blame.html
@@ -329,8 +329,8 @@ git-blame(1) Manual Page
 <div class="sectionbody">

 <div class="para"><p>Annotates each line in the given file with information from the revision which

 last modified the line. Optionally, start annotating from the given revision.</p></div>

-<div class="para"><p>Also it can limit the range of lines annotated.</p></div>

-<div class="para"><p>This report doesn't tell you anything about lines which have been deleted or

+<div class="para"><p>The command can also limit the range of lines annotated.</p></div>

+<div class="para"><p>The report does not tell you anything about lines which have been deleted or

 replaced; you need to use a tool such as <em>git-diff</em> or the "pickaxe"

 interface briefly mentioned in the following paragraph.</p></div>

 <div class="para"><p>Apart from supporting file annotation, git also supports searching the

@@ -428,7 +428,7 @@ of lines before or after the line given by &lt;start&gt;.</p></div>
 </dt>

 <dd>

 <p>

-        Use revs from revs-file instead of calling <a href="git-rev-list.html">git-rev-list(1)</a>.

+        Use revisions from revs-file instead of calling <a href="git-rev-list.html">git-rev-list(1)</a>.

 </p>

 </dd>

 <dt>

@@ -564,7 +564,7 @@ commit.</p></div>
         lines between files (see <tt>-C</tt>) and lines moved within a

         file (see <tt>-M</tt>).  The first number listed is the score.

         This is the number of alphanumeric characters detected

-        to be moved between or within files.  This must be above

+        as having been moved between or within files.  This must be above

         a certain threshold for <em>git-blame</em> to consider those lines

         of code to have been moved.

 </p>

@@ -577,9 +577,9 @@ commit.</p></div>
 </dt>

 <dd>

 <p>

-        Show filename in the original commit.  By default

-        filename is shown if there is any line that came from a

-        file with different name, due to rename detection.

+        Show the filename in the original commit.  By default

+        the filename is shown if there is any line that came from a

+        file with a different name, due to rename detection.

 </p>

 </dd>

 <dt>

@@ -590,7 +590,7 @@ commit.</p></div>
 </dt>

 <dd>

 <p>

-        Show line number in the original commit (Default: off).

+        Show the line number in the original commit (Default: off).

 </p>

 </dd>

 <dt>

@@ -598,7 +598,7 @@ commit.</p></div>
 </dt>

 <dd>

 <p>

-        Suppress author name and timestamp from the output.

+        Suppress the author name and timestamp from the output.

 </p>

 </dd>

 <dt>

@@ -606,8 +606,8 @@ commit.</p></div>
 </dt>

 <dd>

 <p>

-        Ignore whitespace when comparing parent's version and

-        child's to find where the lines came from.

+        Ignore whitespace when comparing the parent's version and

+        the child's to find where the lines came from.

 </p>

 </dd>

 </dl></div>

@@ -634,7 +634,7 @@ the line number of the line in the final file;
 </li>

 <li>

 <p>

-on a line that starts a group of line from a different

+on a line that starts a group of lines from a different

   commit than the previous one, the number of lines in this

   group.  On subsequent lines this field is absent.

 </p>

@@ -645,14 +645,14 @@ at least once for each commit:</p></div>
 <div class="ilist"><ul>

 <li>

 <p>

-author name ("author"), email ("author-mail"), time

+the author name ("author"), email ("author-mail"), time

   ("author-time"), and timezone ("author-tz"); similarly

   for committer.

 </p>

 </li>

 <li>

 <p>

-filename in the commit the line is attributed to.

+the filename in the commit that the line is attributed to.

 </p>

 </li>

 <li>

@@ -667,10 +667,10 @@ header elements later.</p></div>
 </div>

 <h2 id="_specifying_ranges">SPECIFYING RANGES</h2>

 <div class="sectionbody">

-<div class="para"><p>Unlike <em>git-blame</em> and <em>git-annotate</em> in older git, the extent

-of annotation can be limited to both line ranges and revision

+<div class="para"><p>Unlike <em>git-blame</em> and <em>git-annotate</em> in older versions of git, the extent

+of the annotation can be limited to both line ranges and revision

 ranges.  When you are interested in finding the origin for

-ll. 40-60 for file <tt>foo</tt>, you can use <tt>-L</tt> option like these

+lines 40-60 for file <tt>foo</tt>, you can use the <tt>-L</tt> option like so

 (they mean the same thing &#8212; both ask for 21 lines starting at

 line 40):</p></div>

 <div class="literalblock">

@@ -678,13 +678,13 @@ line 40):</p></div>
 <pre><tt>git blame -L 40,60 foo

 git blame -L 40,+21 foo</tt></pre>

 </div></div>

-<div class="para"><p>Also you can use regular expression to specify the line range.</p></div>

+<div class="para"><p>Also you can use a regular expression to specify the line range:</p></div>

 <div class="literalblock">

 <div class="content">

 <pre><tt>git blame -L '/^sub hello {/,/^}$/' foo</tt></pre>

 </div></div>

-<div class="para"><p>would limit the annotation to the body of <tt>hello</tt> subroutine.</p></div>

-<div class="para"><p>When you are not interested in changes older than the version

+<div class="para"><p>which limits the annotation to the body of the <tt>hello</tt> subroutine.</p></div>

+<div class="para"><p>When you are not interested in changes older than version

 v2.6.18, or changes older than 3 weeks, you can use revision

 range specifiers  similar to <em>git-rev-list</em>:</p></div>

 <div class="literalblock">

@@ -697,7 +697,7 @@ lines that have not changed since the range boundary (either the
 commit v2.6.18 or the most recent commit that is more than 3

 weeks old in the above example) are blamed for that range

 boundary commit.</p></div>

-<div class="para"><p>A particularly useful way is to see if an added file have lines

+<div class="para"><p>A particularly useful way is to see if an added file has lines

 created by copy-and-paste from existing files.  Sometimes this

 indicates that the developer was being sloppy and did not

 refactor the code properly.  You can first find the commit that

@@ -736,22 +736,22 @@ Each blame entry always starts with a line of:
 </li>

 <li>

 <p>

-The first time that commit shows up in the stream, it has various

+The first time that a commit shows up in the stream, it has various

   other information about it printed out with a one-word tag at the

-  beginning of each line about that "extended commit info" (author,

-  email, committer, dates, summary etc).

+  beginning of each line describing the extra commit information (author,

+  email, committer, dates, summary, etc.).

 </p>

 </li>

 <li>

 <p>

-Unlike Porcelain format, the filename information is always

+Unlike the Porcelain format, the filename information is always

   given and terminates the entry:

 </p>

 <div class="literalblock">

 <div class="content">

 <pre><tt>"filename" &lt;whitespace-quoted-filename-goes-here&gt;</tt></pre>

 </div></div>

-<div class="para"><p>and thus it's really quite easy to parse for some line- and word-oriented

+<div class="para"><p>and thus it is really quite easy to parse for some line- and word-oriented

 parser (which should be quite natural for most scripting languages).</p></div>

 <div class="admonitionblock">

 <table><tr>

@@ -759,11 +759,11 @@ parser (which should be quite natural for most scripting languages).</p></div>
 <div class="title">Note</div>

 </td>

 <td class="content">For people who do parsing: to make it more robust, just ignore any

-lines in between the first and last one ("&lt;sha1&gt;" and "filename" lines)

-where you don't recognize the tag-words (or care about that particular

+lines between the first and last one ("&lt;sha1&gt;" and "filename" lines)

+where you do not recognize the tag words (or care about that particular

 one) at the beginning of the "extended information" lines. That way, if

 there is ever added information (like the commit encoding or extended

-commit commentary), a blame viewer won't ever care.</td>

+commit commentary), a blame viewer will not care.</td>

 </tr></table>

 </div>

 </li>

@@ -777,24 +777,23 @@ is used to map author and committer names and email addresses to
 canonical real names and email addresses.</p></div>

 <div class="para"><p>In the simple form, each line in the file consists of the canonical

 real name of an author, whitespace, and an email address used in the

-commit (enclosed by <em>&lt;</em> and <em>&gt;</em>) to map to the name. Thus, looks like

-this</p></div>

+commit (enclosed by <em>&lt;</em> and <em>&gt;</em>) to map to the name. For example:</p></div>

 <div class="literalblock">

 <div class="content">

 <pre><tt>Proper Name &lt;commit@email.xx&gt;</tt></pre>

 </div></div>

-<div class="para"><p>The more complex forms are</p></div>

+<div class="para"><p>The more complex forms are:</p></div>

 <div class="literalblock">

 <div class="content">

 <pre><tt>&lt;proper@email.xx&gt; &lt;commit@email.xx&gt;</tt></pre>

 </div></div>

-<div class="para"><p>which allows mailmap to replace only the email part of a commit, and</p></div>

+<div class="para"><p>which allows mailmap to replace only the email part of a commit, and:</p></div>

 <div class="literalblock">

 <div class="content">

 <pre><tt>Proper Name &lt;proper@email.xx&gt; &lt;commit@email.xx&gt;</tt></pre>

 </div></div>

 <div class="para"><p>which allows mailmap to replace both the name and the email of a

-commit matching the specified commit email address, and</p></div>

+commit matching the specified commit email address, and:</p></div>

 <div class="literalblock">

 <div class="content">

 <pre><tt>Proper Name &lt;proper@email.xx&gt; Commit Name &lt;commit@email.xx&gt;</tt></pre>

@@ -819,8 +818,8 @@ would look like:</p></div>
 <pre><tt>Jane Doe         &lt;jane@desktop.(none)&gt;

 Joe R. Developer &lt;joe@example.com&gt;</tt></pre>

 </div></div>

-<div class="para"><p>Note how we don't need an entry for &lt;jane@laptop.(none)&gt;, because the

-real name of that author is correct already.</p></div>

+<div class="para"><p>Note how there is no need for an entry for &lt;jane@laptop.(none)&gt;, because the

+real name of that author is already correct.</p></div>

 <div class="para"><p>Example 2: Your repository contains commits from the following

 authors:</p></div>

 <div class="listingblock">

@@ -832,7 +831,7 @@ santa &lt;me@company.xx&gt;
 claus &lt;me@company.xx&gt;

 CTO &lt;cto@coompany.xx&gt;</tt></pre>

 </div></div>

-<div class="para"><p>Then, you might want a <tt>.mailmap</tt> file looking like:</p></div>

+<div class="para"><p>Then you might want a <tt>.mailmap</tt> file that looks like:</p></div>

 <div class="listingblock">

 <div class="content">

 <pre><tt>&lt;cto@company.xx&gt;                       &lt;cto@coompany.xx&gt;

@@ -858,7 +857,7 @@ the email address.</p></div>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2009-03-11 23:56:00 UTC

+Last updated 2009-03-22 08:21:21 UTC

 </div>

 </div>

 </body>