git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* PATCH Documentation/git-rev-list.txt typo fix
@ 2005-09-15 22:40 jdl
  2005-09-16 14:24 ` Peter Hagervall
  0 siblings, 1 reply; 7+ messages in thread
From: jdl @ 2005-09-15 22:40 UTC (permalink / raw)
  To: git

I'm not positive what the doc conventions are, but I think
something like this patch fixes the "superscript" problem
on the git-rev-list doc page.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
---


diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -32,8 +32,8 @@ I have the commit object 'bar', but not

 The *--bisect* flag limits output to the one commit object which is
 roughly halfway between the included and excluded commits. Thus,
-if "git-rev-list --bisect foo ^bar ^baz" outputs 'midpoint', the output
-of "git-rev-list foo ^midpoint" and "git-rev-list midpoint ^bar ^baz"
+if 'git-rev-list --bisect foo ^bar ^baz' outputs 'midpoint', the output
+of 'git-rev-list foo ^midpoint' and 'git-rev-list midpoint ^bar ^baz'
 would be of roughly the same length. Finding the change which introduces
 a regression is thus reduced to a binary search: repeatedly generate and
 test new 'midpoint's until the commit chain is of length one.

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

* Re: PATCH Documentation/git-rev-list.txt typo fix
  2005-09-15 22:40 PATCH Documentation/git-rev-list.txt typo fix jdl
@ 2005-09-16 14:24 ` Peter Hagervall
  2005-09-16 16:31   ` Junio C Hamano
  2005-09-16 23:01   ` Junio C Hamano
  0 siblings, 2 replies; 7+ messages in thread
From: Peter Hagervall @ 2005-09-16 14:24 UTC (permalink / raw)
  To: jdl; +Cc: git, junkio

On Thu, Sep 15, 2005 at 05:40:13PM -0500, jdl@freescale.com wrote:
> I'm not positive what the doc conventions are, but I think
> something like this patch fixes the "superscript" problem
> on the git-rev-list doc page.
> 
> Signed-off-by: Jon Loeliger <jdl@freescale.com>
<snip>
> -if "git-rev-list --bisect foo ^bar ^baz" outputs 'midpoint', the output
> -of "git-rev-list foo ^midpoint" and "git-rev-list midpoint ^bar ^baz"
> +if 'git-rev-list --bisect foo ^bar ^baz' outputs 'midpoint', the output
> +of 'git-rev-list foo ^midpoint' and 'git-rev-list midpoint ^bar ^baz'
<snip>

This causes a mismatch in <emphasis> and <superscript> tags, one way of
fixing it is having no more than one caret symbol per line, which is the
only solution I found in the asciidoc documentation. Ugly, but it works.

Signed-off-by: Peter Hagervall <hager@cs.umu.se>
---


diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -32,8 +32,11 @@ I have the commit object 'bar', but not 
 
 The *--bisect* flag limits output to the one commit object which is
 roughly halfway between the included and excluded commits. Thus,
-if 'git-rev-list --bisect foo ^bar ^baz' outputs 'midpoint', the output
-of 'git-rev-list foo ^midpoint' and 'git-rev-list midpoint ^bar ^baz'
+if 'git-rev-list --bisect foo ^bar
+^baz' outputs 'midpoint', the output
+of 'git-rev-list foo ^midpoint' and 'git-rev-list midpoint
+^bar
+^baz'
 would be of roughly the same length. Finding the change which introduces
 a regression is thus reduced to a binary search: repeatedly generate and
 test new 'midpoint's until the commit chain is of length one.

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

* Re: PATCH Documentation/git-rev-list.txt typo fix
  2005-09-16 14:24 ` Peter Hagervall
@ 2005-09-16 16:31   ` Junio C Hamano
  2005-09-16 20:02     ` Chris Wright
  2005-09-16 23:01   ` Junio C Hamano
  1 sibling, 1 reply; 7+ messages in thread
From: Junio C Hamano @ 2005-09-16 16:31 UTC (permalink / raw)
  To: Peter Hagervall; +Cc: jdl, git, junkio

Peter Hagervall <hager@cs.umu.se> writes:

> This causes a mismatch in <emphasis> and <superscript> tags, one way of
> fixing it is having no more than one caret symbol per line, which is the
> only solution I found in the asciidoc documentation. Ugly, but it works.

