git-merge: make it usable as the first class UI

diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index f10a269912bae1c54280f526f06550b6de088d2c..993adc7c5adf63f144d7ce257a670363abe18322 100644 (file)
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@ -162,6 +162,13 @@ upload-archive::
 
 EXAMPLES
 --------
+We assume the following in /etc/services::
++
+------------
+$ grep 9418 /etc/services
+git            9418/tcp                # Git Version Control System
+------------
+
 git-daemon as inetd server::
        To set up `git-daemon` as an inetd service that handles any
        repository under the whitelisted set of directories, /pub/foo