diff --git a/doc/src/api/init/sc_card_valid.xml b/doc/src/api/init/sc_card_valid.xml
index 8a06011d..5b2168d0 100644
--- a/doc/src/api/init/sc_card_valid.xml
+++ b/doc/src/api/init/sc_card_valid.xml
@@ -1,4 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <refentry id="sccardvalid">
+	<refentryinfo><title>OpenSC API Reference</title></refentryinfo>
 	<refmeta>
 		<refentrytitle>sc_card_valid</refentrytitle>
 		<manvolnum>3</manvolnum>
@@ -14,7 +16,7 @@
 		<title>Synopsis</title>
 		<para>
 		<programlisting>
-&includes;
+#include &lt;opensc.h&gt;
 
 int sc_card_valid(const <link linkend="sccardt">sc_card_t</link> *card);
 		</programlisting>
diff --git a/doc/src/api/init/sc_connect_card.xml b/doc/src/api/init/sc_connect_card.xml
index 28d0fdfd..182316fb 100644
--- a/doc/src/api/init/sc_connect_card.xml
+++ b/doc/src/api/init/sc_connect_card.xml
@@ -1,4 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <refentry id="scconnectcard">
+	<refentryinfo><title>OpenSC API Reference</title></refentryinfo>
 	<refmeta>
 		<refentrytitle>sc_connect_card</refentrytitle>
 		<manvolnum>3</manvolnum>
@@ -14,7 +16,7 @@
 		<title>Synopsis</title>
 		<para>
 		<programlisting>
-&includes;
+#include &lt;opensc.h&gt;
 
 int sc_connect_card(sc_reader_t *reader, int slot, <link linkend="sccardt">sc_card_t</link> **card);
 		</programlisting>
