From d79042bd0b898ec91f37b77f08c5e65d07d69a4b Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 3 Oct 2014 19:01:56 +0200 Subject: doc/asciidoc: always apply Buildroot's AsciiDoc config As suggested by Thomas: the AsciiDoc options we use ensure we get a sane output of the document. We want that configuration to be applied to other documents as well. Up until now, it was implicit that the configuration was applied to our manual, becasue we only supported document-specific configuration, and the configuration we had was in our manual dir, so we got to use it. But now, we can render other documents, especially ones from br2-external, and we want those to also use the default configuration from Buildroot, but still be able to provide their own customisation. So, always add Buildroot's configuration first, if available, before we append the document's configuration. Signed-off-by: "Yann E. MORIN" Cc: Samuel Martin Cc: Thomas De Schampheleire Reviewed-by: Samuel Martin Reviewed-by: Thomas De Schampheleire Signed-off-by: Peter Korsgaard --- docs/manual/asciidoc-text.conf | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 docs/manual/asciidoc-text.conf (limited to 'docs/manual') diff --git a/docs/manual/asciidoc-text.conf b/docs/manual/asciidoc-text.conf deleted file mode 100644 index 470bdecfc2..0000000000 --- a/docs/manual/asciidoc-text.conf +++ /dev/null @@ -1,23 +0,0 @@ -# Refer to following asciidoc documentation: -# http://www.methods.co.nz/asciidoc/userguide.html -# In particular sections "Macros" and "Attribute References" -# -# For hyperlinks, show 'link text [URL]' (if link text provided) or 'URL' -[http-inlinemacro] -{0=}{0? [}{name}:{target}{0?]} -[https-inlinemacro] -{0=}{0? [}{name}:{target}{0?]} -[ftp-inlinemacro] -{0=}{0? [}{name}:{target}{0?]} -[file-inlinemacro] -{0=}{0? [}{name}:{target}{0?]} -[irc-inlinemacro] -{0=}{0? [}{name}:{target}{0?]} -[mailto-inlinemacro] -{0=}{0? [}{name}:{target}{0?]} - -# Hide image representation from text manual -[image-inlinemacro] -{empty} -[image-blockmacro] -{empty} -- cgit v1.2.3