diff options
| author | Jonas Fonseca <fonseca@diku.dk> | 2006-07-14 16:36:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-14 16:36:00 -0700 |
| commit | a3e65d74ee7ec9e6f49de7688a1cdac052910bd4 (patch) | |
| tree | 0fee3c72e3b687212243af070e12373ddab048c1 | |
| parent | c7543ce0be5609df8123f88ac75a06c1bda98f0e (diff) | |
| download | git-a3e65d74ee7ec9e6f49de7688a1cdac052910bd4.tar.gz git-a3e65d74ee7ec9e6f49de7688a1cdac052910bd4.tar.xz | |
Documentation/urls.txt: Use substitution to escape square brackets
This changes "[user@]" to use {startsb} and {endsb} to insert [ and ],
similar to how {caret} is used in git-rev-parse.txt.
[jc: Removed a well-intentioned comment that broke the final
formatting from the original patch. While we are at it,
updated the paragraph that claims to be equivalent to the
section that was updated earlier without making matching
changes.]
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Documentation/asciidoc.conf | 2 | ||||
| -rw-r--r-- | Documentation/urls.txt | 17 |
2 files changed, 11 insertions, 8 deletions
diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf index 7ce71510d..8196d787a 100644 --- a/Documentation/asciidoc.conf +++ b/Documentation/asciidoc.conf @@ -9,6 +9,8 @@ [attributes] caret=^ +startsb=[ +endsb=] ifdef::backend-docbook[] [gitlink-inlinemacro] diff --git a/Documentation/urls.txt b/Documentation/urls.txt index 9d2ad469e..26ecba53f 100644 --- a/Documentation/urls.txt +++ b/Documentation/urls.txt @@ -10,20 +10,21 @@ to name the remote repository: - https://host.xz/path/to/repo.git/ - git://host.xz/path/to/repo.git/ - git://host.xz/~user/path/to/repo.git/ -- ssh://+++[user@+++]host.xz/path/to/repo.git/ -- ssh://+++[user@+++]host.xz/~user/path/to/repo.git/ -- ssh://+++[user@+++]host.xz/~/path/to/repo.git +- ssh://{startsb}user@{endsb}host.xz/path/to/repo.git/ +- ssh://{startsb}user@{endsb}host.xz/~user/path/to/repo.git/ +- ssh://{startsb}user@{endsb}host.xz/~/path/to/repo.git =============================================================== -SSH is the default transport protocol and also supports an -scp-like syntax. Both syntaxes support username expansion, +SSH is the default transport protocol. You can optionally specify +which user to log-in as, and an alternate, scp-like syntax is also +supported. Both syntaxes support username expansion, as does the native git protocol. The following three are identical to the last three above, respectively: =============================================================== -- host.xz:/path/to/repo.git/ -- host.xz:~user/path/to/repo.git/ -- host.xz:path/to/repo.git +- {startsb}user@{endsb}host.xz:/path/to/repo.git/ +- {startsb}user@{endsb}host.xz:~user/path/to/repo.git/ +- {startsb}user@{endsb}host.xz:path/to/repo.git =============================================================== To sync with a local directory, use: |