summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGravatar Stefan Richter 2010-01-09 19:34:03 +0100
committerGravatar Dan Dennedy 2010-01-10 14:47:44 -0800
commit6b7b3cbc1e5ebae0e602b673e47ae08084e1e2df (patch)
tree0dcdf114569c0f177c2bc799b4b52013c2acfc62 /doc
parentUpdate ChangeLog for release. (diff)
Fix "make doc".
Reported by Guus Sliepen: "make doc" failed due to missing doctype, unknown elements, and duplicate element IDs in libraw1394.sgml. The fix is to declare a recent DTD (matching the one which is used in current Linux kernel documentation docbooks) and to make the conflicting element IDs unique. The latter part of the fix is just temporary. In order to avoid the conflict when the documentation is updated the next time, also fix the kerneldoc comments of the respective API elements: These are typedefs, hence kernel-doc needs their comments prepended by "typedef ". Tested with Gentoo's docbook-xml-dtd 4.5, docbook-xsl-stylesheets 1.75.2, docbook-sgml-utils 0.6.14, and openjade 1.3.2-r1. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> Signed-off-by: Dan Dennedy <dan@dennedy.org>
Diffstat (limited to 'doc')
-rw-r--r--doc/libraw1394.sgml10
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/libraw1394.sgml b/doc/libraw1394.sgml
index d5c11bf..88e97e9 100644
--- a/doc/libraw1394.sgml
+++ b/doc/libraw1394.sgml
@@ -1,6 +1,6 @@
-<!--
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V3.1//EN">
--->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []>
<book>
<bookinfo>
@@ -3184,7 +3184,7 @@
</refsect1>
</refentry>
-<refentry id="API-int">
+<refentry id="API-req_callback_t">
<refentryinfo>
<title>LINUX</title>
<productname>Kernel Hackers Manual</productname>
@@ -3231,7 +3231,7 @@
</refsect1>
</refentry>
-<refentry id="API-int">
+<refentry id="API-arm_req_callback_t">
<refentryinfo>
<title>LINUX</title>
<productname>Kernel Hackers Manual</productname>