All of lore.kernel.org
 help / color / mirror / Atom feed
From: Gustaf Hendeby <hendeby@isy.liu.se>
To: Git Mailing List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [BUG] Problem compiling documentation
Date: Thu, 04 Sep 2008 12:43:59 +0200	[thread overview]
Message-ID: <48BFBBEF.6010403@isy.liu.se> (raw)

Hi!

Trying to compile the documentation from next has failed for me for a
while and now I got to the point where I tracked down the offending
commit: 70a3f89733a (git-merge documentation: describe how conflict is
presented).

I don't have time to dig much deeper into this until later today, but it
seems to be that the conflict markers are interpreted to indicate a
section heading, that is then not correctly formated.  The error i get
is listed below.  Feel free to try to beat me to finding a nice solution. :)

I am using xmlto 0.0.21 and Asciidoc 8.2.7.

/Gustaf

xmlto -m callouts.xsl man git-merge.xml
xmlto: input does not validate (status 1)
/scratch/src/git/git/Documentation/git-merge.xml:551: parser error :
attributes construct error
"&lt;&lt;&lt;&lt;<link
linkend=""">"======="</link>&gt;&gt;&gt;&gt;&gt;".  The p
                                 ^
/scratch/src/git/git/Documentation/git-merge.xml:551: parser error :
Couldn't find end of Start Tag link line 551
"&lt;&lt;&lt;&lt;<link
linkend=""">"======="</link>&gt;&gt;&gt;&gt;&gt;".  The p
                                 ^
/scratch/src/git/git/Documentation/git-merge.xml:551: parser error :
Opening and ending tag mismatch: simpara line 550 and link
"&lt;&lt;&lt;&lt;<link
linkend=""">"======="</link>&gt;&gt;&gt;&gt;&gt;".  The p
                                                   ^
/scratch/src/git/git/Documentation/git-merge.xml:552: parser error :
Opening and ending tag mismatch: refsect1 line 526 and simpara
typically your side, and the part after it is typically their
side.</simpara>

     ^
/scratch/src/git/git/Documentation/git-merge.xml:577: parser error :
attributes construct error
<simpara>In addition to the "&lt;&lt;&lt;&lt;<link
linkend=""">"======="</link>&
                                                             ^
/scratch/src/git/git/Documentation/git-merge.xml:577: parser error :
Couldn't find end of Start Tag link line 577
<simpara>In addition to the "&lt;&lt;&lt;&lt;<link
linkend=""">"======="</link>&
                                                             ^
/scratch/src/git/git/Documentation/git-merge.xml:577: parser error :
Opening and ending tag mismatch: simpara line 577 and link
<simpara>In addition to the "&lt;&lt;&lt;&lt;<link
linkend=""">"======="</link>&

       ^
/scratch/src/git/git/Documentation/git-merge.xml:582: parser error :
Opening and ending tag mismatch: refentry line 3 and simpara
viewing the original.</simpara>
                               ^
/scratch/src/git/git/Documentation/git-merge.xml:584: parser error :
Extra content at the end of the document
</refsect1>
^

             reply	other threads:[~2008-09-04 10:45 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-09-04 10:43 Gustaf Hendeby [this message]
2008-09-04 21:48 ` [PATCH] Fix AsciiDoc errors in merge documentation Johan Herland
2008-09-04 22:26   ` Gustaf Hendeby
2008-09-04 23:19   ` Junio C Hamano
2008-09-05  6:09     ` Johan Herland

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=48BFBBEF.6010403@isy.liu.se \
    --to=hendeby@isy.liu.se \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.