Version 1.12.3.1.12.3

3 files changed, 332 insertions, 84 deletions

diff --git a/po-docs/ja.po b/po-docs/ja.po
index d18e3c0e..ca927444 100644
--- a/po-docs/ja.po
+++ b/po-docs/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2011-07-26 16:21+0200\n"
+"POT-Creation-Date: 2011-08-07 23:14+0200\n"
 "PO-Revision-Date: 2011-07-17 20:50+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Japanese (http://www.transifex.net/projects/p/fedora/team/"
@@ -4099,10 +4099,9 @@ msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:28 ../fish/guestfish-actions.pod:163
-#: ../fish/guestfish-actions.pod:177 ../src/guestfs-actions.pod:32
-#: ../src/guestfs-actions.pod:254 ../src/guestfs-actions.pod:275
+#: ../fish/guestfish-actions.pod:177
 msgid ""
-"This function is deprecated.  In new code, use the C<add_drive_opts> call "
+"This function is deprecated.  In new code, use the L</add_drive_opts> call "
 "instead."
 msgstr ""
 
@@ -6238,9 +6237,9 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../fish/guestfish-actions.pod:983 ../src/guestfs-actions.pod:1510
+#: ../fish/guestfish-actions.pod:983
 msgid ""
-"This function is deprecated.  In new code, use the C<fallocate64> call "
+"This function is deprecated.  In new code, use the L</fallocate64> call "
 "instead."
 msgstr ""
 
@@ -6941,9 +6940,10 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../fish/guestfish-actions.pod:1343 ../src/guestfs-actions.pod:2005
+#: ../fish/guestfish-actions.pod:1343
 msgid ""
-"This function is deprecated.  In new code, use the C<vfs_label> call instead."
+"This function is deprecated.  In new code, use the L</vfs_label> call "
+"instead."
 msgstr ""
 
 #. type: =head2
@@ -6966,9 +6966,9 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../fish/guestfish-actions.pod:1357 ../src/guestfs-actions.pod:2026
+#: ../fish/guestfish-actions.pod:1357
 msgid ""
-"This function is deprecated.  In new code, use the C<vfs_uuid> call instead."
+"This function is deprecated.  In new code, use the L</vfs_uuid> call instead."
 msgstr ""
 
 #. type: =head2
@@ -10754,9 +10754,10 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../fish/guestfish-actions.pod:3082 ../src/guestfs-actions.pod:4625
+#: ../fish/guestfish-actions.pod:3082
 msgid ""
-"This function is deprecated.  In new code, use the C<mkfs_opts> call instead."
+"This function is deprecated.  In new code, use the L</mkfs_opts> call "
+"instead."
 msgstr ""
 
 #. type: =head2
@@ -11173,9 +11174,9 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../fish/guestfish-actions.pod:3289 ../src/guestfs-actions.pod:4944
+#: ../fish/guestfish-actions.pod:3289
 msgid ""
-"This function is deprecated.  In new code, use the C<mount_options> call "
+"This function is deprecated.  In new code, use the L</mount_options> call "
 "instead."
 msgstr ""
 
@@ -11442,9 +11443,8 @@ msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3403 ../fish/guestfish-actions.pod:3451
-#: ../src/guestfs-actions.pod:5162 ../src/guestfs-actions.pod:5252
 msgid ""
-"This function is deprecated.  In new code, use the C<ntfsresize_opts> call "
+"This function is deprecated.  In new code, use the L</ntfsresize_opts> call "
 "instead."
 msgstr ""
 
@@ -13536,10 +13536,9 @@ msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4352 ../fish/guestfish-actions.pod:4375
-#: ../fish/guestfish-actions.pod:4397 ../src/guestfs-actions.pod:6541
-#: ../src/guestfs-actions.pod:6571 ../src/guestfs-actions.pod:6604
+#: ../fish/guestfish-actions.pod:4397
 msgid ""
-"This function is deprecated.  In new code, use the C<part_add> call instead."
+"This function is deprecated.  In new code, use the L</part_add> call instead."
 msgstr ""
 
 #. type: =head2
@@ -13673,9 +13672,10 @@ msgid "See also: L</part-list>"
 msgstr ""
 
 #. type: textblock
-#: ../fish/guestfish-actions.pod:4435 ../src/guestfs-actions.pod:6663
+#: ../fish/guestfish-actions.pod:4435
 msgid ""
