Autogenerated HTML docs for v1.4.2-g370e

diff --git a/git-apply.html b/git-apply.html
index 077a8673b53d92d0c773a439906dfadf5fd336f3..733a07544475dd385b8cd88fb08ec2cd1ca416e2 100644 (file)
--- a/git-apply.html
+++ b/git-apply.html
@@ -389,8 +389,8 @@ and a work tree.</p>
         For atomicity, <a href="git-apply.html">git-apply(1)</a> by default fails the whole patch and\r
         does not touch the working tree when some of the hunks\r
         do not apply.  This option makes it apply\r
-        the parts of the patch that are applicable, and send the\r
-        rejected hunks to the standard output of the command.\r
+        the parts of the patch that are applicable, and leave the\r
+        rejected hunks in corresponding *.rej files.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -573,7 +573,7 @@ apply.whitespace
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 26-Aug-2006 08:43:06 UTC\r
+Last updated 28-Aug-2006 07:18:32 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-apply.txt b/git-apply.txt
index 20e12ceda002d929ffc7ee13b77d0e23c7e91356..c76cfffdc6cd9982aa02e34b2b09fc22897e7402 100644 (file)
--- a/git-apply.txt
+++ b/git-apply.txt
@@ -75,8 +75,8 @@ OPTIONS
        For atomicity, gitlink:git-apply[1] by default fails the whole patch and
        does not touch the working tree when some of the hunks
        do not apply.  This option makes it apply
-       the parts of the patch that are applicable, and send the
-       rejected hunks to the standard output of the command.
+       the parts of the patch that are applicable, and leave the
+       rejected hunks in corresponding *.rej files.
 
 -z::
        When showing the index information, do not munge paths,

diff --git a/git-daemon.html b/git-daemon.html
index e500baec92bd2e0369b607f0126077c611eee491..1fd9609d1aa7b2720d18aea9e0ea6189ac81a9e1 100644 (file)
--- a/git-daemon.html
+++ b/git-daemon.html
@@ -276,7 +276,8 @@ git-daemon(1) Manual Page
 <div class="content"><em>git-daemon</em> [--verbose] [--syslog] [--inetd | --port=n] [--export-all]\r
              [--timeout=n] [--init-timeout=n] [--strict-paths]\r
              [--base-path=path] [--user-path | --user-path=path]\r
-             [--reuseaddr] [--detach] [--pid-file=file] [directory&#8230;]</div></div>\r
+             [--reuseaddr] [--detach] [--pid-file=file]\r
+             [--user=user [--group=group]] [directory&#8230;]</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -422,6 +423,21 @@ the offers to a whitelist comprising of those.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--user=user, --group=group\r
+</dt>\r
+<dd>\r
+<p>\r
+        Change daemon's uid and gid before entering the service loop.\r
+        When only <tt>--user</tt> is given without <tt>--group</tt>, the\r
+        primary group ID for the user is used.  The values of\r
+        the option are given to <tt>getpwnam(3)</tt> and <tt>getgrnam(3)</tt>\r
+        and numeric IDs are not supported.\r
+</p>\r
+<p>Giving these options is an error when used with <tt>--inetd</tt>; use\r
+the facility of inet daemon to achieve the same before spawning\r
+<tt>git-daemon</tt> if needed.</p>\r
+</dd>\r
+<dt>\r
 &lt;directory&gt;\r
 </dt>\r
 <dd>\r
@@ -448,7 +464,7 @@ the offers to a whitelist comprising of those.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 28-Jul-2006 05:14:02 UTC\r
+Last updated 28-Aug-2006 07:18:33 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-daemon.txt b/git-daemon.txt
index 0f7d274eaba3722dabfdbf7ab14592a938933a56..17619a3f57c939f63a5648b166b52263565e6cb2 100644 (file)
--- a/git-daemon.txt
+++ b/git-daemon.txt
@@ -11,7 +11,8 @@ SYNOPSIS
 'git-daemon' [--verbose] [--syslog] [--inetd | --port=n] [--export-all]
              [--timeout=n] [--init-timeout=n] [--strict-paths]
              [--base-path=path] [--user-path | --user-path=path]
-            [--reuseaddr] [--detach] [--pid-file=file] [directory...]
+            [--reuseaddr] [--detach] [--pid-file=file]
+            [--user=user [--group=group]] [directory...]
 
 DESCRIPTION
 -----------
@@ -93,6 +94,17 @@ OPTIONS
 --pid-file=file::
        Save the process id in 'file'.
 
+--user=user, --group=group::
+       Change daemon's uid and gid before entering the service loop.
+       When only `--user` is given without `--group`, the
+       primary group ID for the user is used.  The values of
+       the option are given to `getpwnam(3)` and `getgrnam(3)`
+       and numeric IDs are not supported.
++
+Giving these options is an error when used with `--inetd`; use
+the facility of inet daemon to achieve the same before spawning
+`git-daemon` if needed.
+
 <directory>::
        A directory to add to the whitelist of allowed directories. Unless
        --strict-paths is specified this will also include subdirectories