From 21c0b42d4578867273ad6bc14fb225d61aa6f67e Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junio@hera.kernel.org>
Date: Thu, 12 Oct 2006 19:10:36 +0000
Subject: [PATCH] Autogenerated HTML docs for v1.4.3-rc2-g23bed

---
 git-http-push.html | 12 +++++++++---
 git-http-push.txt  |  2 +-
 git-send-pack.html | 12 +++++++++---
 git-send-pack.txt  |  2 +-
 git-shortlog.html  | 12 +++++++++---
 git-shortlog.txt   |  4 ++--
 glossary.html      | 24 +++++++++++++++++++++---
 glossary.txt       |  4 ++--
 8 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/git-http-push.html b/git-http-push.html
index 687e213fb..a8f8ab6cb 100644
--- a/git-http-push.html
+++ b/git-http-push.html
@@ -313,9 +313,15 @@ remote branch.</p>
         list of objects successfully sent to the remote repository.
 </p>
 </dd>
+<dt>
+&lt;ref&gt;&#8230;
+</dt>
+<dd>
+<p>
+        The remote refs to update.
+</p>
+</dd>
 </dl>
-<p>&lt;ref&gt;&#8230;:
-        The remote refs to update.</p>
 </div>
 <h2>Specifying the Refs</h2>
 <div class="sectionbody">
@@ -379,7 +385,7 @@ to disable the fast-forward check only on that ref.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 03-Oct-2006 08:41:07 UTC
+Last updated 12-Oct-2006 19:10:26 UTC
 </div>
 </div>
 </body>
diff --git a/git-http-push.txt b/git-http-push.txt
index 7e1f894a9..c2485c6e9 100644
--- a/git-http-push.txt
+++ b/git-http-push.txt
@@ -34,7 +34,7 @@ OPTIONS
 	Report the list of objects being walked locally and the
 	list of objects successfully sent to the remote repository.
 
-<ref>...:
+<ref>...::
 	The remote refs to update.
 
 
diff --git a/git-send-pack.html b/git-send-pack.html
index 9b2e2cc5a..2da40382b 100644
--- a/git-send-pack.html
+++ b/git-send-pack.html
@@ -332,9 +332,15 @@ updates it from the current repository, sending named refs.</p>
         The repository to update.
 </p>
 </dd>
+<dt>
+&lt;ref&gt;&#8230;
+</dt>
+<dd>
+<p>
+        The remote refs to update.
+</p>
+</dd>
 </dl>
-<p>&lt;ref&gt;&#8230;:
-        The remote refs to update.</p>
 </div>
 <h2>Specifying the Refs</h2>
 <div class="sectionbody">
@@ -410,7 +416,7 @@ to disable the fast-forward check only on that ref.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 03-Oct-2006 08:41:27 UTC
+Last updated 12-Oct-2006 19:10:26 UTC
 </div>
 </div>
 </body>
diff --git a/git-send-pack.txt b/git-send-pack.txt
index 9e67f1730..5376f6854 100644
--- a/git-send-pack.txt
+++ b/git-send-pack.txt
@@ -43,7 +43,7 @@ OPTIONS
 <directory>::
 	The repository to update.
 
-<ref>...:
+<ref>...::
 	The remote refs to update.
 
 
diff --git a/git-shortlog.html b/git-shortlog.html
index 7af741e44..50d52c76d 100644
--- a/git-shortlog.html
+++ b/git-shortlog.html
@@ -301,9 +301,15 @@ the first line of the commit message will be shown.</p>
         of author alphabetic order.
 </p>
 </dd>
+<dt>
+-s
+</dt>
+<dd>
+<p>
+        Supress commit description and provide a commit count summary only.
+</p>
+</dd>
 </dl>
-<p>-s:
-        Supress commit description and Provide a commit count summary only.</p>
 </div>
 <h2>FILES</h2>
 <div class="sectionbody">
@@ -341,7 +347,7 @@ Eve Jones &lt;eve@laptop.(none)&gt;</tt></pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 10-Oct-2006 04:36:07 UTC
+Last updated 12-Oct-2006 19:10:27 UTC
 </div>
 </div>
 </body>
diff --git a/git-shortlog.txt b/git-shortlog.txt
index 1601d2267..d54fc3e5c 100644
--- a/git-shortlog.txt
+++ b/git-shortlog.txt
@@ -27,8 +27,8 @@ OPTIONS
 	Sort output according to the number of commits per author instead
 	of author alphabetic order.
 
--s:
-	Supress commit description and Provide a commit count summary only.
+-s::
+	Supress commit description and provide a commit count summary only.
 
 FILES
 -----
diff --git a/glossary.html b/glossary.html
index dcdcdb228..cb6ad8d6f 100644
--- a/glossary.html
+++ b/glossary.html
@@ -637,6 +637,16 @@ div.exampleblock-content {
 </p>
 </dd>
 <dt>
+<a id="ref_object_type"></a>object type
+</dt>
+<dd>
+<p>
+        One of the identifiers
+        "<a href="#ref_commit">commit</a>","<a href="#ref_tree">tree</a>","<a href="#ref_tag">tag</a>" and "blob"
+        describing the type of an <a href="#ref_object">object</a>.
+</p>
+</dd>
+<dt>
 <a id="ref_octopus"></a>octopus
 </dt>
 <dd>
@@ -859,8 +869,8 @@ div.exampleblock-content {
         a <a href="#ref_tag">tag</a> is not changed by a <a href="#ref_commit">commit</a>. Tags (not
         <a href="#ref_tag">tag</a> objects) are stored in <tt>$GIT_DIR/refs/tags/</tt>. A git
         <a href="#ref_tag">tag</a> has nothing to do with a Lisp <a href="#ref_tag">tag</a> (which is
-        called <a href="#ref_object">object</a> type in git's context). A <a href="#ref_tag">tag</a>
-        is most typically used to mark a particular point in the
+        called <a href="#ref_object_type">object type</a> in git's context). A
+        <a href="#ref_tag">tag</a> is most typically used to mark a particular point in the
         <a href="#ref_commit">commit</a> ancestry <a href="#ref_chain">chain</a>.
 </p>
 </dd>
@@ -928,6 +938,14 @@ div.exampleblock-content {
 </p>
 </dd>
 <dt>
+<a id="ref_unmerged_index"></a>unmerged index
+</dt>
+<dd>
+<p>
+        An <a href="#ref_index">index</a> which contains <a href="#ref_unmerged_index">unmerged         index</a> entries.
+</p>
+</dd>
+<dt>
 <a id="ref_working_tree"></a>working tree
 </dt>
 <dd>
@@ -950,7 +968,7 @@ the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 03-Oct-2006 08:41:49 UTC
+Last updated 12-Oct-2006 19:10:27 UTC
 </div>
 </div>
 </body>
diff --git a/glossary.txt b/glossary.txt
index 14449ca8b..7e560b0ee 100644
--- a/glossary.txt
+++ b/glossary.txt
@@ -179,7 +179,7 @@ object name::
 	character hexadecimal encoding of the hash of the object (possibly
 	followed by a white space).
 
-object type:
+object type::
 	One of the identifiers "commit","tree","tag" and "blob" describing
 	the type of an object.
 
@@ -324,7 +324,7 @@ tag::
 	A tag is most typically used to mark a particular point in the
 	commit ancestry chain.
 
-unmerged index:
+unmerged index::
 	An index which contains unmerged index entries.
 
 working tree::
-- 
2.26.2