diff --git a/doc/Makefile.am b/doc/Makefile.am
index d5e1db5..f304226 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -20,8 +20,7 @@ all_html = $(srcdir)/doc_html
install_html = install_html
uninstall_html = uninstall_html
-#pdf output for xmlto is broken in debian etch
-#dist_pdf_DATA = comedilib.pdf
+# dist_pdf_DATA = comedilib.pdf
dist_pdf_DATA =
all_man = $(srcdir)/man
diff --git a/doc/calibration_funcref.txt b/doc/calibration_funcref.txt
index e07fc46..9bb05ad 100644
--- a/doc/calibration_funcref.txt
+++ b/doc/calibration_funcref.txt
@@ -1,3 +1,4 @@
+Calibration
Function: comedi_apply_calibration -- set hardware calibration from file
Retval: int
Param: comedi_t *device
diff --git a/doc/comedilib.xml b/doc/comedilib.xml
index 5bb9ed5..f7bfabe 100644
--- a/doc/comedilib.xml
+++ b/doc/comedilib.xml
@@ -81,19 +81,12 @@
-
-
+
+
+
+
+
diff --git a/doc/command_funcref.txt b/doc/command_funcref.txt
index f360b26..167fe0a 100644
--- a/doc/command_funcref.txt
+++ b/doc/command_funcref.txt
@@ -1,3 +1,4 @@
+Asynchronous commands
Function: comedi_cancel -- stop streaming input/output in progress
Retval: int
Param: comedi_t * device
diff --git a/doc/deprecated_funcref.txt b/doc/deprecated_funcref.txt
index 63be594..5ddb10c 100644
--- a/doc/deprecated_funcref.txt
+++ b/doc/deprecated_funcref.txt
@@ -1,3 +1,4 @@
+Deprecated functions
Function: comedi_dio_bitfield -- read/write multiple digital channels
Retval: int
Param: comedi_t * device
diff --git a/doc/dio_funcref.txt b/doc/dio_funcref.txt
index fb78a6c..ffe2e2e 100644
--- a/doc/dio_funcref.txt
+++ b/doc/dio_funcref.txt
@@ -1,3 +1,4 @@
+Digital I/O
Function: comedi_dio_bitfield2 -- read/write multiple digital channels
Retval: int
Param: comedi_t * device
diff --git a/doc/error_funcref.txt b/doc/error_funcref.txt
index 133b4fc..5872802 100644
--- a/doc/error_funcref.txt
+++ b/doc/error_funcref.txt
@@ -1,3 +1,4 @@
+Error reporting
Function: comedi_errno -- number of last Comedilib error
Retval: int
Param: void
diff --git a/doc/extensions_funcref.txt b/doc/extensions_funcref.txt
index bb533ef..0abb201 100644
--- a/doc/extensions_funcref.txt
+++ b/doc/extensions_funcref.txt
@@ -1,3 +1,4 @@
+Extensions
Function: comedi_arm -- arm a subdevice
Retval: int
Param: comedi_t * device
diff --git a/doc/funcref b/doc/funcref
index 3b880e6..1df2f31 100644
--- a/doc/funcref
+++ b/doc/funcref
@@ -1,3 +1,4 @@
+Core Functions
Function: comedi_close -- close a Comedi device
Retval: int
Param: comedi * device
diff --git a/doc/mkref b/doc/mkref
index 8ded9c1..10a6284 100755
--- a/doc/mkref
+++ b/doc/mkref
@@ -7,6 +7,9 @@ $header="#include <comedilib.h>";
$end = "";
$refentry_end = "";
+$s = <>;
+chomp $s;
+
print
'
+';
+print $s;
+print '
';
while($s = <>){
diff --git a/doc/reference.xml b/doc/reference.xml
index 465ea2e..6a5320d 100644
--- a/doc/reference.xml
+++ b/doc/reference.xml
@@ -727,34 +727,13 @@ raw/physical conversion functions.