2 files changed, 72 insertions, 16 deletions
diff --git a/libgphoto2_port/doc/gphoto2-port-api.sgml b/libgphoto2_port/doc/gphoto2-port-api.sgml
index e274fcf74..cb59d5a8e 100644
--- a/libgphoto2_port/doc/gphoto2-port-api.sgml
+++ b/libgphoto2_port/doc/gphoto2-port-api.sgml
@@ -2,6 +2,8 @@
 <!entity hash "#">
 <!entity gphoto2-port-log       SYSTEM "sgml/gphoto2-port-log.sgml">
 <!entity gphoto2-port-info-list SYSTEM "sgml/gphoto2-port-info-list.sgml">
+<!entity gphoto2-port-result    SYSTEM "sgml/gphoto2-port-result.sgml">
+<!entity gphoto2-port           SYSTEM "sgml/gphoto2-port.sgml">
 ]>
 
 <book id="index">
@@ -45,14 +47,9 @@
 
   <chapter id="gphoto2-base" role="no-toc">
     <title>GPhoto2-Port Core Reference</title>
-      <para>
-        GPhoto2-Port provides some useful mechanisms that are used by 
-	GPhoto2-Port itself and can be used by libraries that use
-	GPhoto2-Port.
-      </para>
-
       &gphoto2-port-log;
+      &gphoto2-port-result;
       &gphoto2-port-info-list;
-
+      &gphoto2-port;
   </chapter>
 </book>
diff --git a/libgphoto2_port/doc/gphoto2-port-sections.txt b/libgphoto2_port/doc/gphoto2-port-sections.txt
index df1394106..ffcf96b33 100644
--- a/libgphoto2_port/doc/gphoto2-port-sections.txt
+++ b/libgphoto2_port/doc/gphoto2-port-sections.txt
@@ -1,23 +1,82 @@
 <SECTION>
-<FILE>gphoto2-port-core</FILE>
-<TITLE>GPhoto2-Port-Core</TITLE>
+<FILE>gphoto2-port</FILE>
+<TITLE>GPhoto2-Port</TITLE>
+GPPortPrivateLibrary
+GPPortPrivateCore
+GPPortSettingsSerial
+GPPortSettingsUSB
+GPPortSettings
+GPPort
+
+gp_port_new
+gp_port_free
+
+gp_port_set_info
+gp_port_get_info
+
+gp_port_open
+gp_port_close
+
+gp_port_read
+gp_port_write
+
+gp_port_get_settings
+gp_port_set_settings
+
+gp_port_get_timeout
+gp_port_set_timeout
+
+gp_port_get_pin
+gp_port_set_pin
+
+gp_port_get_error
+gp_port_set_error
+</SECTION>
+
+<SECTION>
+<FILE>gphoto2-port-info-list</FILE>
+<TITLE>GPhoto2-Port-Info-List</TITLE>
 GPPortInfo
-gp_port_core_count
-gp_port_core_get_library
-gp_port_core_get_info
+GPPortInfoList
+
+gp_port_info_list_new
+gp_port_info_list_free
+
+gp_port_info_list_load
+gp_port_info_list_count
+
+gp_port_info_list_get_info
+
+gp_port_info_list_lookup_path
+gp_port_info_list_lookup_name
+
+gp_port_info_list_append
+</SECTION>
+
+<SECTION>
+<FILE>gphoto2-port-result</FILE>
+<TITLE>GPhoto2-Port-Result</TITLE>
+GP_OK
+GP_ERROR_NOT_SUPPORTED
+GP_ERROR_BAD_PARAMETERS
+GP_ERROR_NO_MEMORY
+GP_ERROR_TIMEOUT
+GP_ERROR_LIBRARY
+gp_port_result_as_string
 </SECTION>
 
 <SECTION>
 <FILE>gphoto2-port-log</FILE>
 <TITLE>GPhoto2-Port-Log</TITLE>
-GPLogLevels
+GP_LOG_ERROR
+GP_LOG_VERBOSE
+GP_LOG_DEBUG
+GP_LOG_DATA
 GPLogFunc
 gp_log_add_func
 gp_log_remove_func
 gp_log
 gp_log_data
-gp_log_history_set_size
-gp_log_history_get_size
-gp_log_history_get
 </SECTION>
 
+