From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 5 Jun 2013 21:56:51 +0000 (-0700)
Subject: Merge branch 'nd/urls-doc-no-file-hyperlink-fix'
X-Git-Tag: v1.8.4-rc0~213
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/57a00bf6042e429883c177e94f3a5d7cc7e9e8ad?ds=inline;hp=-c

Merge branch 'nd/urls-doc-no-file-hyperlink-fix'

* nd/urls-doc-no-file-hyperlink-fix:
urls.txt: avoid auto converting to hyperlink
---

57a00bf6042e429883c177e94f3a5d7cc7e9e8ad
diff --combined Documentation/urls.txt
index 476e3381c5,60ba300117..5e185f87c2
--- a/Documentation/urls.txt
+++ b/Documentation/urls.txt
@@@ -23,12 -23,6 +23,12 @@@ An alternative scp-like syntax may als
  
  - {startsb}user@{endsb}host.xz:path/to/repo.git/
  
 +This syntax is only recognized if there are no slashes before the
 +first colon. This helps differentiate a local path that contains a
 +colon. For example the local path `foo:bar` could be specified as an
 +absolute path or `./foo:bar` to avoid being misinterpreted as an ssh
 +url.
 +
  The ssh and git protocols additionally support ~username expansion:
  
  - ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/~{startsb}user{endsb}/path/to/repo.git/
@@@ -39,7 -33,7 +39,7 @@@ For local repositories, also supported 
  syntaxes may be used:
  
  - /path/to/repo.git/
- - file:///path/to/repo.git/
+ - \file:///path/to/repo.git/
  
  ifndef::git-clone[]
  These two syntaxes are mostly equivalent, except when cloning, when