[BUG] making docs blows up in b1bfcae438ad:git-merge-file.txt

[BUG] making docs blows up in b1bfcae438ad:git-merge-file.txt

[Randal L. Schwartz]

asciidoc -b xhtml11 -d manpage -f asciidoc.conf git-merge-file.txt
ERROR: manpage document title is mandatory
ERROR: git-merge-file.txt: line 3: title not permitted in sidebar body
ERROR: git-merge-file.txt: line 8: title not permitted in sidebar body
ERROR: git-merge-file.txt: line 15: title not permitted in sidebar body
ERROR: git-merge-file.txt: line 46: title not permitted in sidebar body
ERROR: git-merge-file.txt: line 65: title not permitted in sidebar body
ERROR: git-merge-file.txt: line 79: title not permitted in sidebar body
ERROR: git-merge-file.txt: line 84: title not permitted in sidebar body
ERROR: git-merge-file.txt: line 89: title not permitted in sidebar body
ERROR: git-merge-file.txt: line 92: closing [blockdef-example] delimiter expected
make[1]: *** [git-merge-file.html] Error 1
make: *** [doc] Error 2


-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.

Re: [BUG] making docs blows up in b1bfcae438ad:git-merge-file.txt

[A Large Angry SCM]

Randal L. Schwartz wrote:
> asciidoc -b xhtml11 -d manpage -f asciidoc.conf git-merge-file.txt
> ERROR: manpage document title is mandatory
> ERROR: git-merge-file.txt: line 3: title not permitted in sidebar body
> ERROR: git-merge-file.txt: line 8: title not permitted in sidebar body
> ERROR: git-merge-file.txt: line 15: title not permitted in sidebar body
> ERROR: git-merge-file.txt: line 46: title not permitted in sidebar body
> ERROR: git-merge-file.txt: line 65: title not permitted in sidebar body
> ERROR: git-merge-file.txt: line 79: title not permitted in sidebar body
> ERROR: git-merge-file.txt: line 84: title not permitted in sidebar body
> ERROR: git-merge-file.txt: line 89: title not permitted in sidebar body
> ERROR: git-merge-file.txt: line 92: closing [blockdef-example] delimiter expected
> make[1]: *** [git-merge-file.html] Error 1
> make: *** [doc] Error 2
> 
> 

Re: [BUG] making docs blows up in b1bfcae438ad:git-merge-file.txt

[The Answering Machine]

I've received your mail.
Your message has been queued, and will probably be read within 48 hours.

In the meanwhile, if you're curious about where I am, or what I'm
doing, or have a question that you think I might get asked frequently,
or answer frequently even when not asked, you can check out my FAQ by
sending email to the FAQserver at:

	<merlyn-faq@stonehenge.com>

(The subject line and body of the message are ignored.)

Thank you!

(Please save this message.  You'll get it only once a month, although
the FAQ above is updated frequently and you can request it as you wish.)

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!

Re: [BUG] making docs blows up in b1bfcae438ad:git-merge-file.txt

[Randal L. Schwartz]

>>>>> "The" == The Answering Machine <merlyn.'s-answering.machine@stonehenge.com> writes:

The> I've received your mail.
The> Your message has been queued, and will probably be read within 48 hours.

Naughty SCM sent email addressed to me personally, but added a reply-to
of the list.

My answering machine behaved perfectly in this case, but SCM triggered it
badly. :(

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.

[PATCH] Documentation/git-merge-file.txt: make asciidoc not complain

[Johannes Schindelin]

Noticed by Randal L. Schwartz, this is a fix proposed by
A Large Angry SCM.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
---

	On Sat, 16 Dec 2006, A Large Angry SCM wrote:

	> Randal L. Schwartz wrote:
	> > asciidoc -b xhtml11 -d manpage -f asciidoc.conf git-merge-file.txt
	> > ERROR: manpage document title is mandatory
	> > ERROR: git-merge-file.txt: line 3: title not permitted in sidebar body
	> > [...]
	> > make[1]: *** [git-merge-file.html] Error 1
	> > make: *** [doc] Error 2
	> 
	> Add 5 "=" to line 2.

	... which this patch does. This time, it is asciidoc-tested, too.

 Documentation/git-merge-file.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Documentation/git-merge-file.txt b/Documentation/git-merge-file.txt
index 0b41d66..09fe24f 100644
--- a/Documentation/git-merge-file.txt
+++ b/Documentation/git-merge-file.txt
@@ -1,5 +1,5 @@
 git-merge-file(1)
-============
+=================
 
 NAME
 ----
-- 
1.4.4.2.ga4be2-dirty