Autogenerated HTML docs for v1.4.0-rc2-g5e3a6

[git.git] / everyday.html

diff --git a/everyday.html b/everyday.html
index 5e768ab..012a947 100644 (file)
--- a/everyday.html
+++ b/everyday.html
@@ -308,7 +308,7 @@ repositories to support developers.</p>
 </li>\r
 <li>\r
 <p>\r
-<a href="git-prune.html">git-prune(1)</a> to garbage collect crufts in the\r
+<a href="git-prune.html">git-prune(1)</a> to garbage collect cruft in the\r
     repository.\r
 </p>\r
 </li>\r
@@ -342,7 +342,7 @@ repository health reasonably well.
 <li>\r
 <p>\r
 check how many loose objects there are and how much\r
-diskspace is wasted by not repacking.\r
+disk space is wasted by not repacking.\r
 </p>\r
 </li>\r
 <li>\r
@@ -381,7 +381,7 @@ and remove unneeded other packs
 <h2>Individual Developer (Standalone)<a id="Individual Developer (Standalone)"></a></h2>\r
 <div class="sectionbody">\r
 <p>A standalone individual developer does not exchange patches with\r
-other poeple, and works alone in a single repository, using the\r
+other people, and works alone in a single repository, using the\r
 following commands.</p>\r
 <ul>\r
 <li>\r
@@ -870,16 +870,19 @@ create a signed tag.
 make sure I did not accidentally rewind master beyond what I\r
 already pushed out.  "ko" shorthand points at the repository I have\r
 at kernel.org, and looks like this:\r
-    $ cat .git/remotes/ko\r
-    URL: kernel.org:/pub/scm/git/git.git\r
-    Pull: master:refs/tags/ko-master\r
-    Pull: maint:refs/tags/ko-maint\r
-    Push: master\r
-    Push: +pu\r
-    Push: maint\r
-In the output from "git show-branch", "master" should have\r
-everything "ko-master" has.\r
 </p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>$ cat .git/remotes/ko\r
+URL: kernel.org:/pub/scm/git/git.git\r
+Pull: master:refs/tags/ko-master\r
+Pull: maint:refs/tags/ko-maint\r
+Push: master\r
+Push: +pu\r
+Push: maint</tt></pre>\r
+</div></div>\r
+<p>In the output from "git show-branch", "master" should have\r
+everything "ko-master" has.</p>\r
 </li>\r
 <li>\r
 <p>\r
@@ -923,13 +926,38 @@ Run git-daemon to serve /pub/scm from inetd.
 <dd>\r
 <div class="listingblock">\r
 <div class="content">\r
-<pre><tt>$ grep git /etc/inet.conf\r
+<pre><tt>$ grep git /etc/inetd.conf\r
 git     stream  tcp     nowait  nobody \\r
   /usr/bin/git-daemon git-daemon --inetd --syslog --export-all /pub/scm</tt></pre>\r
 </div></div>\r
 <p>The actual configuration line should be on one line.</p>\r
 </dd>\r
 <dt>\r
+Run git-daemon to serve /pub/scm from xinetd.\r
+</dt>\r
+<dd>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>$ cat /etc/xinetd.d/git-daemon\r
+# default: off\r
+# description: The git server offers access to git repositories\r
+service git\r
+{\r
+        disable = no\r
+        type            = UNLISTED\r
+        port            = 9418\r
+        socket_type     = stream\r
+        wait            = no\r
+        user            = nobody\r
+        server          = /usr/bin/git-daemon\r
+        server_args     = --inetd --syslog --export-all --base-path=/pub/scm\r
+        log_on_failure  += USERID\r
+}</tt></pre>\r
+</div></div>\r
+<p>Check your xinetd(8) documentation and setup, this is from a Fedora system.\r
+Others might be different.</p>\r
+</dd>\r
+<dt>\r
 Give push/pull only access to developers.\r
 </dt>\r
 <dd>\r
@@ -1039,7 +1067,7 @@ upload to public HTTP server hosted by your ISP.
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 29-Apr-2006 07:01:35 UTC\r
+Last updated 07-Jun-2006 19:51:36 UTC\r
 </div>\r
 </div>\r
 </body>\r