Combine entry and monitor API reference for mounts, fstab and crypttab

Signed-off-by: David Zeuthen <davidz@redhat.com>

diff --git a/doc/udisks2-docs.xml b/doc/udisks2-docs.xml
index 4e6574f..863c448 100644 (file)
--- a/doc/udisks2-docs.xml
+++ b/doc/udisks2-docs.xml
@@ -183,11 +183,8 @@
     <chapter id="ref-daemon-monitoring">
       <title>State and Configuration</title>
       <xi:include href="xml/udisksmountmonitor.xml"/>
-      <xi:include href="xml/udisksmount.xml"/>
       <xi:include href="xml/udisksfstabmonitor.xml"/>
-      <xi:include href="xml/udisksfstabentry.xml"/>
       <xi:include href="xml/udiskscrypttabmonitor.xml"/>
-      <xi:include href="xml/udiskscrypttabentry.xml"/>
     </chapter>
     <chapter id="ref-daemon-jobs">
       <title>Jobs</title>

diff --git a/doc/udisks2-sections.txt b/doc/udisks2-sections.txt
index 1d17e3d..cbab86d 100644 (file)
--- a/doc/udisks2-sections.txt
+++ b/doc/udisks2-sections.txt
@@ -227,34 +227,27 @@ udisks_linux_provider_get_type
 </SECTION>
 
 <SECTION>
-<FILE>udisksmount</FILE>
-<TITLE>UDisksMount</TITLE>
+<FILE>udisksmountmonitor</FILE>
+<TITLE>UDisksMountMonitor</TITLE>
 UDisksMount
 UDisksMountType
 udisks_mount_get_dev
 udisks_mount_get_mount_type
 udisks_mount_get_mount_path
 udisks_mount_compare
-<SUBSECTION Standard>
-UDISKS_TYPE_MOUNT
-UDISKS_MOUNT
-UDISKS_IS_MOUNT
-<SUBSECTION Private>
-udisks_mount_get_type
-</SECTION>
-
-<SECTION>
-<FILE>udisksmountmonitor</FILE>
-<TITLE>UDisksMountMonitor</TITLE>
 UDisksMountMonitor
 udisks_mount_monitor_new
 udisks_mount_monitor_get_mounts_for_dev
 udisks_mount_monitor_is_dev_in_use
 <SUBSECTION Standard>
+UDISKS_TYPE_MOUNT
+UDISKS_MOUNT
+UDISKS_IS_MOUNT
 UDISKS_TYPE_MOUNT_MONITOR
 UDISKS_MOUNT_MONITOR
 UDISKS_IS_MOUNT_MONITOR
 <SUBSECTION Private>
+udisks_mount_get_type
 udisks_mount_monitor_get_type
 </SECTION>
 
@@ -1116,8 +1109,8 @@ udisks_loop_skeleton_get_type
 </SECTION>
 
 <SECTION>
-<FILE>udisksfstabentry</FILE>
-<TITLE>UDisksFstabEntry</TITLE>
+<FILE>udisksfstabmonitor</FILE>
+<TITLE>UDisksFstabMonitor</TITLE>
 UDisksFstabEntry
 udisks_fstab_entry_get_fsname
 udisks_fstab_entry_get_dir
@@ -1126,55 +1119,41 @@ udisks_fstab_entry_get_opts
 udisks_fstab_entry_get_freq
 udisks_fstab_entry_get_passno
 udisks_fstab_entry_compare
-<SUBSECTION Standard>
-UDISKS_TYPE_FSTAB_ENTRY
-UDISKS_FSTAB_ENTRY
-UDISKS_IS_FSTAB_ENTRY
-<SUBSECTION Private>
-udisks_fstab_entry_get_type
-</SECTION>
-
-<SECTION>
-<FILE>udisksfstabmonitor</FILE>
-<TITLE>UDisksFstabMonitor</TITLE>
 UDisksFstabMonitor
 udisks_fstab_monitor_new
 udisks_fstab_monitor_get_entries
 <SUBSECTION Standard>
