From 9e1cbc0d8df993c1529d93920fabcd188224da93 Mon Sep 17 00:00:00 2001
From: Tommi Virtanen <tv@eagain.net>
Date: Thu, 22 Jan 2015 10:43:39 -0800
Subject: [PATCH] Use dashless form for git daemon

---
 README.rst                   | 10 +++++-----
 etc-event.d-local-git-daemon |  2 +-
 example.conf                 |  4 ++--
 gitweb.conf                  |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.rst b/README.rst
index b4f2e00..a696401 100644
--- a/README.rst
+++ b/README.rst
@@ -137,18 +137,18 @@ Example configuration
    :literal:
 
 
-Using git-daemon
-================
+Using ``git daemon``
+====================
 
 Anonymous read-only access to ``git`` repositories is provided by
-``git-daemon``, which is distributed as part of ``git``. But
+``git daemon``, which is distributed as part of ``git``. But
 ``gitosis`` will still help you manage it: setting ``daemon = yes`` in
 your ``gitosis.conf``, either globally in ``[gitosis]`` or
 per-repository under ``[repo REPOSITORYNAME]``, makes ``gitosis``
 create the ``git-daemon-export-ok`` files in those repository, thus
-telling ``git-daemon`` that publishing those repositories is ok.
+telling ``git daemon`` that publishing those repositories is ok.
 
-To actually run ``git-daemon`` in Ubuntu, put this in
+To actually run ``git daemon`` in Ubuntu, put this in
 ``/etc/event.d/local-git-daemon``:
 
 .. include:: etc-event.d-local-git-daemon
diff --git a/etc-event.d-local-git-daemon b/etc-event.d-local-git-daemon
index e1349a9..44999a1 100644
--- a/etc-event.d-local-git-daemon
+++ b/etc-event.d-local-git-daemon
@@ -1,7 +1,7 @@
 start on startup
 stop on shutdown
 
-exec /usr/bin/git-daemon \
+exec /usr/bin/git daemon \
 	--user=git --group=git \
 	--user-path=public-git \
 	--verbose \
diff --git a/example.conf b/example.conf
index 87bd822..96400a9 100644
--- a/example.conf
+++ b/example.conf
@@ -11,7 +11,7 @@
 ## you want visible in gitweb.
 gitweb = no
 
-## Allow git-daemon to publish all known repositories. As with gitweb,
+## Allow git daemon to publish all known repositories. As with gitweb,
 ## this can be done globally or per-repository.
 daemon = no
 
@@ -44,7 +44,7 @@ description = blah blah
 ## Owner of this repository. Used in gitweb list of projects.
 owner = John Doe
 
-## Allow git-daemon to publish this repository.
+## Allow git daemon to publish this repository.
 daemon = yes
 
 [gitweb]
diff --git a/gitweb.conf b/gitweb.conf
index 32d81b1..bdc5d3a 100644
--- a/gitweb.conf
+++ b/gitweb.conf
@@ -11,7 +11,7 @@ $projectroot = "/srv/example.com/git/repositories";
 
 # By default, gitweb will happily let people browse any repository
 # they guess the name of. This may or may not be what you wanted.  I
-# choose to allow gitweb to show only repositories that git-daemon
+# choose to allow gitweb to show only repositories that git daemon
 # is already sharing anonymously.
 $export_ok = "git-daemon-export-ok";
 
@@ -20,7 +20,7 @@ $export_ok = "git-daemon-export-ok";
 # in gitosis.conf. This means you don't need daemon=yes, but you
 # can't have repositories hidden but browsable if you know the name.
 # And note gitweb already allows downloading the full repository,
-# so you might as well serve git-daemon too.
+# so you might as well serve git daemon too.
 # $export_ok = "";
 # $strict_export = "true";