diff --git a/doc/api/tmpl/gphoto2-camera.sgml b/doc/api/tmpl/gphoto2-camera.sgml
index 7298c25b4..4d299d5b6 100644
--- a/doc/api/tmpl/gphoto2-camera.sgml
+++ b/doc/api/tmpl/gphoto2-camera.sgml
@@ -438,6 +438,15 @@ Error reporting can be performed using #gp_camera_set_error and #gp_camera_get_e
 @Returns: 
 
 
+<!-- ##### FUNCTION gp_camera_exit ##### -->
+<para>
+
+</para>
+
+@camera: 
+@Returns: 
+
+
 <!-- ##### TYPEDEF CameraFilePath ##### -->
 <para>
 
diff --git a/doc/api/tmpl/gphoto2-file.sgml b/doc/api/tmpl/gphoto2-file.sgml
index a8f59c2da..7884d5837 100644
--- a/doc/api/tmpl/gphoto2-file.sgml
+++ b/doc/api/tmpl/gphoto2-file.sgml
@@ -163,6 +163,13 @@ An abstraction of files
 
 
 
+<!-- ##### MACRO GP_MIME_BMP ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO GP_MIME_CRW ##### -->
 <para>
   Canon cameras store files in a special format, the Canon RaW file format.
@@ -180,11 +187,16 @@ An abstraction of files
 
 
 
-<!-- ##### MACRO GP_MIME_UNKNOWN ##### -->
+<!-- ##### MACRO GP_MIME_PGM ##### -->
 <para>
-  For files that are not recognized by our driver yet.
-  DO NOT use this when you're just too lazy to use the proper MIME
-  type, or we will feed you to Crud Puppy.
+
+</para>
+
+
+
+<!-- ##### MACRO GP_MIME_PNG ##### -->
+<para>
+
 </para>
 
 
@@ -196,20 +208,6 @@ An abstraction of files
 
 
 
-<!-- ##### MACRO GP_MIME_BMP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO GP_MIME_TIFF ##### -->
-<para>
-
-</para>
-
-
-
 <!-- ##### MACRO GP_MIME_QUICKTIME ##### -->
 <para>
 
@@ -217,20 +215,6 @@ An abstraction of files
 
 
 
-<!-- ##### MACRO GP_MIME_WAV ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO GP_MIME_PGM ##### -->
-<para>
-
-</para>
-
-
-
 <!-- ##### MACRO GP_MIME_RAW ##### -->
 <para>
 
@@ -238,6 +222,29 @@ An abstraction of files
 
 
 
+<!-- ##### MACRO GP_MIME_TIFF ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GP_MIME_UNKNOWN ##### -->
+<para>
+  For files that are not recognized by our driver yet.
+  DO NOT use this when you're just too lazy to use the proper MIME
+  type, or we will feed you to Crud Puppy.
+</para>
+
+
+
+<!-- ##### MACRO GP_MIME_WAV ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### FUNCTION gp_file_get_mime_type ##### -->
 <para>
 
@@ -276,6 +283,82 @@ An abstraction of files
 @Returns: 
 
 
+<!-- ##### FUNCTION gp_file_convert ##### -->
+<para>
+
+</para>
+
+@file: 
+@mime_type: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gp_file_copy ##### -->
+<para>
+
+</para>
+
+@destination: 
+@source: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gp_file_get_last_chunk ##### -->
+<para>
+
+</para>
+
+@Param1: 
+@data: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gp_file_set_color_table ##### -->
+<para>
+
+</para>
+
+@file: 
+@red_table: 
+@red_size: 
+@green_table: 
+@green_size: 
+@blue_table: 
+@blue_size: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gp_file_set_conversion_method ##### -->
+<para>
+
+</para>
+
+@file: 
+@method: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gp_file_set_header ##### -->
+<para>
+
+</para>
+
+@file: 
+@header: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gp_file_set_width_and_height ##### -->
+<para>
+
+</para>
+
+@file: 
+@width: 
+@height: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gp_file_get_data_and_size ##### -->
 <para>
 
@@ -283,8 +366,9 @@ An abstraction of files
 
 @Param1: 
 @data: 
-@size: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@size: 
 
 
 <!-- ##### FUNCTION gp_file_set_data_and_size ##### -->
@@ -294,7 +378,8 @@ An abstraction of files
 
 @Param1: 
 @data: 
-@size: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@size: 
 
 
diff --git a/doc/api/tmpl/gphoto2-filesys.sgml b/doc/api/tmpl/gphoto2-filesys.sgml
index d3ea156ee..91bc3b481 100644
--- a/doc/api/tmpl/gphoto2-filesys.sgml
+++ b/doc/api/tmpl/gphoto2-filesys.sgml
@@ -425,6 +425,17 @@ retreiving information about a file, etc.
 @Returns: 
 
 
+<!-- ##### FUNCTION gp_filesystem_set_info_noop ##### -->
+<para>
+
+</para>
+
+@fs: 
+@folder: 
+@info: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gp_filesystem_number ##### -->
 <para>