On Thu, 18 Feb 2021 at 07:27, Patrick Steinhardt <ps@xxxxxx> wrote: > > On Wed, Feb 17, 2021 at 08:56:05PM +0100, Martin Ågren wrote: > > When we write `<name>`s with the "s" tucked on to the closing backtick, > > we end up rendering the backticks literally. Rephrase this sentence > > slightly to render this as monospace. > > > > Signed-off-by: Martin Ågren <martin.agren@xxxxxxxxx> > > --- > > doc-diff: > > --- a/.../man/man1/git.1 > > +++ b/.../man/man1/git.1 > > @@ -77,8 +77,8 @@ OPTIONS > > setting the value to an empty string, instead the environment > > variable itself must be set to the empty string. It is an error if > > the <envvar> does not exist in the environment. <envvar> may not > > - contain an equals sign to avoid ambiguity with `<name>`s which > > - contain one. > > + contain an equals sign to avoid ambiguity with <name> containing > > + one. > > Over here you're also dropping the backticks, while... > > > This is useful for cases where you want to pass transitory > > configuration options to git, but are doing so on OS’s where other > > Documentation/git.txt | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/Documentation/git.txt b/Documentation/git.txt > > index d36e6fd482..3a9c44987f 100644 > > --- a/Documentation/git.txt > > +++ b/Documentation/git.txt > > @@ -88,7 +88,7 @@ foo.bar= ...`) sets `foo.bar` to the empty string which `git config > > empty string, instead the environment variable itself must be > > set to the empty string. It is an error if the `<envvar>` does not exist > > in the environment. `<envvar>` may not contain an equals sign > > - to avoid ambiguity with `<name>`s which contain one. > > + to avoid ambiguity with `<name>` containing one. > > ... here you don't. Is this on purpose? Your mail crossed with my response to Chris, who had the same question. I'd post a link to lore.kernel.org, but it seems my response hasn't reached it yet. The short answer is the first diff is an indented diff of the rendered manpages (our "doc-diff" script), whereas the second diff is the actual, to-be-applied diff. I thought it would be helpful to include the doc-diff, but it seems it just created more confusion than it avoided. I'll try to avoid that. :-) Thanks Martin