-"This function is deprecated.  In new code, use the C<part_list> call instead."
+"This function is deprecated.  In new code, use the L</part_list> call "
+"instead."
 msgstr ""
 
 #. type: =head2
@@ -15182,9 +15182,9 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../fish/guestfish-actions.pod:5084 ../src/guestfs-actions.pod:7711
+#: ../fish/guestfish-actions.pod:5084
 msgid ""
-"This function is deprecated.  In new code, use the C<write> call instead."
+"This function is deprecated.  In new code, use the L</write> call instead."
 msgstr ""
 
 #. type: =head2
@@ -15378,9 +15378,9 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../fish/guestfish-actions.pod:5182 ../src/guestfs-actions.pod:7881
+#: ../fish/guestfish-actions.pod:5182
 msgid ""
-"This function is deprecated.  In new code, use the C<file> call instead."
+"This function is deprecated.  In new code, use the L</file> call instead."
 msgstr ""
 
 #. type: =head2
@@ -21846,6 +21846,14 @@ msgid "This function returns 0 on success or -1 on error."
 msgstr ""
 
 #. type: textblock
+#: ../src/guestfs-actions.pod:32 ../src/guestfs-actions.pod:254
+#: ../src/guestfs-actions.pod:275
+msgid ""
+"This function is deprecated.  In new code, use the L</"
+"guestfs_add_drive_opts> call instead."
+msgstr ""
+
+#. type: textblock
 #: ../src/guestfs-actions.pod:39 ../src/guestfs-actions.pod:142
 #: ../src/guestfs-actions.pod:1165 ../src/guestfs-actions.pod:1980
 #: ../src/guestfs-actions.pod:2078 ../src/guestfs-actions.pod:2192
@@ -23612,6 +23620,13 @@ msgid ""
 "\n"
 msgstr ""
 
+#. type: textblock
+#: ../src/guestfs-actions.pod:1510
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_fallocate64> "
+"call instead."
+msgstr ""
+
 #. type: =head2
 #: ../src/guestfs-actions.pod:1519
 msgid "guestfs_fallocate64"
@@ -24042,6 +24057,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
+#: ../src/guestfs-actions.pod:2005
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_vfs_label> "
+"call instead."
+msgstr ""
+
+#. type: textblock
 #: ../src/guestfs-actions.pod:2012 ../src/guestfs-actions.pod:2033
 #: ../src/guestfs-actions.pod:6258 ../src/guestfs-actions.pod:6277
 msgid "(Added in 1.0.15)"
@@ -24062,6 +24084,13 @@ msgid ""
 "\n"
 msgstr ""
 
+#. type: textblock
+#: ../src/guestfs-actions.pod:2026
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_vfs_uuid> call "
+"instead."
+msgstr ""
+
 #. type: =head2
 #: ../src/guestfs-actions.pod:2035
 msgid "guestfs_get_memsize"
@@ -26699,6 +26728,13 @@ msgid ""
 "filesystem type, but typically they are C<1024>, C<2048> or C<4096> only."
 msgstr ""
 
+#. type: textblock
+#: ../src/guestfs-actions.pod:4625
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_mkfs_opts> "
+"call instead."
+msgstr ""
+
 #. type: =head2
 #: ../src/guestfs-actions.pod:4634
 msgid "guestfs_mkfs_opts"
@@ -27023,6 +27059,13 @@ msgid ""
 "(use an empty string for the first parameter if you don't want any options)."
 msgstr ""
 
+#. type: textblock
+#: ../src/guestfs-actions.pod:4944
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_mount_options> "
+"call instead."
+msgstr ""
+
 #. type: =head2
 #: ../src/guestfs-actions.pod:4953
 msgid "guestfs_mount_9p"
@@ -27280,6 +27323,13 @@ msgid ""
 "\n"
 msgstr ""
 
+#. type: textblock
+#: ../src/guestfs-actions.pod:5162 ../src/guestfs-actions.pod:5252
+msgid ""
+"This function is deprecated.  In new code, use the L</"
+"guestfs_ntfsresize_opts> call instead."
+msgstr ""
+
 #. type: =head2
 #: ../src/guestfs-actions.pod:5171
 msgid "guestfs_ntfsresize_opts"
