Merge branch 'ms/daemon-doc-typo' into maint

* ms/daemon-doc-typo:
  Documentation/git-daemon: add missing word
This commit is contained in:
Junio C Hamano 2012-08-06 15:39:16 -07:00
commit c2e585f530

View file

@ -204,7 +204,7 @@ receive-pack::
can push anything into the repository, including removal
of refs). This is solely meant for a closed LAN setting
where everybody is friendly. This service can be
enabled by `daemon.receivepack` configuration item to
enabled by setting `daemon.receivepack` configuration item to
`true`.
EXAMPLES