diff --git a/src/documentation/docbook-xsl/html/synop.xsl b/src/documentation/docbook-xsl/html/synop.xsl
index 62e2e90a05..12ac37a455 100644
--- a/src/documentation/docbook-xsl/html/synop.xsl
+++ b/src/documentation/docbook-xsl/html/synop.xsl
@@ -730,6 +730,9 @@ paramdef      ::= (#PCDATA|type|replaceable|parameter|funcparams)*
       <xsl:when test="@language">
 	<xsl:value-of select="@language"/>
       </xsl:when>
+      <xsl:when test="$language">
+	<xsl:value-of select="$language"/>
+      </xsl:when>
       <xsl:otherwise>
 	<xsl:value-of select="$default-classsynopsis-language"/>
       </xsl:otherwise>
@@ -1071,7 +1074,6 @@ paramdef      ::= (#PCDATA|type|replaceable|parameter|funcparams)*
 <xsl:template match="type" mode="cpp">
   <span class="{name(.)}">
     <xsl:apply-templates mode="cpp"/>
-    <xsl:text>&nbsp;</xsl:text>
   </span>
 </xsl:template>
 
diff --git a/src/documentation/haiku_book/Jamfile b/src/documentation/haiku_book/Jamfile
index d71ca51dbe..a5663cec17 100644
--- a/src/documentation/haiku_book/Jamfile
+++ b/src/documentation/haiku_book/Jamfile
@@ -8,7 +8,7 @@ Doc2HTML
 	: [ FDirName $(HAIKU_TOP) src documentation docbook-xsl html chunk.xsl ]
 	: Haiku_Book
 	:
-	: -stringparam use.id.as.filename 1
+	: -stringparam use.id.as.filename 1 -stringparam language cpp
 	;
 
 # Single most ugly string manipulation ever ...
@@ -71,7 +71,8 @@ local media_files = intro.xml ;
 Includes [ FGristFiles mediakit.xml ] : [ FRelGristFiles $(media_files) : media ] ;
 SEARCH on [ FRelGristFiles $(media_files) : media ] = [ FDirName $(SUBDIR) media ] ;
 
-local midi_files = intro.xml ;
+local midi_files = intro.xml midi2.xml midi2consumer.xml midi2endpoint.xml midi2localproducer.xml midi2roster.xml
+	midi1.xml midi2api.xml midi2defs.xml midi2localconsumer.xml midi2producer.xml ;
 Includes [ FGristFiles midikit.xml ] : [ FRelGristFiles $(midi_files) : midi ] ;
 SEARCH on [ FRelGristFiles $(midi_files) : midi ] = [ FDirName $(SUBDIR) midi ] ;
 
diff --git a/src/documentation/haiku_book/midi/midi2endpoint.xml b/src/documentation/haiku_book/midi/midi2endpoint.xml
index 51baeaad0f..2274ae2ef8 100644
--- a/src/documentation/haiku_book/midi/midi2endpoint.xml
+++ b/src/documentation/haiku_book/midi/midi2endpoint.xml
@@ -21,7 +21,7 @@
 		count drops to zero. If necessary, the destructor of a local endpoint first 
 		breaks off any connections and &BMidiEndpoint_Unregister;'s the endpoint before it is 
 		deleted. However, for good style and bonus points you should really 
-		BMidiProducer::Disconnect() and &BMidiEndpoint_Unregister; the object 
+		&BMidiProducer_Disconnect; and &BMidiEndpoint_Unregister; the object 
 		yourself and not rely on the destructor to do this.
 	</para>
 	
@@ -55,7 +55,7 @@
 		<title>SetName()</title>
 		
 		<methodsynopsis>
-			<type>void</type> <methodname>SetName</methodname>
+			<void/> <methodname>SetName</methodname>
 			<methodparam><modifier>const</modifier><type>char *</type><parameter>name</parameter></methodparam>
 		</methodsynopsis>
 		
@@ -244,7 +244,7 @@ if (endp->IsConsumer())
 	</sect3>
 	
 	<sect3 id="bmidiendpoint_acquire">
-		<title>status_t BMidiEndpoint::Acquire()</title>
+		<title>Acquire()</title>
 		
 		<methodsynopsis>
 			<type>status_t</type> <methodname>Acquire</methodname> <void/>
@@ -297,7 +297,7 @@ if (endp->IsConsumer())
 	</sect3>
 	
 	<sect3 id="bmidiendpoint_release">
-		<title>status_t BMidiEndpoint::Release()</title>
+		<title>Release()</title>
 		
 		<methodsynopsis>
 			<type>status_t</type> <methodname>Release</methodname> <void/>
@@ -347,7 +347,7 @@ if (endp->IsConsumer())
 		</para>
 		
 		<para>	
-			If you are &BMidiRoster;::&BMidiRoster_StartWatching; watching, you will 
+			If you are &BMidiRoster_StartWatching; watching, you will 
 			<emphasis>not</emphasis> receive notifications for any local endpoints you register or 
 			unregister. Of course, other applications <emphasis>will</emphasis> be notified about your 
 			endpoints.
@@ -372,12 +372,9 @@ if (endp->IsConsumer())
 	<sect3 id="bmidiendpoint_unregister">
 		<title>Unregister()</title>
 		
-		<funcsynopsis>
-			<funcprototype>
-				<funcdef>status_t <function>Unregister</function></funcdef>
-				<void/>
-			</funcprototype>
-		</funcsynopsis>
+		<methodsynopsis>
+			<type>status_t</type> <methodname>Unregister</methodname> <void/>
+		</methodsynopsis>
 		
 		<para>
 			Hides the endpoint from the roster.
diff --git a/src/documentation/haiku_book/midi/midi2producer.xml b/src/documentation/haiku_book/midi/midi2producer.xml
index 815800e7b9..d66123449a 100644
--- a/src/documentation/haiku_book/midi/midi2producer.xml
+++ b/src/documentation/haiku_book/midi/midi2producer.xml
@@ -51,7 +51,7 @@
 	</sect3>
 	
 	<sect3 id="bmidiproducer_disconnect">
-		<title>status_t Disconnect(BMidiConsumer *cons)</title>
+		<title>Disconnect()</title>
 		
 		<methodsynopsis>
 			<type>status_t</type>