@@ -28620,6 +28670,14 @@ msgid ""
 "See also: C<guestfs_sfdisk_l>, C<guestfs_sfdisk_N>, C<guestfs_part_init>"
 msgstr ""
 
+#. type: textblock
+#: ../src/guestfs-actions.pod:6541 ../src/guestfs-actions.pod:6571
+#: ../src/guestfs-actions.pod:6604
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_part_add> call "
+"instead."
+msgstr ""
+
 #. type: =head2
 #: ../src/guestfs-actions.pod:6550
 msgid "guestfs_sfdiskM"
@@ -28743,6 +28801,13 @@ msgstr ""
 msgid "See also: C<guestfs_part_list>"
 msgstr ""
 
+#. type: textblock
+#: ../src/guestfs-actions.pod:6663
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_part_list> "
+"call instead."
+msgstr ""
+
 #. type: =head2
 #: ../src/guestfs-actions.pod:6672
 msgid "guestfs_sh"
@@ -29747,7 +29812,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:7599
 msgid ""
-"This function is deprecated.  In new code, use the C<launch> call instead."
+"This function is deprecated.  In new code, use the L</guestfs_launch> call "
+"instead."
 msgstr ""
 
 #. type: =head2
@@ -29856,6 +29922,13 @@ msgid ""
 "\n"
 msgstr ""
 
+#. type: textblock
+#: ../src/guestfs-actions.pod:7711
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_write> call "
+"instead."
+msgstr ""
+
 #. type: =head2
 #: ../src/guestfs-actions.pod:7720
 msgid "guestfs_zegrep"
@@ -30007,6 +30080,13 @@ msgid ""
 "files."
 msgstr ""
 
+#. type: textblock
+#: ../src/guestfs-actions.pod:7881
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_file> call "
+"instead."
+msgstr ""
+
 #. type: =head2
 #: ../src/guestfs-actions.pod:7890
 msgid "guestfs_zgrep"
@@ -33474,8 +33554,8 @@ msgstr ""
 #, no-wrap
 msgid ""
 " typedef void (*guestfs_abort_cb) (void);\n"
-" int guestfs_set_out_of_memory_handler (guestfs_h *g,\n"
-"                                        guestfs_abort_cb);\n"
+" void guestfs_set_out_of_memory_handler (guestfs_h *g,\n"
+"                                         guestfs_abort_cb);\n"
 "\n"
 msgstr ""
 
diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot
index 236205f7..865632a2 100644
--- a/po-docs/libguestfs-docs.pot
+++ b/po-docs/libguestfs-docs.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: libguestfs 1.12.2\n"
+"Project-Id-Version: libguestfs 1.12.3\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2011-07-27 15:59+0200\n"
+"POT-Creation-Date: 2011-08-07 23:14+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3709,9 +3709,9 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../fish/guestfish-actions.pod:28 ../fish/guestfish-actions.pod:163 ../fish/guestfish-actions.pod:177 ../src/guestfs-actions.pod:32 ../src/guestfs-actions.pod:254 ../src/guestfs-actions.pod:275
+#: ../fish/guestfish-actions.pod:28 ../fish/guestfish-actions.pod:163 ../fish/guestfish-actions.pod:177
 msgid ""
-"This function is deprecated.  In new code, use the C<add_drive_opts> call "
+"This function is deprecated.  In new code, use the L</add_drive_opts> call "
 "instead."
 msgstr ""
 
@@ -5761,9 +5761,9 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../fish/guestfish-actions.pod:983 ../src/guestfs-actions.pod:1510
+#: ../fish/guestfish-actions.pod:983
 msgid ""
-"This function is deprecated.  In new code, use the C<fallocate64> call "
+"This function is deprecated.  In new code, use the L</fallocate64> call "
 "instead."
 msgstr ""
 
@@ -6460,9 +6460,9 @@ msgid "This returns the ext2/3/4 filesystem label of the filesystem on C<device>
 msgstr ""
 
 #. type: textblock
-#: ../fish/guestfish-actions.pod:1343 ../src/guestfs-actions.pod:2005
+#: ../fish/guestfish-actions.pod:1343
 msgid ""
-"This function is deprecated.  In new code, use the C<vfs_label> call "
+"This function is deprecated.  In new code, use the L</vfs_label> call "
 "instead."
 msgstr ""
 
@@ -6485,8 +6485,10 @@ msgid "This returns the ext2/3/4 filesystem UUID of the filesystem on C<device>.
 msgstr ""
 
 #. type: textblock
