Autogenerated HTML docs for v1.5.3-rc6-23-g0058

1 files changed, 10 insertions, 10 deletions

diff --git a/git-fast-import.html b/git-fast-import.html
index 8e50ca467..22f72bd5c 100644
--- a/git-fast-import.html
+++ b/git-fast-import.html
@@ -543,7 +543,7 @@ the frontend should let fast-import handle the parsing and conversion
 been well tested in the wild.</p>

 <p>Frontends should prefer the <tt>raw</tt> format if the source material

 already uses UNIX-epoch format, can be coaxed to give dates in that

-format, or its format is easiliy convertible to it, as there is no

+format, or its format is easily convertible to it, as there is no

 ambiguity in parsing.</p>

 </dd>

 <dt>

@@ -673,7 +673,7 @@ UTF-8, as fast-import does not permit other encodings to be specified.</p>
 and <tt>filedeleteall</tt> commands

 may be included to update the contents of the branch prior to

 creating the commit.  These commands may be supplied in any order.

-However it is recommended that a <tt>filedeleteall</tt> command preceed

+However it is recommended that a <tt>filedeleteall</tt> command precede

 all <tt>filemodify</tt>, <tt>filecopy</tt> and <tt>filerename</tt> commands in the same

 commit, as <tt>filedeleteall</tt>

 wipes the branch clean (see below).</p>

@@ -725,7 +725,7 @@ A mark reference, <tt>:&lt;idnum&gt;</tt>, where <tt>&lt;idnum&gt;</tt> is the m
 </p>

 <p>The reason fast-import uses <tt>:</tt> to denote a mark reference is this character

 is not legal in a Git branch name.  The leading <tt>:</tt> makes it easy

-to distingush between the mark 42 (<tt>:42</tt>) and the branch 42 (<tt>42</tt>

+to distinguish between the mark 42 (<tt>:42</tt>) and the branch 42 (<tt>42</tt>

 or <tt>refs/heads/42</tt>), or an abbreviated SHA-1 which happened to

 consist only of base-10 digits.</p>

 <p>Marks must be declared (via <tt>mark</tt>) before they can be used.</p>

@@ -830,7 +830,7 @@ slash <tt>/</tt>), may contain any byte other than <tt>LF</tt>, and must not
 start with double quote (<tt>"</tt>).</p>

 <p>If an <tt>LF</tt> or double quote must be encoded into <tt>&lt;path&gt;</tt> shell-style

 quoting should be used, e.g. <tt>"path/with\n and \" in it"</tt>.</p>

-<p>The value of <tt>&lt;path&gt;</tt> must be in canoncial form. That is it must not:</p>

+<p>The value of <tt>&lt;path&gt;</tt> must be in canonical form. That is it must not:</p>

 <ul>

 <li>

 <p>

@@ -1061,7 +1061,7 @@ Delimited format
 <p>

         A delimiter string is used to mark the end of the data.

         fast-import will compute the length by searching for the delimiter.

-        This format is primarly useful for testing and is not

+        This format is primarily useful for testing and is not

         recommended for real data.

 </p>

 <div class="literalblock">

@@ -1179,7 +1179,7 @@ files.</p>
 to remove the dummy branch.</p>

 <h3>Import Now, Repack Later</h3>

 <p>As soon as fast-import completes the Git repository is completely valid

-and ready for use.  Typicallly this takes only a very short time,

+and ready for use.  Typically this takes only a very short time,

 even for considerably large projects (100,000+ commits).</p>

 <p>However repacking the repository is necessary to improve data

 locality and access performance.  It can also take hours on extremely

@@ -1237,8 +1237,8 @@ final packfile size (30-50% smaller can be quite typical).</p>
 <div class="sectionbody">

 <p>There are a number of factors which affect how much memory fast-import

 requires to perform an import.  Like critical sections of core

-Git, fast-import uses its own memory allocators to ammortize any overheads

-associated with malloc.  In practice fast-import tends to ammoritize any

+Git, fast-import uses its own memory allocators to amortize any overheads

+associated with malloc.  In practice fast-import tends to amortize any

 malloc overheads to 0, due to its use of large block allocations.</p>

 <h3>per object</h3>

 <p>fast-import maintains an in-memory structure for every object written in

@@ -1282,7 +1282,7 @@ increased or decreased on the command line with --active-branches=.</p>
 <h3>per active tree</h3>

 <p>Trees (aka directories) use just 12 bytes of memory on top of the

 memory required for their entries (see &#8220;per active file&#8221; below).

-The cost of a tree is virtually 0, as its overhead ammortizes out

+The cost of a tree is virtually 0, as its overhead amortizes out

 over the individual file entries.</p>

 <h3>per active file entry</h3>

 <p>Files (and pointers to subtrees) within active trees require 52 or 64

@@ -1309,7 +1309,7 @@ memory footprint (less than 2.7 MiB per active branch).</p>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 19-Aug-2007 19:15:24 UTC

+Last updated 25-Aug-2007 03:53:08 UTC

 </div>

 </div>

 </body>