[PATCH] urls.txt: Use substitution to escape square brackets
- From
Junio C Hamano <junkio@cox.net>
- Date
- Jul 14, 2006, 23:42 UTC
- Message-ID
- <7v3bd3ois4.fsf@assigned-by-dhcp.cox.net>
- In-Reply-To
- <20060714215039.GA21994@diku.dk>
Alp is right -- the comments in [attributes] section after the definition do appear in the output, even with asciidoc 7.1.2, so here is a replacement proposal from me.
The one by Alp is an easy work-around, but I do not want to worry about potential, unintended, breakages that might be caused by changing delimited blocks to literal paragraphs (and it changes the resulting rendering from the original).
-- >8 -- From: Jonas Fonseca <fonseca@diku.dk>
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> --- Documentation/asciidoc.conf | 2 ++ Documentation/urls.txt | 17 +++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf index 7ce7151..8196d78 100644 --- a/Documentation/asciidoc.conf +++ b/Documentation/asciidoc.conf @@ -9,6 +9,8 @@ # the command. [attributes] caret=^ +startsb=[ +endsb=] ifdef::backend-docbook[] [gitlink-inlinemacro] diff --git a/Documentation/urls.txt b/Documentation/urls.txt index 9d2ad46..26ecba5 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:
-- 1.4.1.g28ec