-#: ../fish/guestfish-actions.pod:1357 ../src/guestfs-actions.pod:2026
-msgid "This function is deprecated.  In new code, use the C<vfs_uuid> call instead."
+#: ../fish/guestfish-actions.pod:1357
+msgid ""
+"This function is deprecated.  In new code, use the L</vfs_uuid> call "
+"instead."
 msgstr ""
 
 #. type: =head2
@@ -10220,9 +10222,9 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../fish/guestfish-actions.pod:3082 ../src/guestfs-actions.pod:4625
+#: ../fish/guestfish-actions.pod:3082
 msgid ""
-"This function is deprecated.  In new code, use the C<mkfs_opts> call "
+"This function is deprecated.  In new code, use the L</mkfs_opts> call "
 "instead."
 msgstr ""
 
@@ -10641,9 +10643,9 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../fish/guestfish-actions.pod:3289 ../src/guestfs-actions.pod:4944
+#: ../fish/guestfish-actions.pod:3289
 msgid ""
-"This function is deprecated.  In new code, use the C<mount_options> call "
+"This function is deprecated.  In new code, use the L</mount_options> call "
 "instead."
 msgstr ""
 
@@ -10907,9 +10909,9 @@ msgid "See also L<ntfsresize(8)>."
 msgstr ""
 
 #. type: textblock
-#: ../fish/guestfish-actions.pod:3403 ../fish/guestfish-actions.pod:3451 ../src/guestfs-actions.pod:5162 ../src/guestfs-actions.pod:5252
+#: ../fish/guestfish-actions.pod:3403 ../fish/guestfish-actions.pod:3451
 msgid ""
-"This function is deprecated.  In new code, use the C<ntfsresize_opts> call "
+"This function is deprecated.  In new code, use the L</ntfsresize_opts> call "
 "instead."
 msgstr ""
 
@@ -12991,8 +12993,10 @@ msgid "See also: L</sfdisk-l>, L</sfdisk-N>, L</part-init>"
 msgstr ""
 
 #. type: textblock
-#: ../fish/guestfish-actions.pod:4352 ../fish/guestfish-actions.pod:4375 ../fish/guestfish-actions.pod:4397 ../src/guestfs-actions.pod:6541 ../src/guestfs-actions.pod:6571 ../src/guestfs-actions.pod:6604
-msgid "This function is deprecated.  In new code, use the C<part_add> call instead."
+#: ../fish/guestfish-actions.pod:4352 ../fish/guestfish-actions.pod:4375 ../fish/guestfish-actions.pod:4397
+msgid ""
+"This function is deprecated.  In new code, use the L</part_add> call "
+"instead."
 msgstr ""
 
 #. type: =head2
@@ -13125,9 +13129,9 @@ msgid "See also: L</part-list>"
 msgstr ""
 
 #. type: textblock
-#: ../fish/guestfish-actions.pod:4435 ../src/guestfs-actions.pod:6663
+#: ../fish/guestfish-actions.pod:4435
 msgid ""
-"This function is deprecated.  In new code, use the C<part_list> call "
+"This function is deprecated.  In new code, use the L</part_list> call "
 "instead."
 msgstr ""
 
@@ -14631,8 +14635,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../fish/guestfish-actions.pod:5084 ../src/guestfs-actions.pod:7711
-msgid "This function is deprecated.  In new code, use the C<write> call instead."
+#: ../fish/guestfish-actions.pod:5084
+msgid "This function is deprecated.  In new code, use the L</write> call instead."
 msgstr ""
 
 #. type: =head2
@@ -14820,8 +14824,8 @@ msgid "Since 1.0.63, use L</file> instead which can now process compressed files
 msgstr ""
 
 #. type: textblock
-#: ../fish/guestfish-actions.pod:5182 ../src/guestfs-actions.pod:7881
-msgid "This function is deprecated.  In new code, use the C<file> call instead."
+#: ../fish/guestfish-actions.pod:5182
+msgid "This function is deprecated.  In new code, use the L</file> call instead."
 msgstr ""
 
 #. type: =head2
@@ -21162,6 +21166,13 @@ msgid "This function returns 0 on success or -1 on error."
 msgstr ""
 
 #. type: textblock
