summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-10-17 17:28:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-10-17 17:28:56 (GMT)
commit5a77ff74ba5eaef9acb8ea240cb52dd84b874b7a (patch)
tree2f213c41ad325abd85bb91aa21cd48825c4b2051
parentc15fadab65907e7fa1ae3a0dd5e05b722fd1f235 (diff)
parent6347e71619999481139862ac06f0f295ecf98658 (diff)
downloadgit-5a77ff74ba5eaef9acb8ea240cb52dd84b874b7a.zip
git-5a77ff74ba5eaef9acb8ea240cb52dd84b874b7a.tar.gz
git-5a77ff74ba5eaef9acb8ea240cb52dd84b874b7a.tar.bz2
Merge branch 'rr/git-uri-doc' into maint
* rr/git-uri-doc: Git url doc: mark ftp/ftps as read-only and deprecate them
-rw-r--r--Documentation/urls.txt8
1 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/urls.txt b/Documentation/urls.txt
index 2890194..1d15ee7 100644
--- a/Documentation/urls.txt
+++ b/Documentation/urls.txt
@@ -6,8 +6,12 @@ address of the remote server, and the path to the repository.
Depending on the transport protocol, some of this information may be
absent.
-Git natively supports ssh, git, http, https, ftp, ftps, and rsync
-protocols. The following syntaxes may be used with them:
+Git supports ssh, git, http, and https protocols (in addition, ftp,
+and ftps can be used for fetching and rsync can be used for fetching
+and pushing, but these are inefficient and deprecated; do not use
+them).
+
+The following syntaxes may be used with them:
- ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/path/to/repo.git/
- git://host.xz{startsb}:port{endsb}/path/to/repo.git/