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

3 messages, 3 authors, 2016-08-11 · open the first message on its own page

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

From: Randal L. Schwartz <hidden>
Date: 2016-08-11 19:52:47

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
[off-list ref] <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

From: A Large Angry SCM <hidden>
Date: 2016-08-11 19:40:41

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

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

From: Johannes Schindelin <hidden>
Date: 2016-08-11 20:25:46

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

Signed-off-by: Johannes Schindelin <redacted>
---

	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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help