summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarel Zak2014-06-03 12:37:33 +0200
committerKarel Zak2014-06-03 12:37:33 +0200
commit7a1c36ab38961ccaf6c23fe6b7f51ac7ace7dcde (patch)
tree61044ee643723db2bdf25deb4830bf44b1fc8443
parentbuil-sys: disable in UL_BUILD_INIT() on --disable-all-programs (diff)
downloadkernel-qcow2-util-linux-7a1c36ab38961ccaf6c23fe6b7f51ac7ace7dcde.tar.gz
kernel-qcow2-util-linux-7a1c36ab38961ccaf6c23fe6b7f51ac7ace7dcde.tar.xz
kernel-qcow2-util-linux-7a1c36ab38961ccaf6c23fe6b7f51ac7ace7dcde.zip
docs: rename libs xml/version.xml to xml/version-utils.xml
It seems that gtk-docs stuff is confused when we use version.xml (package version) and xml/version.xml (library version functions). Signed-off-by: Karel Zak <kzak@redhat.com>
-rw-r--r--libblkid/docs/Makefile.am2
-rw-r--r--libmount/docs/libmount-docs.xml2
-rw-r--r--libmount/docs/libmount-sections.txt2
-rw-r--r--libmount/src/version.c2
-rw-r--r--libsmartcols/docs/libsmartcols-docs.xml2
-rw-r--r--libsmartcols/docs/libsmartcols-sections.txt2
-rw-r--r--libsmartcols/src/version.c2
7 files changed, 7 insertions, 7 deletions
diff --git a/libblkid/docs/Makefile.am b/libblkid/docs/Makefile.am
index a36c8936d..dc6dd3e5e 100644
--- a/libblkid/docs/Makefile.am
+++ b/libblkid/docs/Makefile.am
@@ -57,7 +57,7 @@ EXTRA_HFILES=
# Header files to ignore when scanning. Use base file name, no paths
# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES=blkidP.h list.h partitions.h superblocks.h \
+IGNORE_HFILES=blkidP.h partitions.h superblocks.h \
topology.h aix.h dos.h iso9660.h
# Images to copy into HTML directory.
diff --git a/libmount/docs/libmount-docs.xml b/libmount/docs/libmount-docs.xml
index 09ebd077d..a95d18090 100644
--- a/libmount/docs/libmount-docs.xml
+++ b/libmount/docs/libmount-docs.xml
@@ -56,7 +56,7 @@ available from ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
<xi:include href="xml/cache.xml"/>
<xi:include href="xml/iter.xml"/>
<xi:include href="xml/utils.xml"/>
- <xi:include href="xml/version.xml"/>
+ <xi:include href="xml/version-utils.xml"/>
</part>
<index id="api-index-full">
<title>API Index</title>
diff --git a/libmount/docs/libmount-sections.txt b/libmount/docs/libmount-sections.txt
index 2220cf158..88c1f53b6 100644
--- a/libmount/docs/libmount-sections.txt
+++ b/libmount/docs/libmount-sections.txt
@@ -376,7 +376,7 @@ mnt_unmangle
</SECTION>
<SECTION>
-<FILE>version</FILE>
+<FILE>version-utils</FILE>
mnt_parse_version_string
mnt_get_library_version
mnt_get_library_features
diff --git a/libmount/src/version.c b/libmount/src/version.c
index 7c26c255d..28f3a574b 100644
--- a/libmount/src/version.c
+++ b/libmount/src/version.c
@@ -8,7 +8,7 @@
*/
/**
- * SECTION: version
+ * SECTION: version-utils
* @title: Version functions
* @short_description: functions to get the library version.
*/
diff --git a/libsmartcols/docs/libsmartcols-docs.xml b/libsmartcols/docs/libsmartcols-docs.xml
index 6145ec308..4976ba701 100644
--- a/libsmartcols/docs/libsmartcols-docs.xml
+++ b/libsmartcols/docs/libsmartcols-docs.xml
@@ -42,7 +42,7 @@ available from ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
<part>
<title>Misc</title>
<xi:include href="xml/iter.xml"/>
- <xi:include href="xml/version.xml"/>
+ <xi:include href="xml/version-utils.xml"/>
<xi:include href="xml/init.xml"/>
</part>
<index id="api-index-full">
diff --git a/libsmartcols/docs/libsmartcols-sections.txt b/libsmartcols/docs/libsmartcols-sections.txt
index b07774783..2b8180c52 100644
--- a/libsmartcols/docs/libsmartcols-sections.txt
+++ b/libsmartcols/docs/libsmartcols-sections.txt
@@ -134,7 +134,7 @@ scols_print_table_to_string
</SECTION>
<SECTION>
-<FILE>version</FILE>
+<FILE>version-utils</FILE>
scols_get_library_version
scols_parse_version_string
LIBSMARTCOLS_VERSION
diff --git a/libsmartcols/src/version.c b/libsmartcols/src/version.c
index 76ba3ec2c..9aa4e3366 100644
--- a/libsmartcols/src/version.c
+++ b/libsmartcols/src/version.c
@@ -7,7 +7,7 @@
*/
/**
- * SECTION: version
+ * SECTION: version-utils
* @title: Version functions
* @short_description: functions to get the library version.
*