Allow to use --enable-httpd with --slave
Slave now support running with the http daemon to be able to use git
fetching operations over the http protocol.
Change-Id: I3e7adf0d7ba5ff436394de35d08fba6f3b358aed
diff --git a/Documentation/pgm-daemon.txt b/Documentation/pgm-daemon.txt
index 3d7dd45..bcf2b1b 100644
--- a/Documentation/pgm-daemon.txt
+++ b/Documentation/pgm-daemon.txt
@@ -37,7 +37,7 @@
--enable-httpd::
--disable-httpd::
Enable (or disable) the internal HTTP daemon, answering
- web requests. Enabled by default.
+ web requests. Enabled by default when --slave is not used.
--enable-sshd::
--disable-sshd::
@@ -51,7 +51,7 @@
or updates existing ones) or link:cmd-review.html[review]
(sets approve marks) are disabled.
+
-This option automatically implies '--disable-httpd --enable-sshd'.
+This option automatically implies '--enable-sshd'.
--console-log::
Send log messages to the console, instead of to the standard