+UDISKS_TYPE_FSTAB_ENTRY
+UDISKS_FSTAB_ENTRY
+UDISKS_IS_FSTAB_ENTRY
 UDISKS_TYPE_FSTAB_MONITOR
 UDISKS_FSTAB_MONITOR
 UDISKS_IS_FSTAB_MONITOR
 <SUBSECTION Private>
+udisks_fstab_entry_get_type
 udisks_fstab_monitor_get_type
 </SECTION>
 
 <SECTION>
-<FILE>udiskscrypttabentry</FILE>
-<TITLE>UDisksCrypttabEntry</TITLE>
+<FILE>udiskscrypttabmonitor</FILE>
+<TITLE>UDisksCrypttabMonitor</TITLE>
 UDisksCrypttabEntry
 udisks_crypttab_entry_get_name
 udisks_crypttab_entry_get_device
 udisks_crypttab_entry_get_passphrase_path
 udisks_crypttab_entry_get_options
 udisks_crypttab_entry_compare
-<SUBSECTION Standard>
-UDISKS_TYPE_CRYPTTAB_ENTRY
-UDISKS_CRYPTTAB_ENTRY
-UDISKS_IS_CRYPTTAB_ENTRY
-<SUBSECTION Private>
-udisks_crypttab_entry_get_type
-</SECTION>
-
-<SECTION>
-<FILE>udiskscrypttabmonitor</FILE>
-<TITLE>UDisksCrypttabMonitor</TITLE>
 UDisksCrypttabMonitor
 udisks_crypttab_monitor_new
 udisks_crypttab_monitor_get_entries
 <SUBSECTION Standard>
+UDISKS_TYPE_CRYPTTAB_ENTRY
+UDISKS_CRYPTTAB_ENTRY
+UDISKS_IS_CRYPTTAB_ENTRY
 UDISKS_TYPE_CRYPTTAB_MONITOR
 UDISKS_CRYPTTAB_MONITOR
 UDISKS_IS_CRYPTTAB_MONITOR
 <SUBSECTION Private>
+udisks_crypttab_entry_get_type
 udisks_crypttab_monitor_get_type
 </SECTION>

diff --git a/src/udiskscrypttabentry.c b/src/udiskscrypttabentry.c
index 71181cc..228c735 100644 (file)
--- a/src/udiskscrypttabentry.c
+++ b/src/udiskscrypttabentry.c
@@ -37,16 +37,6 @@
 #include "udisksprivate.h"
 
 /**
- * SECTION:udiskscrypttabentry
- * @title: UDisksCrypttabEntry
- * @short_description: Object corresponding to an entry in the crypttab file
- *
- * Object corresponding to an entry in the
- * <filename>/etc/crypttab</filename> file. You cannot instantiate this
- * type yourself – use #UDisksCrypttabMonitor.
- */
-
-/**
  * UDisksCrypttabEntry:
  *
  * The #UDisksCrypttabEntry structure contains only private data and should

diff --git a/src/udisksfstabentry.c b/src/udisksfstabentry.c
index 6ec9eaf..a300321 100644 (file)
--- a/src/udisksfstabentry.c
+++ b/src/udisksfstabentry.c
@@ -37,16 +37,6 @@
 #include "udisksprivate.h"
 
 /**
- * SECTION:udisksfstabentry
- * @title: UDisksFstabEntry
- * @short_description: Object corresponding to an entry in the fstab file
- *
- * Object corresponding to an entry in the
- * <filename>/etc/fstab</filename> file. You cannot instantiate this
- * type yourself – use #UDisksFstabMonitor.
- */
-
-/**
  * UDisksFstabEntry:
  *
  * The #UDisksFstabEntry structure contains only private data and should

diff --git a/src/udisksmount.c b/src/udisksmount.c
index affa6a3..b45df41 100644 (file)
--- a/src/udisksmount.c
+++ b/src/udisksmount.c
@@ -37,15 +37,6 @@
 #include "udisksprivate.h"
 
 /**
- * SECTION:udisksmount
- * @title: UDisksMount
- * @short_description: Object corresponding to a filesystem mount or in-use swap device
- *
- * Object corresponding to mount or in-use swap device. You cannot
- * instantiate this type yourself – use #UDisksMountMonitor.
- */
-
-/**
  * UDisksMount:
  *
  * The #UDisksMount structure contains only private data and should