+#: ../src/guestfs-actions.pod:32 ../src/guestfs-actions.pod:254 ../src/guestfs-actions.pod:275
+msgid ""
+"This function is deprecated.  In new code, use the "
+"L</guestfs_add_drive_opts> call instead."
+msgstr ""
+
+#. type: textblock
 #: ../src/guestfs-actions.pod:39 ../src/guestfs-actions.pod:142 ../src/guestfs-actions.pod:1165 ../src/guestfs-actions.pod:1980 ../src/guestfs-actions.pod:2078 ../src/guestfs-actions.pod:2192 ../src/guestfs-actions.pod:3623 ../src/guestfs-actions.pod:3643 ../src/guestfs-actions.pod:4951 ../src/guestfs-actions.pod:6217 ../src/guestfs-actions.pod:6334 ../src/guestfs-actions.pod:6467 ../src/guestfs-actions.pod:6958 ../src/guestfs-actions.pod:7083 ../src/guestfs-actions.pod:7606
 msgid "(Added in 0.3)"
 msgstr ""
@@ -22777,6 +22788,13 @@ msgid ""
 "\n"
 msgstr ""
 
+#. type: textblock
+#: ../src/guestfs-actions.pod:1510
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_fallocate64> "
+"call instead."
+msgstr ""
+
 #. type: =head2
 #: ../src/guestfs-actions.pod:1519
 msgid "guestfs_fallocate64"
@@ -23195,6 +23213,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
+#: ../src/guestfs-actions.pod:2005
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_vfs_label> "
+"call instead."
+msgstr ""
+
+#. type: textblock
 #: ../src/guestfs-actions.pod:2012 ../src/guestfs-actions.pod:2033 ../src/guestfs-actions.pod:6258 ../src/guestfs-actions.pod:6277
 msgid "(Added in 1.0.15)"
 msgstr ""
@@ -23214,6 +23239,13 @@ msgid ""
 "\n"
 msgstr ""
 
+#. type: textblock
+#: ../src/guestfs-actions.pod:2026
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_vfs_uuid> call "
+"instead."
+msgstr ""
+
 #. type: =head2
 #: ../src/guestfs-actions.pod:2035
 msgid "guestfs_get_memsize"
@@ -25812,6 +25844,13 @@ msgid ""
 "filesystem type, but typically they are C<1024>, C<2048> or C<4096> only."
 msgstr ""
 
+#. type: textblock
+#: ../src/guestfs-actions.pod:4625
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_mkfs_opts> "
+"call instead."
+msgstr ""
+
 #. type: =head2
 #: ../src/guestfs-actions.pod:4634
 msgid "guestfs_mkfs_opts"
@@ -26135,6 +26174,13 @@ msgid ""
 "(use an empty string for the first parameter if you don't want any options)."
 msgstr ""
 
+#. type: textblock
+#: ../src/guestfs-actions.pod:4944
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_mount_options> "
+"call instead."
+msgstr ""
+
 #. type: =head2
 #: ../src/guestfs-actions.pod:4953
 msgid "guestfs_mount_9p"
@@ -26391,6 +26437,13 @@ msgid ""
 "\n"
 msgstr ""
 
+#. type: textblock
+#: ../src/guestfs-actions.pod:5162 ../src/guestfs-actions.pod:5252
+msgid ""
+"This function is deprecated.  In new code, use the "
+"L</guestfs_ntfsresize_opts> call instead."
+msgstr ""
+
 #. type: =head2
 #: ../src/guestfs-actions.pod:5171
 msgid "guestfs_ntfsresize_opts"
@@ -27727,6 +27780,13 @@ msgstr ""
 msgid "See also: C<guestfs_sfdisk_l>, C<guestfs_sfdisk_N>, C<guestfs_part_init>"
 msgstr ""
 
+#. type: textblock
+#: ../src/guestfs-actions.pod:6541 ../src/guestfs-actions.pod:6571 ../src/guestfs-actions.pod:6604
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_part_add> call "
+"instead."
+msgstr ""
+
 #. type: =head2
 #: ../src/guestfs-actions.pod:6550
 msgid "guestfs_sfdiskM"
@@ -27850,6 +27910,13 @@ msgstr ""
 msgid "See also: C<guestfs_part_list>"
 msgstr ""
 
+#. type: textblock
+#: ../src/guestfs-actions.pod:6663
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_part_list> "
+"call instead."
+msgstr ""
+
 #. type: =head2
 #: ../src/guestfs-actions.pod:6672
 msgid "guestfs_sh"
