diff --git a/doc/api/tmpl/gphoto2-camera.sgml b/doc/api/tmpl/gphoto2-camera.sgml
index d1aaff0ca..0c4d39d25 100644
--- a/doc/api/tmpl/gphoto2-camera.sgml
+++ b/doc/api/tmpl/gphoto2-camera.sgml
@@ -216,6 +216,14 @@ Error reporting can be performed using #gp_camera_set_error and #gp_camera_get_e
 @summary: 
 @manual: 
 @about: 
+@reserved1: 
+@reserved2: 
+@reserved3: 
+@reserved4: 
+@reserved5: 
+@reserved6: 
+@reserved7: 
+@reserved8: 
 
 <!-- ##### STRUCT Camera ##### -->
 <para>
diff --git a/doc/api/tmpl/gphoto2-filesys.sgml b/doc/api/tmpl/gphoto2-filesys.sgml
index 4f42b60cb..c1a9c8242 100644
--- a/doc/api/tmpl/gphoto2-filesys.sgml
+++ b/doc/api/tmpl/gphoto2-filesys.sgml
@@ -104,9 +104,9 @@ retreiving information about a file, etc.
 </para>
 
 @fields: 
-@type: 
-@size: 
 @status: 
+@size: 
+@type: 
 
 <!-- ##### STRUCT CameraFileInfoPreview ##### -->
 <para>
@@ -114,11 +114,11 @@ retreiving information about a file, etc.
 </para>
 
 @fields: 
-@type: 
+@status: 
 @size: 
+@type: 
 @width: 
 @height: 
-@status: 
 
 <!-- ##### STRUCT CameraFileInfoFile ##### -->
 <para>
@@ -126,13 +126,13 @@ retreiving information about a file, etc.
 </para>
 
 @fields: 
-@type: 
-@permissions: 
-@name: 
+@status: 
 @size: 
+@type: 
 @width: 
 @height: 
-@status: 
+@name: 
+@permissions: 
 @mtime: 
 
 <!-- ##### STRUCT CameraFileInfo ##### -->
diff --git a/doc/api/tmpl/gphoto2-unused.sgml b/doc/api/tmpl/gphoto2-unused.sgml
index 122c4b796..11ecc559e 100644
--- a/doc/api/tmpl/gphoto2-unused.sgml
+++ b/doc/api/tmpl/gphoto2-unused.sgml
@@ -38,6 +38,35 @@ CameraAbilities
 CameraAbilities
 
 
+<!-- ##### SECTION ./tmpl/gphoto2-context.sgml:Long_Description ##### -->
+<para>
+  This section describes how to monitor and control operations.
+</para>
+
+<para>
+  Operations that involve communication with digital cameras can 
+  take some time. For example, downloading an image over a slow serial
+  line can take several minutes. In order to be able to keep the frontend
+  responsive, to give the user the possibility to cancel operations, and in
+  order to be able to
+  report detailed error messages, #GPContext has been introduced.
+</para>
+
+
+<!-- ##### SECTION ./tmpl/gphoto2-context.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/gphoto2-context.sgml:Short_Description ##### -->
+The structure giving you control over operations
+
+
+<!-- ##### SECTION ./tmpl/gphoto2-context.sgml:Title ##### -->
+GPContext
+
+
 <!-- ##### USER_FUNCTION CameraFileGetConfigFunc ##### -->
 <para>
 
@@ -128,6 +157,12 @@ CameraAbilities
 @status: 
 @data: 
 
+<!-- ##### STRUCT GPContext ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### MACRO GP_ERROR_IO ##### -->
 <para>
 
@@ -253,6 +288,172 @@ CameraAbilities
 @Varargs: 
 @Returns: 
 
+<!-- ##### FUNCTION gp_context_cancel ##### -->
+<para>
+
+</para>
+
+@context: 
+@Returns: 
+
+<!-- ##### FUNCTION gp_context_error ##### -->
+<para>
+
+</para>
+
+@context: 
+@format: 
+@Varargs: 
+
+<!-- ##### FUNCTION gp_context_idle ##### -->
+<para>
+
+</para>
+
+@context: 
+
+<!-- ##### FUNCTION gp_context_message ##### -->
+<para>
+
+</para>
+
+@context: 
+@format: 
+@Varargs: 
+
+<!-- ##### FUNCTION gp_context_new ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
+<!-- ##### FUNCTION gp_context_progress_start ##### -->
+<para>
+
+</para>
+
+@context: 
+@target: 
+@format: 
+@Varargs: 
+@Returns: 
+
+<!-- ##### FUNCTION gp_context_progress_stop ##### -->
+<para>
+
+</para>
+
+@context: 
+@id: 
+
+<!-- ##### FUNCTION gp_context_progress_update ##### -->
+<para>
+
+</para>
+
+@context: 
+@id: 
+@current: 
+
+<!-- ##### FUNCTION gp_context_question ##### -->
+<para>
+
+</para>
+
+@context: 
+@format: 
+@Varargs: 
+@Returns: 
+
+<!-- ##### FUNCTION gp_context_ref ##### -->
+<para>
+
+</para>
+
+@context: 
+
+<!-- ##### FUNCTION gp_context_set_cancel_func ##### -->
+<para>
+
+</para>
+
+@context: 
+@func: 
+@data: 
+
+<!-- ##### FUNCTION gp_context_set_error_func ##### -->
+<para>
+
+</para>
+
+@context: 
+@func: 
+@data: 
+
+<!-- ##### FUNCTION gp_context_set_idle_func ##### -->
+<para>
+
+</para>
+
+@context: 
+@func: 
+@data: 
+
+<!-- ##### FUNCTION gp_context_set_message_func ##### -->
+<para>
+
+</para>
+
+@context: 
+@func: 
+@data: 
+
+<!-- ##### FUNCTION gp_context_set_progress_funcs ##### -->
+<para>
+
+</para>
+
+@context: 
+@start_func: 
+@update_func: 
+@stop_func: 
+@data: 
+
+<!-- ##### FUNCTION gp_context_set_question_func ##### -->
+<para>
+
+</para>
+
+@context: 
+@func: 
+@data: 
+
+<!-- ##### FUNCTION gp_context_set_status_func ##### -->
+<para>
+
+</para>
+
+@context: 
+@func: 
+@data: 
+
+<!-- ##### FUNCTION gp_context_status ##### -->
+<para>
+
+</para>
+
+@context: 
+@format: 
+@Varargs: 
+
+<!-- ##### FUNCTION gp_context_unref ##### -->
+<para>
+
+</para>
+
+@context: 
+
 <!-- ##### FUNCTION gp_file_get_last_chunk ##### -->
 <para>