4 files changed, 16 insertions, 8 deletions
diff --git a/libmount/src/context.c b/libmount/src/context.c
index 422469bf8..b3be915c7 100644
--- a/libmount/src/context.c
+++ b/libmount/src/context.c
@@ -765,7 +765,7 @@ int mnt_context_get_mtab(struct libmnt_context *cxt, struct libmnt_table **tb)
 /**
  * mnt_context_get_table:
  * @cxt: mount context
- * @file: filename (e.g. /proc/self/mountinfo, ...)
+ * @filename: e.g. /proc/self/mountinfo
  * @tb: returns the table
  *
  * This function allocates a new table and parses the @file. The parser error
@@ -1629,12 +1629,12 @@ int mnt_context_init_helper(struct libmnt_context *cxt, int action, int flags)
 
 /**
  * mnt_context_helper_setopt:
- * @cxr: context
+ * @cxt: context
  * @c: getopt() result
  * @arg: getopt() optarg
  *
  * This function applies [u]mount.type command line option (for example parsed
- * by getopt() or getopt_long()) to @cxt. All unknown options are ignored and
+ * by getopt or getopt_long) to @cxt. All unknown options are ignored and
  * then 1 is returned.
  *
  * Returns: negative number on error, 1 if @c is unknown option, 0 on success.
@@ -1653,8 +1653,9 @@ int mnt_context_helper_setopt(struct libmnt_context *cxt, int c, char *arg)
 }
 
 /**
+ * mnt_context_is_fs_mounted:
  * @cxt: context
- * @fs; filesystem
+ * @fs: filesystem
  * @mounted: returns 1 for mounted and 0 for non-mounted filesystems
  *
  * Returns: 0 on success and negative number in case of error.
diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c
index f9642e5a7..ae66a441b 100644
--- a/libmount/src/context_mount.c
+++ b/libmount/src/context_mount.c
@@ -652,7 +652,7 @@ int mnt_context_mount(struct libmnt_context *cxt)
  * @cxt: context
  * @itr: iterator
  * @fs: returns the current filesystem
- * @mntrc: returns the return code from mnt_mount_context()
+ * @mntrc: returns the return code from mnt_context_mount()
  * @ignored: returns 1 for not matching and 2 for already mounted filesystems
  *
  * This function tries to mount the next filesystem from fstab (as returned by
diff --git a/libmount/src/libmount.h.in b/libmount/src/libmount.h.in
index 160c7049d..cf3db2ffb 100644
--- a/libmount/src/libmount.h.in
+++ b/libmount/src/libmount.h.in
@@ -103,6 +103,13 @@ struct libmnt_update;
  */
 struct libmnt_context;
 
+/**
+ * libmnt_tabdiff:
+ *
+ * Stores mountinfo state
+ */
+struct libmnt_tabdiff;
+
 /*
  * Actions
  */
@@ -317,7 +324,7 @@ extern int mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fs
 extern struct libmnt_update *mnt_new_update(void);
 extern void mnt_free_update(struct libmnt_update *upd);
 extern int mnt_update_is_ready(struct libmnt_update *upd);
-extern int mnt_update_set_fs(struct libmnt_update *upd, unsigned long mflags,
+extern int mnt_update_set_fs(struct libmnt_update *upd, unsigned long mountflags,
 	                      const char *target, struct libmnt_fs *fs);
 extern int mnt_update_table(struct libmnt_update *upd, struct libmnt_lock *lc);
 extern unsigned long mnt_update_get_mflags(struct libmnt_update *upd);
diff --git a/libmount/src/optstr.c b/libmount/src/optstr.c
index 216d9ac1e..c9d925ca5 100644
--- a/libmount/src/optstr.c
+++ b/libmount/src/optstr.c
@@ -518,11 +518,11 @@ int mnt_split_optstr(const char *optstr, char **user, char **vfs,
  *
  * Extracts options from @optstr that belongs to the @map, for example:
  *
- *	 mnt_split_optstr_by_map(optstr, &p,
+ *	 mnt_optstr_get_options(optstr, &p,
  *			mnt_get_builtin_optmap(MNT_LINUX_MAP),
  *			MNT_NOMTAB);
  *
- * returns all VFS options, the options that does not belong to mtab
+ * the 'p' returns all VFS options, the options that does not belong to mtab
  * are ignored.
  *
  * Returns: 0 on success, or negative number in case of error.