Merge branch 'wk/man-deny-current-branch-is-default-these-days' into maint

* wk/man-deny-current-branch-is-default-these-days:
  user-manual: typofix (ofthe->of the)
  user-manual: Update for receive.denyCurrentBranch=refuse

diff --cc Documentation/user-manual.txt
index 52c8523,299fc1e..20e5b42
--- 1/Documentation/user-manual.txt
--- 2/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@@ -2004,26 -1986,22 +2004,27 @@@ handling this case
  
  Note that the target of a "push" is normally a
  <<def_bare_repository,bare>> repository.  You can also push to a
- repository that has a checked-out working tree, but the working tree
- will not be updated by the push.  This may lead to unexpected results if
- the branch you push to is the currently checked-out branch!
+ repository that has a checked-out working tree, but a push to update the
+ currently checked-out branch is denied by default to prevent confusion.
+ See the description of the receive.denyCurrentBranch option
+ in linkgit:git-config[1] for details.
  
  As with `git fetch`, you may also set up configuration options to
 -save typing; so, for example, after
 +save typing; so, for example:
 +
 +-------------------------------------------------
 +$ git remote add public-repo ssh://yourserver.com/~you/proj.git
 +-------------------------------------------------
 +
 +adds the following to `.git/config`:
  
  -------------------------------------------------
 -$ cat >>.git/config <<EOF
  [remote "public-repo"]
 -      url = ssh://yourserver.com/~you/proj.git
 -EOF
 +      url = yourserver.com:proj.git
 +      fetch = +refs/heads/*:refs/remotes/example/*
  -------------------------------------------------
  
 -you should be able to perform the above push with just
 +which lets you do the same push with just
  
  -------------------------------------------------
  $ git push public-repo master