From 7da87bb8f49b5c00786cbfb3e330f690e8b924c6 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junio@hera.kernel.org>
Date: Tue, 6 Jun 2006 01:23:49 +0000
Subject: [PATCH] Autogenerated HTML docs for v1.3.3-g441c8

---
 everyday.html   | 48 ++++++++++++++++++++++++++++++++++++++----------
 everyday.txt    | 42 +++++++++++++++++++++++++++++++++++-------
 tutorial-2.html |  4 ++--
 tutorial-2.txt  |  2 +-
 4 files changed, 76 insertions(+), 20 deletions(-)

diff --git a/everyday.html b/everyday.html
index 831183b4..93b56172 100644
--- a/everyday.html
+++ b/everyday.html
@@ -870,16 +870,19 @@ create a signed tag.
 make sure I did not accidentally rewind master beyond what I
 already pushed out.  "ko" shorthand points at the repository I have
 at kernel.org, and looks like this:
-    $ cat .git/remotes/ko
-    URL: kernel.org:/pub/scm/git/git.git
-    Pull: master:refs/tags/ko-master
-    Pull: maint:refs/tags/ko-maint
-    Push: master
-    Push: +pu
-    Push: maint
-In the output from "git show-branch", "master" should have
-everything "ko-master" has.
 </p>
+<div class="listingblock">
+<div class="content">
+<pre><tt>$ cat .git/remotes/ko
+URL: kernel.org:/pub/scm/git/git.git
+Pull: master:refs/tags/ko-master
+Pull: maint:refs/tags/ko-maint
+Push: master
+Push: +pu
+Push: maint</tt></pre>
+</div></div>
+<p>In the output from "git show-branch", "master" should have
+everything "ko-master" has.</p>
 </li>
 <li>
 <p>
@@ -930,6 +933,31 @@ git     stream  tcp     nowait  nobody \
 <p>The actual configuration line should be on one line.</p>
 </dd>
 <dt>
+Run git-daemon to serve /pub/scm from xinetd.
+</dt>
+<dd>
+<div class="listingblock">
+<div class="content">
+<pre><tt>$ cat /etc/xinetd.d/git-daemon
+# default: off
+# description: The git server offers access to git repositories
+service git
+{
+        disable = no
+        type            = UNLISTED
+        port            = 9418
+        socket_type     = stream
+        wait            = no
+        user            = nobody
+        server          = /usr/bin/git-daemon
+        server_args     = --inetd --syslog --export-all --base-path=/pub/scm
+        log_on_failure  += USERID
+}</tt></pre>
+</div></div>
+<p>Check your xinetd(8) documentation and setup, this is from a Fedora system.
+Others might be different.</p>
+</dd>
+<dt>
 Give push/pull only access to developers.
 </dt>
 <dd>
@@ -1039,7 +1067,7 @@ upload to public HTTP server hosted by your ISP.
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 30-May-2006 07:20:54 UTC
+Last updated 06-Jun-2006 01:23:29 UTC
 </div>
 </div>
 </body>
diff --git a/everyday.txt b/everyday.txt
index 2ad2d613..6745ab5f 100644
--- a/everyday.txt
+++ b/everyday.txt
@@ -336,15 +336,20 @@ master, nor exposed as a part of a stable branch.
 <11> make sure I did not accidentally rewind master beyond what I
 already pushed out.  "ko" shorthand points at the repository I have
 at kernel.org, and looks like this:
-    $ cat .git/remotes/ko
-    URL: kernel.org:/pub/scm/git/git.git
-    Pull: master:refs/tags/ko-master
-    Pull: maint:refs/tags/ko-maint
-    Push: master
-    Push: +pu
-    Push: maint
++
+------------
+$ cat .git/remotes/ko
+URL: kernel.org:/pub/scm/git/git.git
+Pull: master:refs/tags/ko-master
+Pull: maint:refs/tags/ko-maint
+Push: master
+Push: +pu
+Push: maint
+------------
++
 In the output from "git show-branch", "master" should have
 everything "ko-master" has.
+
 <12> push out the bleeding edge.
 <13> push the tag out, too.
 
@@ -377,6 +382,29 @@ git	stream	tcp	nowait	nobody \
 +
 The actual configuration line should be on one line.
 
+Run git-daemon to serve /pub/scm from xinetd.::
++
+------------
+$ cat /etc/xinetd.d/git-daemon
+# default: off
+# description: The git server offers access to git repositories
+service git
+{
+        disable = no
+        type            = UNLISTED
+        port            = 9418
+        socket_type     = stream
+        wait            = no
+        user            = nobody
+        server          = /usr/bin/git-daemon
+        server_args     = --inetd --syslog --export-all --base-path=/pub/scm
+        log_on_failure  += USERID
+}
+------------
++
+Check your xinetd(8) documentation and setup, this is from a Fedora system.
+Others might be different.
+
 Give push/pull only access to developers.::
 +
 ------------
diff --git a/tutorial-2.html b/tutorial-2.html
index d4d34eaa..8be18d1e 100644
--- a/tutorial-2.html
+++ b/tutorial-2.html
@@ -385,7 +385,7 @@ add emphasis</tt></pre>
 <div class="content">
 <pre><tt>$ git ls-tree d0492b36
 100644 blob a0423896973644771497bdc03eb99d5281615b51    file.txt
-$ git cat-file commit a0423896
+$ git cat-file blob a0423896
 hello world!</tt></pre>
 </div></div>
 <p>and the "parent" object refers to the previous commit:</p>
@@ -634,7 +634,7 @@ example, creating a new commit.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Jun-2006 07:24:35 UTC
+Last updated 06-Jun-2006 01:23:28 UTC
 </div>
 </div>
 </body>
diff --git a/tutorial-2.txt b/tutorial-2.txt
index 82c69225..894ca5e0 100644
--- a/tutorial-2.txt
+++ b/tutorial-2.txt
@@ -136,7 +136,7 @@ The "tree" object here refers to the new state of the tree:
 ------------------------------------------------
 $ git ls-tree d0492b36
 100644 blob a0423896973644771497bdc03eb99d5281615b51    file.txt
-$ git cat-file commit a0423896
+$ git cat-file blob a0423896
 hello world!
 ------------------------------------------------
 
-- 
2.11.0