Merge git://git.kernel.org/pub/scm/gitk/gitk into maint

[git.git] / Documentation / technical / pack-heuristics.txt

diff --git a/Documentation/technical/pack-heuristics.txt b/Documentation/technical/pack-heuristics.txt
index eaab3eecd73427ccef02ef9ada0445a6f6ecd2ab..103eb5d989349c8e7e0147920b2e218caba9daf9 100644 (file)
--- a/Documentation/technical/pack-heuristics.txt
+++ b/Documentation/technical/pack-heuristics.txt
@@ -73,7 +73,7 @@ The traditional insight:
 
     <pasky> yes
 
 
     <pasky> yes
 

-And Bable-like confusion flowed.
+And Babel-like confusion flowed.

 
     <njs`> oh, hmm, and I'm not sure what this sliding window means either
 
 
     <njs`> oh, hmm, and I'm not sure what this sliding window means either
 


@@ -257,7 +257,7 @@ proclaim it a non-issue.  Good style too!
         (type, basename, size)).
 
         Then we walk through this list, and calculate a delta of
         (type, basename, size)).
 
         Then we walk through this list, and calculate a delta of

-        each object against the last n (tunable paramater) objects,
+        each object against the last n (tunable parameter) objects,

         and pick the smallest of these deltas.
 
 Vastly simplified, but the essence is there!
         and pick the smallest of these deltas.
 
 Vastly simplified, but the essence is there!


@@ -288,7 +288,7 @@ And of course there is the "Other Shoe" Factor too.
         - we actively try to generate deltas from a larger object to a
           smaller one
         - this means that the top-of-tree very seldom has deltas
         - we actively try to generate deltas from a larger object to a
           smaller one
         - this means that the top-of-tree very seldom has deltas

-          (ie deltas in _practice_ are "backwards deltas")
+          (i.e. deltas in _practice_ are "backwards deltas")

 
 Again, we should reread that whole paragraph.  Not just because
 Linus has slipped Linus's Law in there on us, but because it is
 
 Again, we should reread that whole paragraph.  Not just because
 Linus has slipped Linus's Law in there on us, but because it is


@@ -395,7 +395,7 @@ used as setup for a later optimization, which is a real word:
         do "object name->location in packfile" translation.
 
     <njs`> I'm assuming the real win for delta-ing large->small is
         do "object name->location in packfile" translation.
 
     <njs`> I'm assuming the real win for delta-ing large->small is

-        more homogenous statistics for gzip to run over?
+        more homogeneous statistics for gzip to run over?

 
         (You have to put the bytes in one place or another, but
         putting them in a larger blob wins on compression)
 
         (You have to put the bytes in one place or another, but
         putting them in a larger blob wins on compression)


@@ -448,7 +448,7 @@ design options, etc.
 
         Bugs happen, but they are "simple" bugs. And bugs that
         actually get some object store detail wrong are almost always
 
         Bugs happen, but they are "simple" bugs. And bugs that
         actually get some object store detail wrong are almost always

-        so obious that they never go anywhere.
+        so obvious that they never go anywhere.

 
     <njs`> Yeah.
 
 
     <njs`> Yeah.