git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] config/advice.txt: fix description list separator
@ 2020-01-08 20:08 Martin Ågren
  2020-01-08 21:16 ` Junio C Hamano
  0 siblings, 1 reply; 2+ messages in thread
From: Martin Ågren @ 2020-01-08 20:08 UTC (permalink / raw)
  To: git; +Cc: Jonathan Tan

The whole submoduleAlternateErrorStrategyDie item is interpreted as
being part of the supporting content of the preceding item. This is
because we don't give a double-colon "::" for the separator, but just a
single colon, ":". Let's fix that.

There are a few other matches for [^:]:\s*$ in Documentation/config, but
I didn't spot any similar bugs among them.

Signed-off-by: Martin Ågren <martin.agren@gmail.com>
---
 This was the only thing that stood out at me while going through
 `./doc-diff v2.24.0 origin/master`. This is obviously a non-critical,
 purely cosmetic issue.

 Documentation/config/advice.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt
index d4e698cd3f..4be93f8ad9 100644
--- a/Documentation/config/advice.txt
+++ b/Documentation/config/advice.txt
@@ -107,7 +107,7 @@ advice.*::
 		editor input from the user.
 	nestedTag::
 		Advice shown if a user attempts to recursively tag a tag object.
-	submoduleAlternateErrorStrategyDie:
+	submoduleAlternateErrorStrategyDie::
 		Advice shown when a submodule.alternateErrorStrategy option
 		configured to "die" causes a fatal error.
 --
-- 
2.25.0.rc1.19.g042ed3e048


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

* Re: [PATCH] config/advice.txt: fix description list separator
  2020-01-08 20:08 [PATCH] config/advice.txt: fix description list separator Martin Ågren
@ 2020-01-08 21:16 ` Junio C Hamano
  0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2020-01-08 21:16 UTC (permalink / raw)
  To: Martin Ågren; +Cc: git, Jonathan Tan

Martin Ågren <martin.agren@gmail.com> writes:

> The whole submoduleAlternateErrorStrategyDie item is interpreted as
> being part of the supporting content of the preceding item. This is
> because we don't give a double-colon "::" for the separator, but just a
> single colon, ":". Let's fix that.
>
> There are a few other matches for [^:]:\s*$ in Documentation/config, but
> I didn't spot any similar bugs among them.
>
> Signed-off-by: Martin Ågren <martin.agren@gmail.com>
> ---
>  This was the only thing that stood out at me while going through
>  `./doc-diff v2.24.0 origin/master`. This is obviously a non-critical,
>  purely cosmetic issue.

Thanks.  It still is a new bug introduced by a recent change, so I
am tempted to include it in the final but it is a bit too late for
the -rc2 I planned to tag today.


>
>  Documentation/config/advice.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt
> index d4e698cd3f..4be93f8ad9 100644
> --- a/Documentation/config/advice.txt
> +++ b/Documentation/config/advice.txt
> @@ -107,7 +107,7 @@ advice.*::
>  		editor input from the user.
>  	nestedTag::
>  		Advice shown if a user attempts to recursively tag a tag object.
> -	submoduleAlternateErrorStrategyDie:
> +	submoduleAlternateErrorStrategyDie::
>  		Advice shown when a submodule.alternateErrorStrategy option
>  		configured to "die" causes a fatal error.
>  --

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

end of thread, other threads:[~2020-01-08 21:17 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-08 20:08 [PATCH] config/advice.txt: fix description list separator Martin Ågren
2020-01-08 21:16 ` 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).