Merge branch 'cn/deprecate-ssh-git-url'

The two alternative ways to spell "ssh://" transport have been
deprecated for a long time.  The last mention of them has finally
removed from the documentation.

* cn/deprecate-ssh-git-url:
  Disown ssh+git and git+ssh

diff --cc Documentation/git.txt
index 951b24661e45ffe8b11444166e3a6cc7a3c6e1d2,2f90635d5c8263ba6b7d49f2bba5e77e4b78346e..f9252d5591520c5ffeaea3880180e570f61be798
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -1129,8 -1122,10 +1129,8 @@@ of clones and fetches
            connection (or proxy, if configured)
  
          - `ssh`: git over ssh (including `host:path` syntax,
-           `git+ssh://`, etc).
+           `ssh://`, etc).
  
 -        - `rsync`: git over rsync
 -
          - `http`: git over http, both "smart http" and "dumb http".
            Note that this does _not_ include `https`; if you want both,
            you should specify both as `http:https`.

diff --cc connect.c
Simple merge

diff --cc transport.c
Simple merge