Commit 3d2be54b authored Aug 09, 2010 by Randy Dunlap Committed by Linus Torvalds Aug 10, 2010

docbook: fix fatal error from libata



'make htmldocs' has a fatal error when processing libata.xml, as seen
below.  The string "Example patterns:" (or any string with "example.*:"
in it AFAIK) causes some part of the doc generation tool chain to try to
produce an <informalexample> block without a beginning <para>, but
there is an ending </para> generated, which throws things out of kilter.

I don't even know where (what program) this is happening in.
I searched in docproc and xmlto and in some XML stylesheets without
finding anything.  If anyone can give me pointers about this, please do.
Until this is fixed, let's just spell "Example" as "Sample"
and match up the double quotation marks while there.

  Documentation/DocBook/libata.xml:6575: parser error : Opening and ending tag mismatch: programlisting line 6573 and para
     </para><para>
            ^
  Documentation/DocBook/libata.xml:6580: parser error : Opening and ending tag mismatch: para line 6575 and programlisting
  </programlisting></informalexample>
                   ^
  unable to parse Documentation/DocBook/libata.xml
  make[2]: *** [Documentation/DocBook/libata.html] Error 1

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent aca0fa34

drivers/ata/libata-core.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4281,7 +4281,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
	* The special characters ?, [, -, or , can be matched using a set, eg. []		* The special characters ?, [, -, or , can be matched using a set, eg. []
	* Behaviour with malformed patterns is undefined, though generally reasonable.		* Behaviour with malformed patterns is undefined, though generally reasonable.
	*		*
	* Example patterns: "SD1?", "SD1[0-5]", "R0", SD1?[012]*xx"		* Sample patterns: "SD1?", "SD1[0-5]", "R0", "SD1?[012]*xx"
	*		*
	* This function uses one level of recursion per '*' in pattern.		* This function uses one level of recursion per '*' in pattern.
	* Since it calls _nothing_ else, and has _no_ explicit local variables,		* Since it calls _nothing_ else, and has _no_ explicit local variables,