@@ -28852,7 +28919,9 @@ msgstr ""
 
 #. type: textblock
 #: ../src/guestfs-actions.pod:7599
-msgid "This function is deprecated.  In new code, use the C<launch> call instead."
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_launch> call "
+"instead."
 msgstr ""
 
 #. type: =head2
@@ -28961,6 +29030,13 @@ msgid ""
 "\n"
 msgstr ""
 
+#. type: textblock
+#: ../src/guestfs-actions.pod:7711
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_write> call "
+"instead."
+msgstr ""
+
 #. type: =head2
 #: ../src/guestfs-actions.pod:7720
 msgid "guestfs_zegrep"
@@ -29112,6 +29188,13 @@ msgid ""
 "files."
 msgstr ""
 
+#. type: textblock
+#: ../src/guestfs-actions.pod:7881
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_file> call "
+"instead."
+msgstr ""
+
 #. type: =head2
 #: ../src/guestfs-actions.pod:7890
 msgid "guestfs_zgrep"
@@ -32585,8 +32668,8 @@ msgstr ""
 #, no-wrap
 msgid ""
 " typedef void (*guestfs_abort_cb) (void);\n"
-" int guestfs_set_out_of_memory_handler (guestfs_h *g,\n"
-"                                        guestfs_abort_cb);\n"
+" void guestfs_set_out_of_memory_handler (guestfs_h *g,\n"
+"                                         guestfs_abort_cb);\n"
 "\n"
 msgstr ""
 
diff --git a/po-docs/uk.po b/po-docs/uk.po
index c42ad139..3e6d8570 100644
--- a/po-docs/uk.po
+++ b/po-docs/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2011-07-26 16:21+0200\n"
+"POT-Creation-Date: 2011-08-07 23:14+0200\n"
 "PO-Revision-Date: 2011-07-17 20:50+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
@@ -4508,10 +4508,9 @@ msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:28 ../fish/guestfish-actions.pod:163
-#: ../fish/guestfish-actions.pod:177 ../src/guestfs-actions.pod:32
-#: ../src/guestfs-actions.pod:254 ../src/guestfs-actions.pod:275
+#: ../fish/guestfish-actions.pod:177
 msgid ""
-"This function is deprecated.  In new code, use the C<add_drive_opts> call "
+"This function is deprecated.  In new code, use the L</add_drive_opts> call "
 "instead."
 msgstr ""
 
@@ -6665,9 +6664,9 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../fish/guestfish-actions.pod:983 ../src/guestfs-actions.pod:1510
+#: ../fish/guestfish-actions.pod:983
 msgid ""
-"This function is deprecated.  In new code, use the C<fallocate64> call "
+"This function is deprecated.  In new code, use the L</fallocate64> call "
 "instead."
 msgstr ""
 
@@ -7400,9 +7399,10 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../fish/guestfish-actions.pod:1343 ../src/guestfs-actions.pod:2005
+#: ../fish/guestfish-actions.pod:1343
 msgid ""
-"This function is deprecated.  In new code, use the C<vfs_label> call instead."
+"This function is deprecated.  In new code, use the L</vfs_label> call "
+"instead."
 msgstr ""
 
 #. type: =head2
@@ -7427,9 +7427,9 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../fish/guestfish-actions.pod:1357 ../src/guestfs-actions.pod:2026
+#: ../fish/guestfish-actions.pod:1357
 msgid ""
-"This function is deprecated.  In new code, use the C<vfs_uuid> call instead."
+"This function is deprecated.  In new code, use the L</vfs_uuid> call instead."
 msgstr ""
 
 #. type: =head2
@@ -11389,9 +11389,10 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../fish/guestfish-actions.pod:3082 ../src/guestfs-actions.pod:4625
+#: ../fish/guestfish-actions.pod:3082
 msgid ""
-"This function is deprecated.  In new code, use the C<mkfs_opts> call instead."
+"This function is deprecated.  In new code, use the L</mkfs_opts> call "
+"instead."
 msgstr ""
 
 #. type: =head2
@@ -11829,9 +11830,9 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../fish/guestfish-actions.pod:3289 ../src/guestfs-actions.pod:4944
+#: ../fish/guestfish-actions.pod:3289
 msgid ""
