[PATCH] daemon: documentation for --reuseaddr, --detach and --pid-file
From: Matthias Lederhofer <hidden>
Date: 2016-06-15 22:42:33
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Signed-off-by: Matthias Lederhofer <redacted> --- Matthias Lederhofer [off-list ref] wrote:
Documentation will follow if the changes are ok.
Here it is. I just found that --reuseaddr is not documented yet too (I could really have used that while testing the git-daemon patches...) but I have no idea how to describe it for someone who does not know what it means. Perhaps someone else has an idea. --- Documentation/git-daemon.txt | 8 +++++++- daemon.c | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index 4c357da..f5b08a6 100644
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt@@ -11,7 +11,7 @@ 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] - [directory...] + [--reuseaddr] [--detach] [--pid-file=file] [directory...] DESCRIPTION -----------
@@ -82,6 +82,12 @@ OPTIONS --verbose:: Log details about the incoming connections and requested files. +--detach:: + Detach from the shell. Implies --syslog. + +--pid-file=file:: + Save the process id in 'file'. + <directory>:: A directory to add to the whitelist of allowed directories. Unless --strict-paths is specified this will also include subdirectories
diff --git a/daemon.c b/daemon.c
index e4ec676..810837f 100644
--- a/daemon.c
+++ b/daemon.c@@ -19,7 +19,7 @@ static const char daemon_usage[] = "git-daemon [--verbose] [--syslog] [--inetd | --port=n] [--export-all]\n" " [--timeout=n] [--init-timeout=n] [--strict-paths]\n" " [--base-path=path] [--user-path | --user-path=path]\n" -" [--reuseaddr] [directory...]"; +" [--reuseaddr] [--detach] [--pid-file=file] [directory...]"; /* List of acceptable pathname prefixes */ static char **ok_paths = NULL;
--
1.4.1.g8b4b