git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Documentation: Fix ssh:// URLs in generated documentation
@ 2006-07-12 21:55 Alp Toker
  2006-07-13  4:58 ` Junio C Hamano
  0 siblings, 1 reply; 5+ messages in thread
From: Alp Toker @ 2006-07-12 21:55 UTC (permalink / raw)
  To: git

Commit c3f17061be95de3498449a548e93883aebff23d6 was causing warnings
during doc generation due to bad asciidoc markup.

This resulted in "ssh://[user@]host.xz/path/to/repo.git/" being rendered
as "host.xz/path/to/repo.git/" in the man pages and html output.

This patch converts sections listing URL formats to verbatim.

It also changes a minor capitalization inconsistency which ended up
appearing in several man pages by inclusion.

Signed-off-by: Alp Toker <alp@atoker.com>
---
 Documentation/urls.txt |   34 ++++++++++++++--------------------
 1 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/Documentation/urls.txt b/Documentation/urls.txt
index 9abec80..2b5a7f8 100644
--- a/Documentation/urls.txt
+++ b/Documentation/urls.txt
@@ -4,33 +4,27 @@ GIT URLS[[URLS]]
 One of the following notations can be used
 to name the remote repository:
 
-===============================================================
-- rsync://host.xz/path/to/repo.git/
-- http://host.xz/path/to/repo.git/
-- 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 Is the default transport protocol and also supports an
+	rsync://host.xz/path/to/repo.git/
+	http://host.xz/path/to/repo.git/
+	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 is the default transport protocol and also supports an
 scp-like syntax.  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
-===============================================================
+	host.xz:/path/to/repo.git/
+	host.xz:~user/path/to/repo.git/
+	host.xz:path/to/repo.git
 
 To sync with a local directory, use:
 
-===============================================================
-- /path/to/repo.git/
-===============================================================
+	/path/to/repo.git/
 
 REMOTES
 -------
-- 
1.4.1.g2fca1

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH] Revert "Documentation: Fix ssh://[user@]host.xz URL"
@ 2006-07-14 10:24 Alp Toker
  2006-07-14 10:24 ` [PATCH] Documentation: Fix ssh:// URLs in generated documentation Alp Toker
  0 siblings, 1 reply; 5+ messages in thread
From: Alp Toker @ 2006-07-14 10:24 UTC (permalink / raw)
  To: git; +Cc: junkio

This reverts commit 8d5e26848d0ddd5063f078b0c34c6c48b68d0d94.

The patch did not eliminate warnings caused by bad asciidoc markup.
Nor did it correct the generated output, which remains unchanged.

Signed-off-by: Alp Toker <alp@atoker.com>
---
 Documentation/urls.txt |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/urls.txt b/Documentation/urls.txt
index 93378d2..9abec80 100644
--- a/Documentation/urls.txt
+++ b/Documentation/urls.txt
@@ -10,9 +10,9 @@ 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://[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 Is the default transport protocol and also supports an
-- 
1.4.1.g28ec

^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2006-07-14 21:46 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-07-12 21:55 [PATCH] Documentation: Fix ssh:// URLs in generated documentation Alp Toker
2006-07-13  4:58 ` Junio C Hamano
2006-07-13  5:48   ` Alp Toker
  -- strict thread matches above, loose matches on Subject: below --
2006-07-14 10:24 [PATCH] Revert "Documentation: Fix ssh://[user@]host.xz URL" Alp Toker
2006-07-14 10:24 ` [PATCH] Documentation: Fix ssh:// URLs in generated documentation Alp Toker
2006-07-14 21:46   ` Junio C Hamano

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).