Thanks.

Sigh...

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

* Re: PATCH Documentation/git-rev-list.txt typo fix
  2005-09-16 16:31   ` Junio C Hamano
@ 2005-09-16 20:02     ` Chris Wright
  2005-09-16 20:06       ` Chris Wright
  0 siblings, 1 reply; 7+ messages in thread
From: Chris Wright @ 2005-09-16 20:02 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: Peter Hagervall, jdl, git

* Junio C Hamano (junkio@cox.net) wrote:
> Peter Hagervall <hager@cs.umu.se> writes:
> 
> > This causes a mismatch in <emphasis> and <superscript> tags, one way of
> > fixing it is having no more than one caret symbol per line, which is the
> > only solution I found in the asciidoc documentation. Ugly, but it works.
> 
> Thanks.

This is breaking the build.  Reverting fixes the build...

[chrisw@vas Documentation]$ make git-rev-list.1
asciidoc -b docbook -d manpage git-rev-list.txt
xmlto man git-rev-list.xml
xmlto: input does not validate (status 1)
/home/chrisw/git/git/git/Documentation/git-rev-list.xml:38: parser error : Opening and ending tag mismatch: superscript line 38 and emphasis
of <emphasis>git-rev-list foo <superscript>midpoint</emphasis> and <emphasis>git                                                              ^
/home/chrisw/git/git/git/Documentation/git-rev-list.xml:38: parser error : Opening and ending tag mismatch: emphasis line 38 and superscript
perscript>midpoint</emphasis> and <emphasis>git-rev-list midpoint </superscript>                                                                               ^make: *** [git-rev-list.1] Error 1
rm git-rev-list.xml

thanks,
-chris

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

* Re: PATCH Documentation/git-rev-list.txt typo fix
  2005-09-16 20:02     ` Chris Wright
@ 2005-09-16 20:06       ` Chris Wright
  2005-09-16 20:47         ` jdl
  0 siblings, 1 reply; 7+ messages in thread
From: Chris Wright @ 2005-09-16 20:06 UTC (permalink / raw)
  To: Chris Wright; +Cc: Junio C Hamano, Peter Hagervall, jdl, git

* Chris Wright (chrisw@osdl.org) wrote:
> * Junio C Hamano (junkio@cox.net) wrote:
> > Peter Hagervall <hager@cs.umu.se> writes:
> > 
> > > This causes a mismatch in <emphasis> and <superscript> tags, one way of
> > > fixing it is having no more than one caret symbol per line, which is the
> > > only solution I found in the asciidoc documentation. Ugly, but it works.
> > 
> > Thanks.
> 
> This is breaking the build.  Reverting fixes the build...

Err, ignore me.  I was one patch behind.  That patch from Peter fixes
the broken build introduced by Jon.

thanks,
-chris

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

* Re: PATCH Documentation/git-rev-list.txt typo fix
  2005-09-16 20:06       ` Chris Wright
@ 2005-09-16 20:47         ` jdl
  0 siblings, 0 replies; 7+ messages in thread
From: jdl @ 2005-09-16 20:47 UTC (permalink / raw)
  To: git


> Err, ignore me.  I was one patch behind.  That patch from Peter fixes
> the broken build introduced by Jon.
>
> chris

Mea culpa.  Apologies.

jdl

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

* Re: PATCH Documentation/git-rev-list.txt typo fix
  2005-09-16 14:24 ` Peter Hagervall
  2005-09-16 16:31   ` Junio C Hamano
@ 2005-09-16 23:01   ` Junio C Hamano
  1 sibling, 0 replies; 7+ messages in thread
From: Junio C Hamano @ 2005-09-16 23:01 UTC (permalink / raw)
  To: Peter Hagervall; +Cc: jdl, git, junkio

Thanks.  Will be pushed out when mister.kernel.org comes back
online after relocation.

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

end of thread, other threads:[~2005-09-16 23:01 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-09-15 22:40 PATCH Documentation/git-rev-list.txt typo fix jdl
2005-09-16 14:24 ` Peter Hagervall
2005-09-16 16:31   ` Junio C Hamano
2005-09-16 20:02     ` Chris Wright
2005-09-16 20:06       ` Chris Wright
2005-09-16 20:47         ` jdl
2005-09-16 23:01   ` 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).