-"This function is deprecated.  In new code, use the C<mount_options> call "
+"This function is deprecated.  In new code, use the L</mount_options> call "
 "instead."
 msgstr ""
 
@@ -12108,9 +12109,8 @@ msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3403 ../fish/guestfish-actions.pod:3451
-#: ../src/guestfs-actions.pod:5162 ../src/guestfs-actions.pod:5252
 msgid ""
-"This function is deprecated.  In new code, use the C<ntfsresize_opts> call "
+"This function is deprecated.  In new code, use the L</ntfsresize_opts> call "
 "instead."
 msgstr ""
 
@@ -14270,10 +14270,9 @@ msgstr "Див. також L</sfdisk-l>, L</sfdisk-N>, L</part-init>"
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4352 ../fish/guestfish-actions.pod:4375
-#: ../fish/guestfish-actions.pod:4397 ../src/guestfs-actions.pod:6541
-#: ../src/guestfs-actions.pod:6571 ../src/guestfs-actions.pod:6604
+#: ../fish/guestfish-actions.pod:4397
 msgid ""
-"This function is deprecated.  In new code, use the C<part_add> call instead."
+"This function is deprecated.  In new code, use the L</part_add> call instead."
 msgstr ""
 
 #. type: =head2
@@ -14414,9 +14413,10 @@ msgid "See also: L</part-list>"
 msgstr "Див. також L</part-list>"
 
 #. type: textblock
-#: ../fish/guestfish-actions.pod:4435 ../src/guestfs-actions.pod:6663
+#: ../fish/guestfish-actions.pod:4435
 msgid ""
-"This function is deprecated.  In new code, use the C<part_list> call instead."
+"This function is deprecated.  In new code, use the L</part_list> call "
+"instead."
 msgstr ""
 
 #. type: =head2
@@ -16011,9 +16011,9 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../fish/guestfish-actions.pod:5084 ../src/guestfs-actions.pod:7711
+#: ../fish/guestfish-actions.pod:5084
 msgid ""
-"This function is deprecated.  In new code, use the C<write> call instead."
+"This function is deprecated.  In new code, use the L</write> call instead."
 msgstr ""
 
 #. type: =head2
@@ -16221,9 +16221,9 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../fish/guestfish-actions.pod:5182 ../src/guestfs-actions.pod:7881
+#: ../fish/guestfish-actions.pod:5182
 msgid ""
-"This function is deprecated.  In new code, use the C<file> call instead."
+"This function is deprecated.  In new code, use the L</file> call instead."
 msgstr ""
 
 #. type: =head2
@@ -22987,6 +22987,14 @@ msgid "This function returns 0 on success or -1 on error."
 msgstr ""
 
 #. type: textblock
+#: ../src/guestfs-actions.pod:32 ../src/guestfs-actions.pod:254
+#: ../src/guestfs-actions.pod:275
+msgid ""
+"This function is deprecated.  In new code, use the L</"
+"guestfs_add_drive_opts> call instead."
+msgstr ""
+
+#. type: textblock
 #: ../src/guestfs-actions.pod:39 ../src/guestfs-actions.pod:142
 #: ../src/guestfs-actions.pod:1165 ../src/guestfs-actions.pod:1980
 #: ../src/guestfs-actions.pod:2078 ../src/guestfs-actions.pod:2192
@@ -24753,6 +24761,13 @@ msgid ""
 "\n"
 msgstr ""
 
+#. type: textblock
+#: ../src/guestfs-actions.pod:1510
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_fallocate64> "
+"call instead."
+msgstr ""
+
 #. type: =head2
 #: ../src/guestfs-actions.pod:1519
 msgid "guestfs_fallocate64"
@@ -25183,6 +25198,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
+#: ../src/guestfs-actions.pod:2005
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_vfs_label> "
+"call instead."
+msgstr ""
+
+#. type: textblock
 #: ../src/guestfs-actions.pod:2012 ../src/guestfs-actions.pod:2033
 #: ../src/guestfs-actions.pod:6258 ../src/guestfs-actions.pod:6277
 msgid "(Added in 1.0.15)"
@@ -25203,6 +25225,13 @@ msgid ""
 "\n"
 msgstr ""
 
+#. type: textblock
+#: ../src/guestfs-actions.pod:2026
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_vfs_uuid> call "
+"instead."
+msgstr ""
+
 #. type: =head2
 #: ../src/guestfs-actions.pod:2035
 msgid "guestfs_get_memsize"
