git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] shell doc: remove stray "+" in example
@ 2014-05-07 23:44 Jonathan Nieder
  2014-05-08  4:04 ` Jeff King
  0 siblings, 1 reply; 3+ messages in thread
From: Jonathan Nieder @ 2014-05-07 23:44 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

The git-shell(1) manpage says

	EXAMPLE
	       To disable interactive logins, displaying a greeting
		instead:

		+

		   $ chsh -s /usr/bin/git-shell
		   $ mkdir $HOME/git-shell-commands
[...]

The stray "+" has been there ever since the example was added in
v1.8.3-rc0~210^2 (shell: new no-interactive-login command to print a
custom message, 2013-03-09).  The "+" sign between paragraphs is
needed in asciidoc to attach extra paragraphs to a list item but here
it is not needed and ends up rendered as a literal "+".  Remove it.

A quick search with "grep -e '<p>+' /usr/share/doc/git/html/*.html"
doesn't find any other instances of this problem.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
 Documentation/git-shell.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/git-shell.txt b/Documentation/git-shell.txt
index c35051b..e4bdd22 100644
--- a/Documentation/git-shell.txt
+++ b/Documentation/git-shell.txt
@@ -66,7 +66,7 @@ EXAMPLE
 -------
 
 To disable interactive logins, displaying a greeting instead:
-+
+
 ----------------
 $ chsh -s /usr/bin/git-shell
 $ mkdir $HOME/git-shell-commands
-- 
1.9.1.423.g4596e3a

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] shell doc: remove stray "+" in example
  2014-05-07 23:44 [PATCH] shell doc: remove stray "+" in example Jonathan Nieder
@ 2014-05-08  4:04 ` Jeff King
  2014-05-08 17:26   ` Junio C Hamano
  0 siblings, 1 reply; 3+ messages in thread
From: Jeff King @ 2014-05-08  4:04 UTC (permalink / raw)
  To: Jonathan Nieder; +Cc: Junio C Hamano, git

On Wed, May 07, 2014 at 04:44:01PM -0700, Jonathan Nieder wrote:

> The git-shell(1) manpage says
> 
> 	EXAMPLE
> 	       To disable interactive logins, displaying a greeting
> 		instead:
> 
> 		+
> 
> 		   $ chsh -s /usr/bin/git-shell
> 		   $ mkdir $HOME/git-shell-commands
> [...]
> 
> The stray "+" has been there ever since the example was added in
> v1.8.3-rc0~210^2 (shell: new no-interactive-login command to print a
> custom message, 2013-03-09).  The "+" sign between paragraphs is
> needed in asciidoc to attach extra paragraphs to a list item but here
> it is not needed and ends up rendered as a literal "+".  Remove it.
> 
> A quick search with "grep -e '<p>+' /usr/share/doc/git/html/*.html"
> doesn't find any other instances of this problem.
> 
> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>

Looks good to me. I suspect it was copied from another spot where the
examples _were_ in a list (e.g., git-add's EXAMPLES section). Either
way, your fix is the right thing to do.

-Peff

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] shell doc: remove stray "+" in example
  2014-05-08  4:04 ` Jeff King
@ 2014-05-08 17:26   ` Junio C Hamano
  0 siblings, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2014-05-08 17:26 UTC (permalink / raw)
  To: Jeff King; +Cc: Jonathan Nieder, git

Jeff King <peff@peff.net> writes:

> On Wed, May 07, 2014 at 04:44:01PM -0700, Jonathan Nieder wrote:
>
>> The git-shell(1) manpage says
>> 
>> 	EXAMPLE
>> 	       To disable interactive logins, displaying a greeting
>> 		instead:
>> 
>> 		+
>> 
>> 		   $ chsh -s /usr/bin/git-shell
>> 		   $ mkdir $HOME/git-shell-commands
>> [...]
>> 
>> The stray "+" has been there ever since the example was added in
>> v1.8.3-rc0~210^2 (shell: new no-interactive-login command to print a
>> custom message, 2013-03-09).  The "+" sign between paragraphs is
>> needed in asciidoc to attach extra paragraphs to a list item but here
>> it is not needed and ends up rendered as a literal "+".  Remove it.
>> 
>> A quick search with "grep -e '<p>+' /usr/share/doc/git/html/*.html"
>> doesn't find any other instances of this problem.
>> 
>> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
>
> Looks good to me. I suspect it was copied from another spot where the
> examples _were_ in a list (e.g., git-add's EXAMPLES section). Either
> way, your fix is the right thing to do.

Thanks, both.  Looks good to me, too.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-05-08 17:26 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-07 23:44 [PATCH] shell doc: remove stray "+" in example Jonathan Nieder
2014-05-08  4:04 ` Jeff King
2014-05-08 17:26   ` 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).