Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
  git-am: fix typo in usage message
  doc/git-daemon: s/uploadarchive/uploadarch/

diff --cc git-am.sh
index 75886a8f2fb0c2244ba921398ae2339dc9ffea26,4dce87bdff7763cdd6e9d73ed236e40a5b3ca34c..b48096ec2037e3f14d4bdf89a0afe4623aff090e
--- 1/git-am.sh
--- 2/git-am.sh
+++ b/git-am.sh
@@@ -9,9 -8,9 +9,9 @@@ git-am [options] <mbox>|<Maildir>..
  git-am [options] --resolved
  git-am [options] --skip
  --
 -d,dotest=       use <dir> and not .dotest
 +d,dotest=       (removed -- do not use)
  i,interactive   run interactively
- b,binary        pass --allo-binary-replacement to git-apply
+ b,binary        pass --allow-binary-replacement to git-apply
  3,3way          allow fall back on 3way merging if needed
  s,signoff       add a Signed-off-by line to the commit message
  u,utf8          recode into utf8 (default)