@@ -28061,6 +28090,13 @@ msgid ""
 "filesystem type, but typically they are C<1024>, C<2048> or C<4096> only."
 msgstr ""
 
+#. type: textblock
+#: ../src/guestfs-actions.pod:4625
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_mkfs_opts> "
+"call instead."
+msgstr ""
+
 #. type: =head2
 #: ../src/guestfs-actions.pod:4634
 msgid "guestfs_mkfs_opts"
@@ -28407,6 +28443,13 @@ msgid ""
 "(use an empty string for the first parameter if you don't want any options)."
 msgstr ""
 
+#. type: textblock
+#: ../src/guestfs-actions.pod:4944
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_mount_options> "
+"call instead."
+msgstr ""
+
 #. type: =head2
 #: ../src/guestfs-actions.pod:4953
 msgid "guestfs_mount_9p"
@@ -28664,6 +28707,13 @@ msgid ""
 "\n"
 msgstr ""
 
+#. type: textblock
+#: ../src/guestfs-actions.pod:5162 ../src/guestfs-actions.pod:5252
+msgid ""
+"This function is deprecated.  In new code, use the L</"
+"guestfs_ntfsresize_opts> call instead."
+msgstr ""
+
 #. type: =head2
 #: ../src/guestfs-actions.pod:5171
 msgid "guestfs_ntfsresize_opts"
@@ -30008,6 +30058,14 @@ msgid ""
 "See also: C<guestfs_sfdisk_l>, C<guestfs_sfdisk_N>, C<guestfs_part_init>"
 msgstr ""
 
+#. type: textblock
+#: ../src/guestfs-actions.pod:6541 ../src/guestfs-actions.pod:6571
+#: ../src/guestfs-actions.pod:6604
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_part_add> call "
+"instead."
+msgstr ""
+
 #. type: =head2
 #: ../src/guestfs-actions.pod:6550
 msgid "guestfs_sfdiskM"
@@ -30131,6 +30189,13 @@ msgstr ""
 msgid "See also: C<guestfs_part_list>"
 msgstr ""
 
+#. type: textblock
+#: ../src/guestfs-actions.pod:6663
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_part_list> "
+"call instead."
+msgstr ""
+
 #. type: =head2
 #: ../src/guestfs-actions.pod:6672
 msgid "guestfs_sh"
@@ -31135,7 +31200,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:7599
 msgid ""
-"This function is deprecated.  In new code, use the C<launch> call instead."
+"This function is deprecated.  In new code, use the L</guestfs_launch> call "
+"instead."
 msgstr ""
 
 #. type: =head2
@@ -31250,6 +31316,13 @@ msgstr ""
 "                     int size);\n"
 "\n"
 
+#. type: textblock
+#: ../src/guestfs-actions.pod:7711
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_write> call "
+"instead."
+msgstr ""
+
 #. type: =head2
 #: ../src/guestfs-actions.pod:7720
 msgid "guestfs_zegrep"
@@ -31438,6 +31511,13 @@ msgid ""
 "files."
 msgstr ""
 
+#. type: textblock
+#: ../src/guestfs-actions.pod:7881
+msgid ""
+"This function is deprecated.  In new code, use the L</guestfs_file> call "
+"instead."
+msgstr ""
+
 #. type: =head2
 #: ../src/guestfs-actions.pod:7890
 msgid "guestfs_zgrep"
@@ -35038,11 +35118,16 @@ msgstr "guestfs_set_out_of_memory_handler"
 
 #. type: verbatim
 #: ../src/guestfs.pod:1454
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " typedef void (*guestfs_abort_cb) (void);\n"
+#| " int guestfs_set_out_of_memory_handler (guestfs_h *g,\n"
+#| "                                        guestfs_abort_cb);\n"
+#| "\n"
 msgid ""
 " typedef void (*guestfs_abort_cb) (void);\n"
-" int guestfs_set_out_of_memory_handler (guestfs_h *g,\n"
-"                                        guestfs_abort_cb);\n"
+" void guestfs_set_out_of_memory_handler (guestfs_h *g,\n"
+"                                         guestfs_abort_cb);\n"
 "\n"
 msgstr ""
 " typedef void (*guestfs_abort_cb) (void);\n"