Autogenerated HTML docs for v1.5.4-rc0-7-g913b4

diff --git a/RelNotes-1.5.4.txt b/RelNotes-1.5.4.txt
index 6645565c5282c85a168aeff0e7fb16664d9120c5..d6fd3ddd1613b2e224ef5e3123376e40e66251fb 100644 (file)
--- a/RelNotes-1.5.4.txt
+++ b/RelNotes-1.5.4.txt
@@ -43,6 +43,17 @@ Deprecation notices
  * "git peek-remote" is deprecated, as "git ls-remote" was written in C
    and works for all transports, and will be removed in the future.
 
+ * From v1.5.5, the repack.usedeltabaseoffset config option will default
+   to true, which will give denser packfile (i.e. more efficient storage).
+   The downside is that git older than version 1.4.4 will not be able
+   to directly use a repository packed using this setting.
+
+ * From v1.5.5, the pack.indexversion config option will default to 2,
+   which is slightly more efficient, and makes repacking more immune to
+   data corruptions.  Git older than version 1.5.2 may revert to version 1
+   of the pack index with a manual "git index-pack" to be able to directly
+   access corresponding pack files.
+
 
 Updates since v1.5.3
 --------------------

diff --git a/user-manual.html b/user-manual.html
index ee9594bd1b5e82b5946bc458f423d5355f014d4c..a5f0932827568704ccb2a35f1194159d4421413c 100644 (file)
--- a/user-manual.html
+++ b/user-manual.html
@@ -777,7 +777,7 @@ use <code class="literal">git rebase</code> to rebase any already-published comm
           in <a href="#using-git-rebase" title="Keeping a patch series up to date using git-rebase">the section called “Keeping a patch series up to date using git-rebase”</a>).
 </li></ul></div><p>You may force git-push to perform the update anyway by preceding the
 branch name with a plus sign:</p><div class="literallayout"><p>$ git push ssh://yourserver.com/~you/proj.git +master</p></div><p>Normally whenever a branch head in a public repository is modified, it
-is modified to point to a descendent of the commit that it pointed to
+is modified to point to a descendant of the commit that it pointed to
 before.  By forcing a push in this situation, you break that convention.
 (See <a href="#problems-with-rewriting-history" title="Problems with rewriting history">the section called “Problems with rewriting history”</a>.)</p><p>Nevertheless, this is a common practice for people that need a simple
 way to publish a work-in-progress patch series, and it is an acceptable
@@ -1203,7 +1203,7 @@ a tree: The SHA1 name of a tree object (as defined below), representing
   the contents of a directory at a certain point in time.
 </li><li>
 parent(s): The SHA1 name of some number of commits which represent the
-  immediately prevoius step(s) in the history of the project.  The
+  immediately previous step(s) in the history of the project.  The
   example above has one parent; merge commits may have more than
   one.  A commit with no parents is called a "root" commit, and
   represents the initial revision of a project.  Each project must have
@@ -1368,7 +1368,7 @@ git directory using clone, or just using cp, tar, or any other backup
 mechanism.</p><p>As a last resort, you can search for the corrupted objects and attempt
 to replace them by hand.  Back up your repository before attempting this
 in case you corrupt things even more in the process.</p><p>We'll assume that the problem is a single missing or corrupted blob,
-which is sometimes a solveable problem.  (Recovering missing trees and
+which is sometimes a solvable problem.  (Recovering missing trees and
 especially commits is <span class="strong"><strong>much</strong></span> harder).</p><p>Before starting, verify that there is corruption, and figure out where
 it is with <a href="git-fsck.html" target="_top">git-fsck(1)</a>; this may be time-consuming.</p><p>Assume the output looks like this:</p><div class="literallayout"><p>$ git-fsck --full<br>
 broken link from    tree 2d9263c6d23595e7cb2a21e5ebbb53655278dff8<br>

diff --git a/user-manual.txt b/user-manual.txt
index 93a47b439b4504467fc5ba7612b8205367f347c2..f2b42068f3c0cfcd7e34aa46a2a83edd3dd6d587 100644 (file)
--- a/user-manual.txt
+++ b/user-manual.txt
@@ -1994,7 +1994,7 @@ $ git push ssh://yourserver.com/~you/proj.git +master
 -------------------------------------------------
 
 Normally whenever a branch head in a public repository is modified, it
-is modified to point to a descendent of the commit that it pointed to
+is modified to point to a descendant of the commit that it pointed to
 before.  By forcing a push in this situation, you break that convention.
 (See <<problems-with-rewriting-history>>.)
 
@@ -2921,7 +2921,7 @@ As you can see, a commit is defined by:
 - a tree: The SHA1 name of a tree object (as defined below), representing
   the contents of a directory at a certain point in time.
 - parent(s): The SHA1 name of some number of commits which represent the
-  immediately prevoius step(s) in the history of the project.  The
+  immediately previous step(s) in the history of the project.  The
   example above has one parent; merge commits may have more than
   one.  A commit with no parents is called a "root" commit, and
   represents the initial revision of a project.  Each project must have
@@ -3242,7 +3242,7 @@ to replace them by hand.  Back up your repository before attempting this
 in case you corrupt things even more in the process.
 
 We'll assume that the problem is a single missing or corrupted blob,
-which is sometimes a solveable problem.  (Recovering missing trees and
+which is sometimes a solvable problem.  (Recovering missing trees and
 especially commits is *much* harder).
 
 Before starting, verify that there is corruption, and figure out where