@@ -40,4 +42,9 @@ int sc_connect_card(sc_reader_t *reader, int slot, <link linkend="sccardt">sc_ca
 		</para>
 	</refsect1>
 
+	<refsect1>
+		<title>Return value</title>
+		<para>Returns 0 if successful, or a negative value in case of error.</para>
+	</refsect1>
+
 </refentry>
diff --git a/doc/src/api/init/sc_detect_card_presence.xml b/doc/src/api/init/sc_detect_card_presence.xml
index 29075c56..87d20968 100644
--- a/doc/src/api/init/sc_detect_card_presence.xml
+++ b/doc/src/api/init/sc_detect_card_presence.xml
@@ -1,4 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <refentry id="scdetectcardpresence">
+	<refentryinfo><title>OpenSC API Reference</title></refentryinfo>
 	<refmeta>
 		<refentrytitle>sc_detect_card_presence</refentrytitle>
 		<manvolnum>3</manvolnum>
@@ -14,7 +16,7 @@
 		<title>Synopsis</title>
 		<para>
 		<programlisting>
-&includes;
+#include &lt;opensc.h&gt;
 
 int sc_detect_card_presence(sc_reader_t *reader, int slot_id);
 		</programlisting>
diff --git a/doc/src/api/init/sc_disconnect_card.xml b/doc/src/api/init/sc_disconnect_card.xml
index 6d259758..e23153e4 100644
--- a/doc/src/api/init/sc_disconnect_card.xml
+++ b/doc/src/api/init/sc_disconnect_card.xml
@@ -1,4 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <refentry id="scdisconnectcard">
+	<refentryinfo><title>OpenSC API Reference</title></refentryinfo>
 	<refmeta>
 		<refentrytitle>sc_disconnect_card</refentrytitle>
 		<manvolnum>3</manvolnum>
@@ -14,7 +16,7 @@
 		<title>Synopsis</title>
 		<para>
 		<programlisting>
-&includes;
+#include &lt;opensc.h&gt;
 
 int sc_disconnect_card(<link linkend="sccardt">sc_card_t</link> *card, int action);
 		</programlisting>
@@ -36,5 +38,10 @@ int sc_disconnect_card(<link linkend="sccardt">sc_card_t</link> *card, int actio
 			The card is not reset nor powered down after the operation.
 		</para>
 	</refsect1>
-	
+
+	<refsect1>
+		<title>Return value</title>
+		<para>Returns 0 if successful, or a negative value in case of error.</para>
+	</refsect1>
+
 </refentry>
diff --git a/doc/src/api/init/sc_establish_context.xml b/doc/src/api/init/sc_establish_context.xml
index 0eb55300..0d6ff142 100644
--- a/doc/src/api/init/sc_establish_context.xml
+++ b/doc/src/api/init/sc_establish_context.xml
@@ -1,4 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <refentry id="scestablishcontext">
+	<refentryinfo><title>OpenSC API Reference</title></refentryinfo>
 	<refmeta>
 		<refentrytitle>sc_establish_context</refentrytitle>
 		<manvolnum>3</manvolnum>
@@ -14,7 +16,7 @@
 		<title>Synopsis</title>
 		<para>
 		<programlisting>
-&includes;
+#include &lt;opensc.h&gt;
 
 int sc_establish_context(sc_context_t **ctx,
                          const char *appname);
@@ -75,4 +77,9 @@ typedef struct sc_reader {
 		</para>
 	</refsect1>
 
+	<refsect1>
+		<title>Return value</title>
+		<para>Returns 0 if successful, or a negative value in case of error.</para>
+	</refsect1>
+
 </refentry>
diff --git a/doc/src/api/init/sc_get_cache_dir.xml b/doc/src/api/init/sc_get_cache_dir.xml
index dad2121a..ca50e84e 100644
--- a/doc/src/api/init/sc_get_cache_dir.xml
+++ b/doc/src/api/init/sc_get_cache_dir.xml
@@ -1,4 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <refentry id="scgetcachedir">
+	<refentryinfo><title>OpenSC API Reference</title></refentryinfo>
 	<refmeta>
 		<refentrytitle>sc_get_cache_dir</refentrytitle>
 		<manvolnum>3</manvolnum>
@@ -14,7 +16,7 @@
 		<title>Synopsis</title>
 		<para>
 		<programlisting>
-&includes;
+#include &lt;opensc.h&gt;
 
 int sc_get_cache_dir(struct sc_context *ctx, char *buf, size_t bufsize);
 		</programlisting>
diff --git a/doc/src/api/init/sc_make_cache_dir.xml b/doc/src/api/init/sc_make_cache_dir.xml
index e2bee6f1..c4af20f5 100644
--- a/doc/src/api/init/sc_make_cache_dir.xml
+++ b/doc/src/api/init/sc_make_cache_dir.xml
@@ -1,4 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <refentry id="scmakecachedir">
+	<refentryinfo><title>OpenSC API Reference</title></refentryinfo>
 	<refmeta>
 		<refentrytitle>sc_make_cache_dir</refentrytitle>
 		<manvolnum>3</manvolnum>
@@ -14,7 +16,7 @@
 		<title>Synopsis</title>
 		<para>
 		<programlisting>
-&includes;
+#include &lt;opensc.h&gt;
 
 int sc_make_cache_dir(struct sc_context *ctx);
 		</programlisting>
diff --git a/doc/src/api/init/sc_release_context.xml b/doc/src/api/init/sc_release_context.xml
index 3785dee7..7ee3e185 100644
--- a/doc/src/api/init/sc_release_context.xml
+++ b/doc/src/api/init/sc_release_context.xml
@@ -1,4 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <refentry id="screleasecontext">
+	<refentryinfo><title>OpenSC API Reference</title></refentryinfo>
 	<refmeta>
 		<refentrytitle>sc_release_context</refentrytitle>
 		<manvolnum>3</manvolnum>
@@ -14,7 +16,7 @@
 		<title>Synopsis</title>
 		<para>
 		<programlisting>
-&includes;
+#include &lt;opensc.h&gt;
 
 int sc_release_context(sc_context_t *ctx);
 		</programlisting>
@@ -29,9 +31,11 @@ int sc_release_context(sc_context_t *ctx);
 			to <link linkend="scestablishcontext">sc_establish_context()</link>. No further calls to OpenSC
 			using this context are possible after this.
 		</para>
+	</refsect1>
 
-		<para>
-		</para>
+	<refsect1>
+		<title>Return value</title>
+		<para>This function always return 0, indicating success.</para>
 	</refsect1>
 
 </refentry>
diff --git a/doc/src/api/init/sc_set_card_driver.xml b/doc/src/api/init/sc_set_card_driver.xml
index 8a4839c7..560a0f04 100644
--- a/doc/src/api/init/sc_set_card_driver.xml
+++ b/doc/src/api/init/sc_set_card_driver.xml
@@ -1,4 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <refentry id="scsetcarddriver">
+	<refentryinfo><title>OpenSC API Reference</title></refentryinfo>
 	<refmeta>
 		<refentrytitle>sc_set_card_driver</refentrytitle>
 		<manvolnum>3</manvolnum>
@@ -14,7 +16,7 @@
 		<title>Synopsis</title>
 		<para>
 		<programlisting>
-&includes;
+#include &lt;opensc.h&gt;
 
 int sc_set_card_driver(struct sc_context *ctx, const char *short_name);
 		</programlisting>