Version 1.32.0.

configure.ac

@@ -19,14 +19,14 @@
 # add extra information using --with-extra="..." which may be any
 # freeform string.
 m4_define([libguestfs_major],   [1])
-m4_define([libguestfs_minor],   [31])
-m4_define([libguestfs_release], [30])
+m4_define([libguestfs_minor],   [32])
+m4_define([libguestfs_release], [0])
 
 AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
 
 dnl The date that the above version was released.  This is used in
 dnl the website 'index.html' file.
-AC_SUBST([RELEASE_DATE], [2015-12-05])
+AC_SUBST([RELEASE_DATE], [2016-01-06])
 
 AC_CONFIG_AUX_DIR([build-aux])
 AC_REQUIRE_AUX_FILE([guestfs-test-driver])

po-docs/de.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.31.29\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2016-01-06 10:49+0000\n"
+"POT-Creation-Date: 2016-01-06 11:32+0000\n"
 "PO-Revision-Date: 2015-01-04 11:17-0500\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/libguestfs/"
@@ -1177,18 +1177,20 @@ msgstr "Dieses Programm gibt Folgendes zurück:"
 #: ../docs/guestfs-hacking.pod:692 ../docs/guestfs-hacking.pod:696
 #: ../docs/guestfs-hacking.pod:700 ../docs/guestfs-hacking.pod:714
 #: ../docs/guestfs-hacking.pod:718 ../docs/guestfs-hacking.pod:723
-#: ../docs/guestfs-hacking.pod:727 ../docs/guestfs-performance.pod:105
-#: ../docs/guestfs-performance.pod:111 ../docs/guestfs-performance.pod:116
-#: ../docs/guestfs-performance.pod:243 ../docs/guestfs-performance.pod:248
-#: ../docs/guestfs-performance.pod:253 ../docs/guestfs-performance.pod:373
-#: ../docs/guestfs-performance.pod:377 ../docs/guestfs-performance.pod:383
-#: ../docs/guestfs-performance.pod:389 ../docs/guestfs-recipes.pod:229
-#: ../docs/guestfs-recipes.pod:233 ../docs/guestfs-recipes.pod:237
-#: ../docs/guestfs-recipes.pod:263 ../docs/guestfs-recipes.pod:268
-#: ../docs/guestfs-recipes.pod:375 ../docs/guestfs-recipes.pod:379
-#: ../docs/guestfs-recipes.pod:383 ../docs/guestfs-recipes.pod:387
-#: ../docs/guestfs-recipes.pod:391 ../docs/guestfs-release-notes.pod:144
-#: ../docs/guestfs-release-notes.pod:149 ../docs/guestfs-release-notes.pod:2045
+#: ../docs/guestfs-hacking.pod:727 ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:746 ../docs/guestfs-hacking.pod:750
+#: ../docs/guestfs-performance.pod:105 ../docs/guestfs-performance.pod:111
+#: ../docs/guestfs-performance.pod:116 ../docs/guestfs-performance.pod:243
+#: ../docs/guestfs-performance.pod:248 ../docs/guestfs-performance.pod:253
+#: ../docs/guestfs-performance.pod:373 ../docs/guestfs-performance.pod:377
+#: ../docs/guestfs-performance.pod:383 ../docs/guestfs-performance.pod:389
+#: ../docs/guestfs-recipes.pod:229 ../docs/guestfs-recipes.pod:233
+#: ../docs/guestfs-recipes.pod:237 ../docs/guestfs-recipes.pod:263
+#: ../docs/guestfs-recipes.pod:268 ../docs/guestfs-recipes.pod:375
+#: ../docs/guestfs-recipes.pod:379 ../docs/guestfs-recipes.pod:383
+#: ../docs/guestfs-recipes.pod:387 ../docs/guestfs-recipes.pod:391
+#: ../docs/guestfs-release-notes.pod:144 ../docs/guestfs-release-notes.pod:149
+#: ../docs/guestfs-release-notes.pod:2045
 #: ../docs/guestfs-release-notes.pod:2050
 #: ../docs/guestfs-release-notes.pod:2521
 #: ../docs/guestfs-release-notes.pod:2525
@@ -1375,7 +1377,7 @@ msgstr ""
 #: ../cat/virt-log.pod:135 ../cat/virt-ls.pod:518
 #: ../customize/virt-customize.pod:252 ../daemon/guestfsd.pod:143
 #: ../df/virt-df.pod:256 ../dib/virt-dib.pod:645 ../diff/virt-diff.pod:248
-#: ../docs/guestfs-faq.pod:1372 ../docs/guestfs-hacking.pod:738
+#: ../docs/guestfs-faq.pod:1372 ../docs/guestfs-hacking.pod:757
 #: ../docs/guestfs-internals.pod:400 ../docs/guestfs-performance.pod:567
 #: ../docs/guestfs-recipes.pod:668 ../docs/guestfs-release-notes.pod:4813
 #: ../docs/guestfs-security.pod:324 ../docs/guestfs-testing.pod:384
@@ -1453,7 +1455,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
 #: ../cat/virt-log.pod:149 ../cat/virt-ls.pod:532
 #: ../customize/virt-customize.pod:273 ../daemon/guestfsd.pod:152
 #: ../df/virt-df.pod:268 ../dib/virt-dib.pod:656 ../diff/virt-diff.pod:262
-#: ../docs/guestfs-faq.pod:1382 ../docs/guestfs-hacking.pod:754
+#: ../docs/guestfs-faq.pod:1382 ../docs/guestfs-hacking.pod:773
 #: ../docs/guestfs-internals.pod:413 ../docs/guestfs-performance.pod:584
 #: ../docs/guestfs-recipes.pod:687 ../docs/guestfs-release-notes.pod:4828
 #: ../docs/guestfs-security.pod:336 ../docs/guestfs-testing.pod:395
@@ -1750,7 +1752,7 @@ msgstr ""
 #. type: =head1
 #: ../appliance/libguestfs-make-fixed-appliance.pod:148
 #: ../customize/virt-customize.pod:269 ../docs/guestfs-faq.pod:1378
-#: ../docs/guestfs-hacking.pod:750 ../docs/guestfs-internals.pod:409
+#: ../docs/guestfs-hacking.pod:769 ../docs/guestfs-internals.pod:409
 #: ../docs/guestfs-performance.pod:580 ../docs/guestfs-recipes.pod:683
 #: ../docs/guestfs-security.pod:332 ../docs/guestfs-testing.pod:391
 #: ../erlang/examples/guestfs-erlang.pod:110
@@ -1773,7 +1775,7 @@ msgstr "AUTOREN"
 
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:150
-#: ../docs/guestfs-faq.pod:1380 ../docs/guestfs-hacking.pod:752
+#: ../docs/guestfs-faq.pod:1380 ../docs/guestfs-hacking.pod:771
 #: ../docs/guestfs-internals.pod:411 ../docs/guestfs-performance.pod:582
 #: ../docs/guestfs-recipes.pod:685 ../docs/guestfs-security.pod:334
 #: ../docs/guestfs-testing.pod:393 ../erlang/examples/guestfs-erlang.pod:112
@@ -1793,7 +1795,7 @@ msgstr "Richard W.M. Jones (C<rjones at redhat dot com>)"
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:154 ../cat/virt-ls.pod:534
 #: ../daemon/guestfsd.pod:154 ../df/virt-df.pod:270 ../diff/virt-diff.pod:264
-#: ../docs/guestfs-hacking.pod:756 ../docs/guestfs-internals.pod:415
+#: ../docs/guestfs-hacking.pod:775 ../docs/guestfs-internals.pod:415
 #: ../docs/guestfs-recipes.pod:689 ../docs/guestfs-release-notes.pod:4830
 #: ../docs/guestfs-security.pod:338 ../edit/virt-edit.pod:406
 #: ../fish/guestfish.pod:1636 ../fuse/guestmount.pod:448
@@ -15038,22 +15040,52 @@ msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-hacking.pod:729
-msgid "Create the branch in git:"
+msgid ""
+"Set the version (in F<configure.ac>) to the new I<stable> version, ie. 1."
+"XX.0, and commit it:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:731
+#: ../docs/guestfs-hacking.pod:732
 #, no-wrap
 msgid ""
-" git tag -a 1.XX.0 -m \"Version 1.XX.0 (stable)\"\n"
-" git tag -a 1.YY.0 -m \"Version 1.YY.0 (development)\"\n"
-" git branch stable-1.XX\n"
-" git push origin tag 1.XX.0 1.YY.0 stable-1.XX\n"
+" ./localconfigure\n"
+" make distclean -k\n"
+" ./localconfigure\n"
+" make && make dist\n"
+" make maintainer-commit\n"
+" make maintainer-tag\n"
 "\n"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:740
+#: ../docs/guestfs-hacking.pod:741
+msgid "Create the stable branch in git:"
+msgstr ""
+
+#. type: verbatim
+#: ../docs/guestfs-hacking.pod:743
+#, no-wrap
+msgid ""
+" git branch stable-1.XX\n"
+" git push origin tag stable-1.XX\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:748
+msgid "Do a full release of the stable branch."
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:752
+msgid ""
+"Set the version to the next development version and commit that.  Optionally "
+"do a full release of the development branch."
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:759
 msgid ""
 "L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-internals(3)>, L<guestfs-"
 "performance(1)>, L<guestfs-release-notes(1)>, L<guestfs-testing(1)>, "
@@ -18338,7 +18370,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:30
 msgid ""
-"The new L<virt-v2v-copy-to-local(1)> tool is an auxiliary tool for L<virt-"
+"The new L<virt-v2v-copy-to-local(1)> tool is an ancillary tool for L<virt-"
 "v2v(1)> allowing you to convert source guests that virt-v2v is unable to "
 "access directly."
 msgstr ""
@@ -18400,13 +18432,13 @@ msgstr ""
 msgid ""
 "Virt-builder will now correctly handle output filenames containing colon "
 "characters (C<:>), and will create temporary files in the libguestfs cache "
-"directory instead of defaulting to C</tmp> (Pino Toscano)."
+"directory instead of defaulting to F</tmp> (Pino Toscano)."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:61
 msgid ""
-"Virt-builder has a new I<--unknown-filesystems> option to control what to do "
+"Virt-resize has a new I<--unknown-filesystems> option to control what to do "
 "when asked to resize a filesystem that libguestfs doesn't know how to resize."
 msgstr ""
 
@@ -18510,7 +18542,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:111
 msgid ""
-"If it exists, C</etc/os-release> will be preferred for inspecting Linux "
+"If it exists, F</etc/os-release> will be preferred for inspecting Linux "
 "guests (Pino Toscano)."
 msgstr ""
 
@@ -18531,7 +18563,7 @@ msgstr "mount-options"
 msgid ""
 "The large L<guestfs(3)> man page has been split into several separate man "
 "pages: L<guestfs-hacking(1)> L<guestfs-internals(1)> L<guestfs-"
-"security(1)>.  In the source tree, a new C<docs> directory contains this "
+"security(1)>.  In the source tree, a new F<docs> directory contains this "
 "documentation."
 msgstr ""
 
@@ -18610,7 +18642,7 @@ msgstr ""
 
 #. type: =item
 #: ../docs/guestfs-release-notes.pod:158
-msgid "Virt-customize permissions on C<.ssh>, C<.ssh/authorized_keys>"
+msgid "Virt-customize permissions on F<.ssh>, F<.ssh/authorized_keys>"
 msgstr ""
 
 #. type: textblock
@@ -18622,7 +18654,7 @@ msgstr ""
 #: ../docs/guestfs-release-notes.pod:162
 msgid ""
 "Previously when asked to inject an SSH key into a guest, virt-customize "
-"(hence virt-builder too) would create the C<.ssh> directory and C<.ssh/"
+"(hence virt-builder too) would create the F<.ssh> directory and F<.ssh/"
 "authorized_keys> file with too broad permissions, allowing other users to "
 "read.  They are now created as C<0700> and C<0600> respectively, which is "
 "the same as the L<ssh-copy-id(1)> utility."
@@ -18836,7 +18868,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:251
 msgid ""
-"C<make install> no longer installs OCaml C<bindtests.*> files incorrectly."
+"C<make install> no longer installs OCaml F<bindtests.*> files incorrectly."
 msgstr ""
 
 #. type: textblock
@@ -18940,28 +18972,28 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:293
 msgid ""
-"The C<configure.ac> file has been split into several smaller files called "
-"C<m4/guestfs_*.m4>."
+"The huge F<configure.ac> file has been split into several smaller files "
+"called F<m4/guestfs_*.m4>."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:296
 msgid ""
-"The old C<tests/data> and C<tests/guests> directories have been moved to "
-"C<test-data/>.  This new top level directory carries all test data which is "
+"The old F<tests/data> and F<tests/guests> directories have been moved to "
+"F<test-data/>.  This new top level directory carries all test data which is "
 "common, large and/or shared between multiple tests."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:300
 msgid ""
-"There is a new top level C<website/> directory containing the public "
+"There is a new top level F<website/> directory containing the public "
 "L<http://libguestfs.org> website (or most of it)."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:303
-msgid "The fuzz testing of inspection (C<tests/fuzz>) has been removed."
+msgid "The fuzz testing of inspection (F<tests/fuzz>) has been removed."
 msgstr ""
 
 #. type: textblock

po-docs/en_GB.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.31.29\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2016-01-06 10:49+0000\n"
+"POT-Creation-Date: 2016-01-06 11:32+0000\n"
 "PO-Revision-Date: 2014-10-18 04:01-0400\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
@@ -1323,18 +1323,20 @@ msgstr "This program returns:"
 #: ../docs/guestfs-hacking.pod:692 ../docs/guestfs-hacking.pod:696
 #: ../docs/guestfs-hacking.pod:700 ../docs/guestfs-hacking.pod:714
 #: ../docs/guestfs-hacking.pod:718 ../docs/guestfs-hacking.pod:723
-#: ../docs/guestfs-hacking.pod:727 ../docs/guestfs-performance.pod:105
-#: ../docs/guestfs-performance.pod:111 ../docs/guestfs-performance.pod:116
-#: ../docs/guestfs-performance.pod:243 ../docs/guestfs-performance.pod:248
-#: ../docs/guestfs-performance.pod:253 ../docs/guestfs-performance.pod:373
-#: ../docs/guestfs-performance.pod:377 ../docs/guestfs-performance.pod:383
-#: ../docs/guestfs-performance.pod:389 ../docs/guestfs-recipes.pod:229
-#: ../docs/guestfs-recipes.pod:233 ../docs/guestfs-recipes.pod:237
-#: ../docs/guestfs-recipes.pod:263 ../docs/guestfs-recipes.pod:268
-#: ../docs/guestfs-recipes.pod:375 ../docs/guestfs-recipes.pod:379
-#: ../docs/guestfs-recipes.pod:383 ../docs/guestfs-recipes.pod:387
-#: ../docs/guestfs-recipes.pod:391 ../docs/guestfs-release-notes.pod:144
-#: ../docs/guestfs-release-notes.pod:149 ../docs/guestfs-release-notes.pod:2045
+#: ../docs/guestfs-hacking.pod:727 ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:746 ../docs/guestfs-hacking.pod:750
+#: ../docs/guestfs-performance.pod:105 ../docs/guestfs-performance.pod:111
+#: ../docs/guestfs-performance.pod:116 ../docs/guestfs-performance.pod:243
+#: ../docs/guestfs-performance.pod:248 ../docs/guestfs-performance.pod:253
+#: ../docs/guestfs-performance.pod:373 ../docs/guestfs-performance.pod:377
+#: ../docs/guestfs-performance.pod:383 ../docs/guestfs-performance.pod:389
+#: ../docs/guestfs-recipes.pod:229 ../docs/guestfs-recipes.pod:233
+#: ../docs/guestfs-recipes.pod:237 ../docs/guestfs-recipes.pod:263
+#: ../docs/guestfs-recipes.pod:268 ../docs/guestfs-recipes.pod:375
+#: ../docs/guestfs-recipes.pod:379 ../docs/guestfs-recipes.pod:383
+#: ../docs/guestfs-recipes.pod:387 ../docs/guestfs-recipes.pod:391
+#: ../docs/guestfs-release-notes.pod:144 ../docs/guestfs-release-notes.pod:149
+#: ../docs/guestfs-release-notes.pod:2045
 #: ../docs/guestfs-release-notes.pod:2050
 #: ../docs/guestfs-release-notes.pod:2521
 #: ../docs/guestfs-release-notes.pod:2525
@@ -1526,7 +1528,7 @@ msgstr ""
 #: ../cat/virt-log.pod:135 ../cat/virt-ls.pod:518
 #: ../customize/virt-customize.pod:252 ../daemon/guestfsd.pod:143
 #: ../df/virt-df.pod:256 ../dib/virt-dib.pod:645 ../diff/virt-diff.pod:248
-#: ../docs/guestfs-faq.pod:1372 ../docs/guestfs-hacking.pod:738
+#: ../docs/guestfs-faq.pod:1372 ../docs/guestfs-hacking.pod:757
 #: ../docs/guestfs-internals.pod:400 ../docs/guestfs-performance.pod:567
 #: ../docs/guestfs-recipes.pod:668 ../docs/guestfs-release-notes.pod:4813
 #: ../docs/guestfs-security.pod:324 ../docs/guestfs-testing.pod:384
@@ -1604,7 +1606,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
 #: ../cat/virt-log.pod:149 ../cat/virt-ls.pod:532
 #: ../customize/virt-customize.pod:273 ../daemon/guestfsd.pod:152
 #: ../df/virt-df.pod:268 ../dib/virt-dib.pod:656 ../diff/virt-diff.pod:262
-#: ../docs/guestfs-faq.pod:1382 ../docs/guestfs-hacking.pod:754
+#: ../docs/guestfs-faq.pod:1382 ../docs/guestfs-hacking.pod:773
 #: ../docs/guestfs-internals.pod:413 ../docs/guestfs-performance.pod:584
 #: ../docs/guestfs-recipes.pod:687 ../docs/guestfs-release-notes.pod:4828
 #: ../docs/guestfs-security.pod:336 ../docs/guestfs-testing.pod:395
@@ -1950,7 +1952,7 @@ msgstr ""
 #. type: =head1
 #: ../appliance/libguestfs-make-fixed-appliance.pod:148
 #: ../customize/virt-customize.pod:269 ../docs/guestfs-faq.pod:1378
-#: ../docs/guestfs-hacking.pod:750 ../docs/guestfs-internals.pod:409
+#: ../docs/guestfs-hacking.pod:769 ../docs/guestfs-internals.pod:409
 #: ../docs/guestfs-performance.pod:580 ../docs/guestfs-recipes.pod:683
 #: ../docs/guestfs-security.pod:332 ../docs/guestfs-testing.pod:391
 #: ../erlang/examples/guestfs-erlang.pod:110
@@ -1973,7 +1975,7 @@ msgstr "AUTHORS"
 
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:150
-#: ../docs/guestfs-faq.pod:1380 ../docs/guestfs-hacking.pod:752
+#: ../docs/guestfs-faq.pod:1380 ../docs/guestfs-hacking.pod:771
 #: ../docs/guestfs-internals.pod:411 ../docs/guestfs-performance.pod:582
 #: ../docs/guestfs-recipes.pod:685 ../docs/guestfs-security.pod:334
 #: ../docs/guestfs-testing.pod:393 ../erlang/examples/guestfs-erlang.pod:112
@@ -1993,7 +1995,7 @@ msgstr "Richard W.M. Jones (C<rjones at redhat dot com>)"
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:154 ../cat/virt-ls.pod:534
 #: ../daemon/guestfsd.pod:154 ../df/virt-df.pod:270 ../diff/virt-diff.pod:264
-#: ../docs/guestfs-hacking.pod:756 ../docs/guestfs-internals.pod:415
+#: ../docs/guestfs-hacking.pod:775 ../docs/guestfs-internals.pod:415
 #: ../docs/guestfs-recipes.pod:689 ../docs/guestfs-release-notes.pod:4830
 #: ../docs/guestfs-security.pod:338 ../edit/virt-edit.pod:406
 #: ../fish/guestfish.pod:1636 ../fuse/guestmount.pod:448
@@ -16141,27 +16143,54 @@ msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-hacking.pod:729
-msgid "Create the branch in git:"
+msgid ""
+"Set the version (in F<configure.ac>) to the new I<stable> version, ie. 1."
+"XX.0, and commit it:"
+msgstr ""
+
+#. type: verbatim
+#: ../docs/guestfs-hacking.pod:732
+#, no-wrap
+msgid ""
+" ./localconfigure\n"
+" make distclean -k\n"
+" ./localconfigure\n"
+" make && make dist\n"
+" make maintainer-commit\n"
+" make maintainer-tag\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:741
+#, fuzzy
+#| msgid "Create the branch in git:"
+msgid "Create the stable branch in git:"
 msgstr "Create the branch in git:"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:731
+#: ../docs/guestfs-hacking.pod:743
 #, no-wrap
 msgid ""
-" git tag -a 1.XX.0 -m \"Version 1.XX.0 (stable)\"\n"
-" git tag -a 1.YY.0 -m \"Version 1.YY.0 (development)\"\n"
 " git branch stable-1.XX\n"
-" git push origin tag 1.XX.0 1.YY.0 stable-1.XX\n"
+" git push origin tag stable-1.XX\n"
 "\n"
 msgstr ""
-" git tag -a 1.XX.0 -m \"Version 1.XX.0 (stable)\"\n"
-" git tag -a 1.YY.0 -m \"Version 1.YY.0 (development)\"\n"
-" git branch stable-1.XX\n"
-" git push origin tag 1.XX.0 1.YY.0 stable-1.XX\n"
-"\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:740
+#: ../docs/guestfs-hacking.pod:748
+msgid "Do a full release of the stable branch."
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:752
+msgid ""
+"Set the version to the next development version and commit that.  Optionally "
+"do a full release of the development branch."
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:759
 msgid ""
 "L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-internals(3)>, L<guestfs-"
 "performance(1)>, L<guestfs-release-notes(1)>, L<guestfs-testing(1)>, "
@@ -20202,7 +20231,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:30
 msgid ""
-"The new L<virt-v2v-copy-to-local(1)> tool is an auxiliary tool for L<virt-"
+"The new L<virt-v2v-copy-to-local(1)> tool is an ancillary tool for L<virt-"
 "v2v(1)> allowing you to convert source guests that virt-v2v is unable to "
 "access directly."
 msgstr ""
@@ -20264,13 +20293,13 @@ msgstr ""
 msgid ""
 "Virt-builder will now correctly handle output filenames containing colon "
 "characters (C<:>), and will create temporary files in the libguestfs cache "
-"directory instead of defaulting to C</tmp> (Pino Toscano)."
+"directory instead of defaulting to F</tmp> (Pino Toscano)."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:61
 msgid ""
-"Virt-builder has a new I<--unknown-filesystems> option to control what to do "
+"Virt-resize has a new I<--unknown-filesystems> option to control what to do "
 "when asked to resize a filesystem that libguestfs doesn't know how to resize."
 msgstr ""
 
@@ -20374,7 +20403,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:111
 msgid ""
-"If it exists, C</etc/os-release> will be preferred for inspecting Linux "
+"If it exists, F</etc/os-release> will be preferred for inspecting Linux "
 "guests (Pino Toscano)."
 msgstr ""
 
@@ -20395,7 +20424,7 @@ msgstr "mount-options"
 msgid ""
 "The large L<guestfs(3)> man page has been split into several separate man "
 "pages: L<guestfs-hacking(1)> L<guestfs-internals(1)> L<guestfs-"
-"security(1)>.  In the source tree, a new C<docs> directory contains this "
+"security(1)>.  In the source tree, a new F<docs> directory contains this "
 "documentation."
 msgstr ""
 
@@ -20478,7 +20507,7 @@ msgstr ""
 
 #. type: =item
 #: ../docs/guestfs-release-notes.pod:158
-msgid "Virt-customize permissions on C<.ssh>, C<.ssh/authorized_keys>"
+msgid "Virt-customize permissions on F<.ssh>, F<.ssh/authorized_keys>"
 msgstr ""
 
 #. type: textblock
@@ -20492,7 +20521,7 @@ msgstr "L<https://bugzilla.redhat.com/916780>"
 #: ../docs/guestfs-release-notes.pod:162
 msgid ""
 "Previously when asked to inject an SSH key into a guest, virt-customize "
-"(hence virt-builder too) would create the C<.ssh> directory and C<.ssh/"
+"(hence virt-builder too) would create the F<.ssh> directory and F<.ssh/"
 "authorized_keys> file with too broad permissions, allowing other users to "
 "read.  They are now created as C<0700> and C<0600> respectively, which is "
 "the same as the L<ssh-copy-id(1)> utility."
@@ -20726,7 +20755,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:251
 msgid ""
-"C<make install> no longer installs OCaml C<bindtests.*> files incorrectly."
+"C<make install> no longer installs OCaml F<bindtests.*> files incorrectly."
 msgstr ""
 
 #. type: textblock
@@ -20830,28 +20859,28 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:293
 msgid ""
-"The C<configure.ac> file has been split into several smaller files called "
-"C<m4/guestfs_*.m4>."
+"The huge F<configure.ac> file has been split into several smaller files "
+"called F<m4/guestfs_*.m4>."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:296
 msgid ""
-"The old C<tests/data> and C<tests/guests> directories have been moved to "
-"C<test-data/>.  This new top level directory carries all test data which is "
+"The old F<tests/data> and F<tests/guests> directories have been moved to "
+"F<test-data/>.  This new top level directory carries all test data which is "
 "common, large and/or shared between multiple tests."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:300
 msgid ""
-"There is a new top level C<website/> directory containing the public "
+"There is a new top level F<website/> directory containing the public "
 "L<http://libguestfs.org> website (or most of it)."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:303
-msgid "The fuzz testing of inspection (C<tests/fuzz>) has been removed."
+msgid "The fuzz testing of inspection (F<tests/fuzz>) has been removed."
 msgstr ""
 
 #. type: textblock
@@ -110153,6 +110182,19 @@ msgstr ""
 msgid "Shahar Havivi"
 msgstr ""
 
+#~ msgid ""
+#~ " git tag -a 1.XX.0 -m \"Version 1.XX.0 (stable)\"\n"
+#~ " git tag -a 1.YY.0 -m \"Version 1.YY.0 (development)\"\n"
+#~ " git branch stable-1.XX\n"
+#~ " git push origin tag 1.XX.0 1.YY.0 stable-1.XX\n"
+#~ "\n"
+#~ msgstr ""
+#~ " git tag -a 1.XX.0 -m \"Version 1.XX.0 (stable)\"\n"
+#~ " git tag -a 1.YY.0 -m \"Version 1.YY.0 (development)\"\n"
+#~ " git branch stable-1.XX\n"
+#~ " git push origin tag 1.XX.0 1.YY.0 stable-1.XX\n"
+#~ "\n"
+
 #~ msgid ""
 #~ "Connect to the iSCSI server.  The C<server> parameter must also be "
 #~ "supplied - see below."

po-docs/es.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.31.29\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2016-01-06 10:49+0000\n"
+"POT-Creation-Date: 2016-01-06 11:32+0000\n"
 "PO-Revision-Date: 2014-10-18 04:01-0400\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/libguestfs/"
@@ -1155,18 +1155,20 @@ msgstr ""
 #: ../docs/guestfs-hacking.pod:692 ../docs/guestfs-hacking.pod:696
 #: ../docs/guestfs-hacking.pod:700 ../docs/guestfs-hacking.pod:714
 #: ../docs/guestfs-hacking.pod:718 ../docs/guestfs-hacking.pod:723
-#: ../docs/guestfs-hacking.pod:727 ../docs/guestfs-performance.pod:105
-#: ../docs/guestfs-performance.pod:111 ../docs/guestfs-performance.pod:116
-#: ../docs/guestfs-performance.pod:243 ../docs/guestfs-performance.pod:248
-#: ../docs/guestfs-performance.pod:253 ../docs/guestfs-performance.pod:373
-#: ../docs/guestfs-performance.pod:377 ../docs/guestfs-performance.pod:383
-#: ../docs/guestfs-performance.pod:389 ../docs/guestfs-recipes.pod:229
-#: ../docs/guestfs-recipes.pod:233 ../docs/guestfs-recipes.pod:237
-#: ../docs/guestfs-recipes.pod:263 ../docs/guestfs-recipes.pod:268
-#: ../docs/guestfs-recipes.pod:375 ../docs/guestfs-recipes.pod:379
-#: ../docs/guestfs-recipes.pod:383 ../docs/guestfs-recipes.pod:387
-#: ../docs/guestfs-recipes.pod:391 ../docs/guestfs-release-notes.pod:144
-#: ../docs/guestfs-release-notes.pod:149 ../docs/guestfs-release-notes.pod:2045
+#: ../docs/guestfs-hacking.pod:727 ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:746 ../docs/guestfs-hacking.pod:750
+#: ../docs/guestfs-performance.pod:105 ../docs/guestfs-performance.pod:111
+#: ../docs/guestfs-performance.pod:116 ../docs/guestfs-performance.pod:243
+#: ../docs/guestfs-performance.pod:248 ../docs/guestfs-performance.pod:253
+#: ../docs/guestfs-performance.pod:373 ../docs/guestfs-performance.pod:377
+#: ../docs/guestfs-performance.pod:383 ../docs/guestfs-performance.pod:389
+#: ../docs/guestfs-recipes.pod:229 ../docs/guestfs-recipes.pod:233
+#: ../docs/guestfs-recipes.pod:237 ../docs/guestfs-recipes.pod:263
+#: ../docs/guestfs-recipes.pod:268 ../docs/guestfs-recipes.pod:375
+#: ../docs/guestfs-recipes.pod:379 ../docs/guestfs-recipes.pod:383
+#: ../docs/guestfs-recipes.pod:387 ../docs/guestfs-recipes.pod:391
+#: ../docs/guestfs-release-notes.pod:144 ../docs/guestfs-release-notes.pod:149
+#: ../docs/guestfs-release-notes.pod:2045
 #: ../docs/guestfs-release-notes.pod:2050
 #: ../docs/guestfs-release-notes.pod:2521
 #: ../docs/guestfs-release-notes.pod:2525
@@ -1353,7 +1355,7 @@ msgstr ""
 #: ../cat/virt-log.pod:135 ../cat/virt-ls.pod:518
 #: ../customize/virt-customize.pod:252 ../daemon/guestfsd.pod:143
 #: ../df/virt-df.pod:256 ../dib/virt-dib.pod:645 ../diff/virt-diff.pod:248
-#: ../docs/guestfs-faq.pod:1372 ../docs/guestfs-hacking.pod:738
+#: ../docs/guestfs-faq.pod:1372 ../docs/guestfs-hacking.pod:757
 #: ../docs/guestfs-internals.pod:400 ../docs/guestfs-performance.pod:567
 #: ../docs/guestfs-recipes.pod:668 ../docs/guestfs-release-notes.pod:4813
 #: ../docs/guestfs-security.pod:324 ../docs/guestfs-testing.pod:384
@@ -1429,7 +1431,7 @@ msgstr ""
 #: ../cat/virt-log.pod:149 ../cat/virt-ls.pod:532
 #: ../customize/virt-customize.pod:273 ../daemon/guestfsd.pod:152
 #: ../df/virt-df.pod:268 ../dib/virt-dib.pod:656 ../diff/virt-diff.pod:262
-#: ../docs/guestfs-faq.pod:1382 ../docs/guestfs-hacking.pod:754
+#: ../docs/guestfs-faq.pod:1382 ../docs/guestfs-hacking.pod:773
 #: ../docs/guestfs-internals.pod:413 ../docs/guestfs-performance.pod:584
 #: ../docs/guestfs-recipes.pod:687 ../docs/guestfs-release-notes.pod:4828
 #: ../docs/guestfs-security.pod:336 ../docs/guestfs-testing.pod:395
@@ -1722,7 +1724,7 @@ msgstr ""
 #. type: =head1
 #: ../appliance/libguestfs-make-fixed-appliance.pod:148
 #: ../customize/virt-customize.pod:269 ../docs/guestfs-faq.pod:1378
-#: ../docs/guestfs-hacking.pod:750 ../docs/guestfs-internals.pod:409
+#: ../docs/guestfs-hacking.pod:769 ../docs/guestfs-internals.pod:409
 #: ../docs/guestfs-performance.pod:580 ../docs/guestfs-recipes.pod:683
 #: ../docs/guestfs-security.pod:332 ../docs/guestfs-testing.pod:391
 #: ../erlang/examples/guestfs-erlang.pod:110
@@ -1745,7 +1747,7 @@ msgstr ""
 
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:150
-#: ../docs/guestfs-faq.pod:1380 ../docs/guestfs-hacking.pod:752
+#: ../docs/guestfs-faq.pod:1380 ../docs/guestfs-hacking.pod:771
 #: ../docs/guestfs-internals.pod:411 ../docs/guestfs-performance.pod:582
 #: ../docs/guestfs-recipes.pod:685 ../docs/guestfs-security.pod:334
 #: ../docs/guestfs-testing.pod:393 ../erlang/examples/guestfs-erlang.pod:112
@@ -1765,7 +1767,7 @@ msgstr ""
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:154 ../cat/virt-ls.pod:534
 #: ../daemon/guestfsd.pod:154 ../df/virt-df.pod:270 ../diff/virt-diff.pod:264
-#: ../docs/guestfs-hacking.pod:756 ../docs/guestfs-internals.pod:415
+#: ../docs/guestfs-hacking.pod:775 ../docs/guestfs-internals.pod:415
 #: ../docs/guestfs-recipes.pod:689 ../docs/guestfs-release-notes.pod:4830
 #: ../docs/guestfs-security.pod:338 ../edit/virt-edit.pod:406
 #: ../fish/guestfish.pod:1636 ../fuse/guestmount.pod:448
@@ -14851,22 +14853,52 @@ msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-hacking.pod:729
-msgid "Create the branch in git:"
+msgid ""
+"Set the version (in F<configure.ac>) to the new I<stable> version, ie. 1."
+"XX.0, and commit it:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:731
+#: ../docs/guestfs-hacking.pod:732
 #, no-wrap
 msgid ""
-" git tag -a 1.XX.0 -m \"Version 1.XX.0 (stable)\"\n"
-" git tag -a 1.YY.0 -m \"Version 1.YY.0 (development)\"\n"
-" git branch stable-1.XX\n"
-" git push origin tag 1.XX.0 1.YY.0 stable-1.XX\n"
+" ./localconfigure\n"
+" make distclean -k\n"
+" ./localconfigure\n"
+" make && make dist\n"
+" make maintainer-commit\n"
+" make maintainer-tag\n"
 "\n"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:740
+#: ../docs/guestfs-hacking.pod:741
+msgid "Create the stable branch in git:"
+msgstr ""
+
+#. type: verbatim
+#: ../docs/guestfs-hacking.pod:743
+#, no-wrap
+msgid ""
+" git branch stable-1.XX\n"
+" git push origin tag stable-1.XX\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:748
+msgid "Do a full release of the stable branch."
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:752
+msgid ""
+"Set the version to the next development version and commit that.  Optionally "
+"do a full release of the development branch."
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:759
 msgid ""
 "L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-internals(3)>, L<guestfs-"
 "performance(1)>, L<guestfs-release-notes(1)>, L<guestfs-testing(1)>, "
@@ -18198,7 +18230,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:30
 msgid ""
-"The new L<virt-v2v-copy-to-local(1)> tool is an auxiliary tool for L<virt-"
+"The new L<virt-v2v-copy-to-local(1)> tool is an ancillary tool for L<virt-"
 "v2v(1)> allowing you to convert source guests that virt-v2v is unable to "
 "access directly."
 msgstr ""
@@ -18260,13 +18292,13 @@ msgstr ""
 msgid ""
 "Virt-builder will now correctly handle output filenames containing colon "
 "characters (C<:>), and will create temporary files in the libguestfs cache "
-"directory instead of defaulting to C</tmp> (Pino Toscano)."
+"directory instead of defaulting to F</tmp> (Pino Toscano)."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:61
 msgid ""
-"Virt-builder has a new I<--unknown-filesystems> option to control what to do "
+"Virt-resize has a new I<--unknown-filesystems> option to control what to do "
 "when asked to resize a filesystem that libguestfs doesn't know how to resize."
 msgstr ""
 
@@ -18370,7 +18402,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:111
 msgid ""
-"If it exists, C</etc/os-release> will be preferred for inspecting Linux "
+"If it exists, F</etc/os-release> will be preferred for inspecting Linux "
 "guests (Pino Toscano)."
 msgstr ""
 
@@ -18389,7 +18421,7 @@ msgstr ""
 msgid ""
 "The large L<guestfs(3)> man page has been split into several separate man "
 "pages: L<guestfs-hacking(1)> L<guestfs-internals(1)> L<guestfs-"
-"security(1)>.  In the source tree, a new C<docs> directory contains this "
+"security(1)>.  In the source tree, a new F<docs> directory contains this "
 "documentation."
 msgstr ""
 
@@ -18468,7 +18500,7 @@ msgstr ""
 
 #. type: =item
 #: ../docs/guestfs-release-notes.pod:158
-msgid "Virt-customize permissions on C<.ssh>, C<.ssh/authorized_keys>"
+msgid "Virt-customize permissions on F<.ssh>, F<.ssh/authorized_keys>"
 msgstr ""
 
 #. type: textblock
@@ -18480,7 +18512,7 @@ msgstr ""
 #: ../docs/guestfs-release-notes.pod:162
 msgid ""
 "Previously when asked to inject an SSH key into a guest, virt-customize "
-"(hence virt-builder too) would create the C<.ssh> directory and C<.ssh/"
+"(hence virt-builder too) would create the F<.ssh> directory and F<.ssh/"
 "authorized_keys> file with too broad permissions, allowing other users to "
 "read.  They are now created as C<0700> and C<0600> respectively, which is "
 "the same as the L<ssh-copy-id(1)> utility."
@@ -18692,7 +18724,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:251
 msgid ""
-"C<make install> no longer installs OCaml C<bindtests.*> files incorrectly."
+"C<make install> no longer installs OCaml F<bindtests.*> files incorrectly."
 msgstr ""
 
 #. type: textblock
@@ -18796,28 +18828,28 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:293
 msgid ""
-"The C<configure.ac> file has been split into several smaller files called "
-"C<m4/guestfs_*.m4>."
+"The huge F<configure.ac> file has been split into several smaller files "
+"called F<m4/guestfs_*.m4>."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:296
 msgid ""
-"The old C<tests/data> and C<tests/guests> directories have been moved to "
-"C<test-data/>.  This new top level directory carries all test data which is "
+"The old F<tests/data> and F<tests/guests> directories have been moved to "
+"F<test-data/>.  This new top level directory carries all test data which is "
 "common, large and/or shared between multiple tests."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:300
 msgid ""
-"There is a new top level C<website/> directory containing the public "
+"There is a new top level F<website/> directory containing the public "
 "L<http://libguestfs.org> website (or most of it)."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:303
-msgid "The fuzz testing of inspection (C<tests/fuzz>) has been removed."
+msgid "The fuzz testing of inspection (F<tests/fuzz>) has been removed."
 msgstr ""
 
 #. type: textblock

po-docs/eu.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.31.29\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2016-01-06 10:49+0000\n"
+"POT-Creation-Date: 2016-01-06 11:32+0000\n"
 "PO-Revision-Date: 2014-10-18 04:01-0400\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/libguestfs/"
@@ -1154,18 +1154,20 @@ msgstr ""
 #: ../docs/guestfs-hacking.pod:692 ../docs/guestfs-hacking.pod:696
 #: ../docs/guestfs-hacking.pod:700 ../docs/guestfs-hacking.pod:714
 #: ../docs/guestfs-hacking.pod:718 ../docs/guestfs-hacking.pod:723
-#: ../docs/guestfs-hacking.pod:727 ../docs/guestfs-performance.pod:105
-#: ../docs/guestfs-performance.pod:111 ../docs/guestfs-performance.pod:116
-#: ../docs/guestfs-performance.pod:243 ../docs/guestfs-performance.pod:248
-#: ../docs/guestfs-performance.pod:253 ../docs/guestfs-performance.pod:373
-#: ../docs/guestfs-performance.pod:377 ../docs/guestfs-performance.pod:383
-#: ../docs/guestfs-performance.pod:389 ../docs/guestfs-recipes.pod:229
-#: ../docs/guestfs-recipes.pod:233 ../docs/guestfs-recipes.pod:237
-#: ../docs/guestfs-recipes.pod:263 ../docs/guestfs-recipes.pod:268
-#: ../docs/guestfs-recipes.pod:375 ../docs/guestfs-recipes.pod:379
-#: ../docs/guestfs-recipes.pod:383 ../docs/guestfs-recipes.pod:387
-#: ../docs/guestfs-recipes.pod:391 ../docs/guestfs-release-notes.pod:144
-#: ../docs/guestfs-release-notes.pod:149 ../docs/guestfs-release-notes.pod:2045
+#: ../docs/guestfs-hacking.pod:727 ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:746 ../docs/guestfs-hacking.pod:750
+#: ../docs/guestfs-performance.pod:105 ../docs/guestfs-performance.pod:111
+#: ../docs/guestfs-performance.pod:116 ../docs/guestfs-performance.pod:243
+#: ../docs/guestfs-performance.pod:248 ../docs/guestfs-performance.pod:253
+#: ../docs/guestfs-performance.pod:373 ../docs/guestfs-performance.pod:377
+#: ../docs/guestfs-performance.pod:383 ../docs/guestfs-performance.pod:389
+#: ../docs/guestfs-recipes.pod:229 ../docs/guestfs-recipes.pod:233
+#: ../docs/guestfs-recipes.pod:237 ../docs/guestfs-recipes.pod:263
+#: ../docs/guestfs-recipes.pod:268 ../docs/guestfs-recipes.pod:375
+#: ../docs/guestfs-recipes.pod:379 ../docs/guestfs-recipes.pod:383
+#: ../docs/guestfs-recipes.pod:387 ../docs/guestfs-recipes.pod:391
+#: ../docs/guestfs-release-notes.pod:144 ../docs/guestfs-release-notes.pod:149
+#: ../docs/guestfs-release-notes.pod:2045
 #: ../docs/guestfs-release-notes.pod:2050
 #: ../docs/guestfs-release-notes.pod:2521
 #: ../docs/guestfs-release-notes.pod:2525
@@ -1352,7 +1354,7 @@ msgstr ""
 #: ../cat/virt-log.pod:135 ../cat/virt-ls.pod:518
 #: ../customize/virt-customize.pod:252 ../daemon/guestfsd.pod:143
 #: ../df/virt-df.pod:256 ../dib/virt-dib.pod:645 ../diff/virt-diff.pod:248
-#: ../docs/guestfs-faq.pod:1372 ../docs/guestfs-hacking.pod:738
+#: ../docs/guestfs-faq.pod:1372 ../docs/guestfs-hacking.pod:757
 #: ../docs/guestfs-internals.pod:400 ../docs/guestfs-performance.pod:567
 #: ../docs/guestfs-recipes.pod:668 ../docs/guestfs-release-notes.pod:4813
 #: ../docs/guestfs-security.pod:324 ../docs/guestfs-testing.pod:384
@@ -1428,7 +1430,7 @@ msgstr ""
 #: ../cat/virt-log.pod:149 ../cat/virt-ls.pod:532
 #: ../customize/virt-customize.pod:273 ../daemon/guestfsd.pod:152
 #: ../df/virt-df.pod:268 ../dib/virt-dib.pod:656 ../diff/virt-diff.pod:262
-#: ../docs/guestfs-faq.pod:1382 ../docs/guestfs-hacking.pod:754
+#: ../docs/guestfs-faq.pod:1382 ../docs/guestfs-hacking.pod:773
 #: ../docs/guestfs-internals.pod:413 ../docs/guestfs-performance.pod:584
 #: ../docs/guestfs-recipes.pod:687 ../docs/guestfs-release-notes.pod:4828
 #: ../docs/guestfs-security.pod:336 ../docs/guestfs-testing.pod:395
@@ -1721,7 +1723,7 @@ msgstr ""
 #. type: =head1
 #: ../appliance/libguestfs-make-fixed-appliance.pod:148
 #: ../customize/virt-customize.pod:269 ../docs/guestfs-faq.pod:1378
-#: ../docs/guestfs-hacking.pod:750 ../docs/guestfs-internals.pod:409
+#: ../docs/guestfs-hacking.pod:769 ../docs/guestfs-internals.pod:409
 #: ../docs/guestfs-performance.pod:580 ../docs/guestfs-recipes.pod:683
 #: ../docs/guestfs-security.pod:332 ../docs/guestfs-testing.pod:391
 #: ../erlang/examples/guestfs-erlang.pod:110
@@ -1744,7 +1746,7 @@ msgstr "EGILEAK"
 
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:150
-#: ../docs/guestfs-faq.pod:1380 ../docs/guestfs-hacking.pod:752
+#: ../docs/guestfs-faq.pod:1380 ../docs/guestfs-hacking.pod:771
 #: ../docs/guestfs-internals.pod:411 ../docs/guestfs-performance.pod:582
 #: ../docs/guestfs-recipes.pod:685 ../docs/guestfs-security.pod:334
 #: ../docs/guestfs-testing.pod:393 ../erlang/examples/guestfs-erlang.pod:112
@@ -1764,7 +1766,7 @@ msgstr "Richard W.M. Jones (C<rjones abildua redhat puntu com>)"
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:154 ../cat/virt-ls.pod:534
 #: ../daemon/guestfsd.pod:154 ../df/virt-df.pod:270 ../diff/virt-diff.pod:264
-#: ../docs/guestfs-hacking.pod:756 ../docs/guestfs-internals.pod:415
+#: ../docs/guestfs-hacking.pod:775 ../docs/guestfs-internals.pod:415
 #: ../docs/guestfs-recipes.pod:689 ../docs/guestfs-release-notes.pod:4830
 #: ../docs/guestfs-security.pod:338 ../edit/virt-edit.pod:406
 #: ../fish/guestfish.pod:1636 ../fuse/guestmount.pod:448
@@ -14849,22 +14851,52 @@ msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-hacking.pod:729
-msgid "Create the branch in git:"
+msgid ""
+"Set the version (in F<configure.ac>) to the new I<stable> version, ie. 1."
+"XX.0, and commit it:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:731
+#: ../docs/guestfs-hacking.pod:732
 #, no-wrap
 msgid ""
-" git tag -a 1.XX.0 -m \"Version 1.XX.0 (stable)\"\n"
-" git tag -a 1.YY.0 -m \"Version 1.YY.0 (development)\"\n"
-" git branch stable-1.XX\n"
-" git push origin tag 1.XX.0 1.YY.0 stable-1.XX\n"
+" ./localconfigure\n"
+" make distclean -k\n"
+" ./localconfigure\n"
+" make && make dist\n"
+" make maintainer-commit\n"
+" make maintainer-tag\n"
 "\n"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:740
+#: ../docs/guestfs-hacking.pod:741
+msgid "Create the stable branch in git:"
+msgstr ""
+
+#. type: verbatim
+#: ../docs/guestfs-hacking.pod:743
+#, no-wrap
+msgid ""
+" git branch stable-1.XX\n"
+" git push origin tag stable-1.XX\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:748
+msgid "Do a full release of the stable branch."
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:752
+msgid ""
+"Set the version to the next development version and commit that.  Optionally "
+"do a full release of the development branch."
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:759
 msgid ""
 "L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-internals(3)>, L<guestfs-"
 "performance(1)>, L<guestfs-release-notes(1)>, L<guestfs-testing(1)>, "
@@ -18149,7 +18181,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:30
 msgid ""
-"The new L<virt-v2v-copy-to-local(1)> tool is an auxiliary tool for L<virt-"
+"The new L<virt-v2v-copy-to-local(1)> tool is an ancillary tool for L<virt-"
 "v2v(1)> allowing you to convert source guests that virt-v2v is unable to "
 "access directly."
 msgstr ""
@@ -18211,13 +18243,13 @@ msgstr ""
 msgid ""
 "Virt-builder will now correctly handle output filenames containing colon "
 "characters (C<:>), and will create temporary files in the libguestfs cache "
-"directory instead of defaulting to C</tmp> (Pino Toscano)."
+"directory instead of defaulting to F</tmp> (Pino Toscano)."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:61
 msgid ""
-"Virt-builder has a new I<--unknown-filesystems> option to control what to do "
+"Virt-resize has a new I<--unknown-filesystems> option to control what to do "
 "when asked to resize a filesystem that libguestfs doesn't know how to resize."
 msgstr ""
 
@@ -18321,7 +18353,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:111
 msgid ""
-"If it exists, C</etc/os-release> will be preferred for inspecting Linux "
+"If it exists, F</etc/os-release> will be preferred for inspecting Linux "
 "guests (Pino Toscano)."
 msgstr ""
 
@@ -18340,7 +18372,7 @@ msgstr ""
 msgid ""
 "The large L<guestfs(3)> man page has been split into several separate man "
 "pages: L<guestfs-hacking(1)> L<guestfs-internals(1)> L<guestfs-"
-"security(1)>.  In the source tree, a new C<docs> directory contains this "
+"security(1)>.  In the source tree, a new F<docs> directory contains this "
 "documentation."
 msgstr ""
 
@@ -18419,7 +18451,7 @@ msgstr ""
 
 #. type: =item
 #: ../docs/guestfs-release-notes.pod:158
-msgid "Virt-customize permissions on C<.ssh>, C<.ssh/authorized_keys>"
+msgid "Virt-customize permissions on F<.ssh>, F<.ssh/authorized_keys>"
 msgstr ""
 
 #. type: textblock
@@ -18431,7 +18463,7 @@ msgstr ""
 #: ../docs/guestfs-release-notes.pod:162
 msgid ""
 "Previously when asked to inject an SSH key into a guest, virt-customize "
-"(hence virt-builder too) would create the C<.ssh> directory and C<.ssh/"
+"(hence virt-builder too) would create the F<.ssh> directory and F<.ssh/"
 "authorized_keys> file with too broad permissions, allowing other users to "
 "read.  They are now created as C<0700> and C<0600> respectively, which is "
 "the same as the L<ssh-copy-id(1)> utility."
@@ -18639,7 +18671,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:251
 msgid ""
-"C<make install> no longer installs OCaml C<bindtests.*> files incorrectly."
+"C<make install> no longer installs OCaml F<bindtests.*> files incorrectly."
 msgstr ""
 
 #. type: textblock
@@ -18743,28 +18775,28 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:293
 msgid ""
-"The C<configure.ac> file has been split into several smaller files called "
-"C<m4/guestfs_*.m4>."
+"The huge F<configure.ac> file has been split into several smaller files "
+"called F<m4/guestfs_*.m4>."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:296
 msgid ""
-"The old C<tests/data> and C<tests/guests> directories have been moved to "
-"C<test-data/>.  This new top level directory carries all test data which is "
+"The old F<tests/data> and F<tests/guests> directories have been moved to "
+"F<test-data/>.  This new top level directory carries all test data which is "
 "common, large and/or shared between multiple tests."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:300
 msgid ""
-"There is a new top level C<website/> directory containing the public "
+"There is a new top level F<website/> directory containing the public "
 "L<http://libguestfs.org> website (or most of it)."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:303
-msgid "The fuzz testing of inspection (C<tests/fuzz>) has been removed."
+msgid "The fuzz testing of inspection (F<tests/fuzz>) has been removed."
 msgstr ""
 
 #. type: textblock

po-docs/fr.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.31.29\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2016-01-06 10:49+0000\n"
+"POT-Creation-Date: 2016-01-06 11:32+0000\n"
 "PO-Revision-Date: 2014-10-18 04:01-0400\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/libguestfs/"
@@ -1218,18 +1218,20 @@ msgstr ""
 #: ../docs/guestfs-hacking.pod:692 ../docs/guestfs-hacking.pod:696
 #: ../docs/guestfs-hacking.pod:700 ../docs/guestfs-hacking.pod:714
 #: ../docs/guestfs-hacking.pod:718 ../docs/guestfs-hacking.pod:723
-#: ../docs/guestfs-hacking.pod:727 ../docs/guestfs-performance.pod:105
-#: ../docs/guestfs-performance.pod:111 ../docs/guestfs-performance.pod:116
-#: ../docs/guestfs-performance.pod:243 ../docs/guestfs-performance.pod:248
-#: ../docs/guestfs-performance.pod:253 ../docs/guestfs-performance.pod:373
-#: ../docs/guestfs-performance.pod:377 ../docs/guestfs-performance.pod:383
-#: ../docs/guestfs-performance.pod:389 ../docs/guestfs-recipes.pod:229
-#: ../docs/guestfs-recipes.pod:233 ../docs/guestfs-recipes.pod:237
-#: ../docs/guestfs-recipes.pod:263 ../docs/guestfs-recipes.pod:268
-#: ../docs/guestfs-recipes.pod:375 ../docs/guestfs-recipes.pod:379
-#: ../docs/guestfs-recipes.pod:383 ../docs/guestfs-recipes.pod:387
-#: ../docs/guestfs-recipes.pod:391 ../docs/guestfs-release-notes.pod:144
-#: ../docs/guestfs-release-notes.pod:149 ../docs/guestfs-release-notes.pod:2045
+#: ../docs/guestfs-hacking.pod:727 ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:746 ../docs/guestfs-hacking.pod:750
+#: ../docs/guestfs-performance.pod:105 ../docs/guestfs-performance.pod:111
+#: ../docs/guestfs-performance.pod:116 ../docs/guestfs-performance.pod:243
+#: ../docs/guestfs-performance.pod:248 ../docs/guestfs-performance.pod:253
+#: ../docs/guestfs-performance.pod:373 ../docs/guestfs-performance.pod:377
+#: ../docs/guestfs-performance.pod:383 ../docs/guestfs-performance.pod:389
+#: ../docs/guestfs-recipes.pod:229 ../docs/guestfs-recipes.pod:233
+#: ../docs/guestfs-recipes.pod:237 ../docs/guestfs-recipes.pod:263
+#: ../docs/guestfs-recipes.pod:268 ../docs/guestfs-recipes.pod:375
+#: ../docs/guestfs-recipes.pod:379 ../docs/guestfs-recipes.pod:383
+#: ../docs/guestfs-recipes.pod:387 ../docs/guestfs-recipes.pod:391
+#: ../docs/guestfs-release-notes.pod:144 ../docs/guestfs-release-notes.pod:149
+#: ../docs/guestfs-release-notes.pod:2045
 #: ../docs/guestfs-release-notes.pod:2050
 #: ../docs/guestfs-release-notes.pod:2521
 #: ../docs/guestfs-release-notes.pod:2525
@@ -1416,7 +1418,7 @@ msgstr ""
 #: ../cat/virt-log.pod:135 ../cat/virt-ls.pod:518
 #: ../customize/virt-customize.pod:252 ../daemon/guestfsd.pod:143
 #: ../df/virt-df.pod:256 ../dib/virt-dib.pod:645 ../diff/virt-diff.pod:248
-#: ../docs/guestfs-faq.pod:1372 ../docs/guestfs-hacking.pod:738
+#: ../docs/guestfs-faq.pod:1372 ../docs/guestfs-hacking.pod:757
 #: ../docs/guestfs-internals.pod:400 ../docs/guestfs-performance.pod:567
 #: ../docs/guestfs-recipes.pod:668 ../docs/guestfs-release-notes.pod:4813
 #: ../docs/guestfs-security.pod:324 ../docs/guestfs-testing.pod:384
@@ -1492,7 +1494,7 @@ msgstr ""
 #: ../cat/virt-log.pod:149 ../cat/virt-ls.pod:532
 #: ../customize/virt-customize.pod:273 ../daemon/guestfsd.pod:152
 #: ../df/virt-df.pod:268 ../dib/virt-dib.pod:656 ../diff/virt-diff.pod:262
-#: ../docs/guestfs-faq.pod:1382 ../docs/guestfs-hacking.pod:754
+#: ../docs/guestfs-faq.pod:1382 ../docs/guestfs-hacking.pod:773
 #: ../docs/guestfs-internals.pod:413 ../docs/guestfs-performance.pod:584
 #: ../docs/guestfs-recipes.pod:687 ../docs/guestfs-release-notes.pod:4828
 #: ../docs/guestfs-security.pod:336 ../docs/guestfs-testing.pod:395
@@ -1805,7 +1807,7 @@ msgstr ""
 #. type: =head1
 #: ../appliance/libguestfs-make-fixed-appliance.pod:148
 #: ../customize/virt-customize.pod:269 ../docs/guestfs-faq.pod:1378
-#: ../docs/guestfs-hacking.pod:750 ../docs/guestfs-internals.pod:409
+#: ../docs/guestfs-hacking.pod:769 ../docs/guestfs-internals.pod:409
 #: ../docs/guestfs-performance.pod:580 ../docs/guestfs-recipes.pod:683
 #: ../docs/guestfs-security.pod:332 ../docs/guestfs-testing.pod:391
 #: ../erlang/examples/guestfs-erlang.pod:110
@@ -1828,7 +1830,7 @@ msgstr ""
 
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:150
-#: ../docs/guestfs-faq.pod:1380 ../docs/guestfs-hacking.pod:752
+#: ../docs/guestfs-faq.pod:1380 ../docs/guestfs-hacking.pod:771
 #: ../docs/guestfs-internals.pod:411 ../docs/guestfs-performance.pod:582
 #: ../docs/guestfs-recipes.pod:685 ../docs/guestfs-security.pod:334
 #: ../docs/guestfs-testing.pod:393 ../erlang/examples/guestfs-erlang.pod:112
@@ -1848,7 +1850,7 @@ msgstr ""
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:154 ../cat/virt-ls.pod:534
 #: ../daemon/guestfsd.pod:154 ../df/virt-df.pod:270 ../diff/virt-diff.pod:264
-#: ../docs/guestfs-hacking.pod:756 ../docs/guestfs-internals.pod:415
+#: ../docs/guestfs-hacking.pod:775 ../docs/guestfs-internals.pod:415
 #: ../docs/guestfs-recipes.pod:689 ../docs/guestfs-release-notes.pod:4830
 #: ../docs/guestfs-security.pod:338 ../edit/virt-edit.pod:406
 #: ../fish/guestfish.pod:1636 ../fuse/guestmount.pod:448
@@ -15337,27 +15339,52 @@ msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-hacking.pod:729
-msgid "Create the branch in git:"
+msgid ""
+"Set the version (in F<configure.ac>) to the new I<stable> version, ie. 1."
+"XX.0, and commit it:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:731
+#: ../docs/guestfs-hacking.pod:732
 #, no-wrap
 msgid ""
-" git tag -a 1.XX.0 -m \"Version 1.XX.0 (stable)\"\n"
-" git tag -a 1.YY.0 -m \"Version 1.YY.0 (development)\"\n"
-" git branch stable-1.XX\n"
-" git push origin tag 1.XX.0 1.YY.0 stable-1.XX\n"
+" ./localconfigure\n"
+" make distclean -k\n"
+" ./localconfigure\n"
+" make && make dist\n"
+" make maintainer-commit\n"
+" make maintainer-tag\n"
 "\n"
 msgstr ""
-" git tag -a 1.XX.0 -m \"Version 1.XX.0 (stable)\"\n"
-" git tag -a 1.YY.0 -m \"Version 1.YY.0 (development)\"\n"
-" git branch stable-1.XX\n"
-" git push origin tag 1.XX.0 1.YY.0 stable-1.XX\n"
-"\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:740
+#: ../docs/guestfs-hacking.pod:741
+msgid "Create the stable branch in git:"
+msgstr ""
+
+#. type: verbatim
+#: ../docs/guestfs-hacking.pod:743
+#, no-wrap
+msgid ""
+" git branch stable-1.XX\n"
+" git push origin tag stable-1.XX\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:748
+msgid "Do a full release of the stable branch."
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:752
+msgid ""
+"Set the version to the next development version and commit that.  Optionally "
+"do a full release of the development branch."
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:759
 msgid ""
 "L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-internals(3)>, L<guestfs-"
 "performance(1)>, L<guestfs-release-notes(1)>, L<guestfs-testing(1)>, "
@@ -19015,7 +19042,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:30
 msgid ""
-"The new L<virt-v2v-copy-to-local(1)> tool is an auxiliary tool for L<virt-"
+"The new L<virt-v2v-copy-to-local(1)> tool is an ancillary tool for L<virt-"
 "v2v(1)> allowing you to convert source guests that virt-v2v is unable to "
 "access directly."
 msgstr ""
@@ -19077,13 +19104,13 @@ msgstr ""
 msgid ""
 "Virt-builder will now correctly handle output filenames containing colon "
 "characters (C<:>), and will create temporary files in the libguestfs cache "
-"directory instead of defaulting to C</tmp> (Pino Toscano)."
+"directory instead of defaulting to F</tmp> (Pino Toscano)."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:61
 msgid ""
-"Virt-builder has a new I<--unknown-filesystems> option to control what to do "
+"Virt-resize has a new I<--unknown-filesystems> option to control what to do "
 "when asked to resize a filesystem that libguestfs doesn't know how to resize."
 msgstr ""
 
@@ -19187,7 +19214,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:111
 msgid ""
-"If it exists, C</etc/os-release> will be preferred for inspecting Linux "
+"If it exists, F</etc/os-release> will be preferred for inspecting Linux "
 "guests (Pino Toscano)."
 msgstr ""
 
@@ -19208,7 +19235,7 @@ msgstr "mount-options"
 msgid ""
 "The large L<guestfs(3)> man page has been split into several separate man "
 "pages: L<guestfs-hacking(1)> L<guestfs-internals(1)> L<guestfs-"
-"security(1)>.  In the source tree, a new C<docs> directory contains this "
+"security(1)>.  In the source tree, a new F<docs> directory contains this "
 "documentation."
 msgstr ""
 
@@ -19285,7 +19312,7 @@ msgstr ""
 
 #. type: =item
 #: ../docs/guestfs-release-notes.pod:158
-msgid "Virt-customize permissions on C<.ssh>, C<.ssh/authorized_keys>"
+msgid "Virt-customize permissions on F<.ssh>, F<.ssh/authorized_keys>"
 msgstr ""
 
 #. type: textblock
@@ -19297,7 +19324,7 @@ msgstr ""
 #: ../docs/guestfs-release-notes.pod:162
 msgid ""
 "Previously when asked to inject an SSH key into a guest, virt-customize "
-"(hence virt-builder too) would create the C<.ssh> directory and C<.ssh/"
+"(hence virt-builder too) would create the F<.ssh> directory and F<.ssh/"
 "authorized_keys> file with too broad permissions, allowing other users to "
 "read.  They are now created as C<0700> and C<0600> respectively, which is "
 "the same as the L<ssh-copy-id(1)> utility."
@@ -19527,7 +19554,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:251
 msgid ""
-"C<make install> no longer installs OCaml C<bindtests.*> files incorrectly."
+"C<make install> no longer installs OCaml F<bindtests.*> files incorrectly."
 msgstr ""
 
 #. type: textblock
@@ -19631,28 +19658,28 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:293
 msgid ""
-"The C<configure.ac> file has been split into several smaller files called "
-"C<m4/guestfs_*.m4>."
+"The huge F<configure.ac> file has been split into several smaller files "
+"called F<m4/guestfs_*.m4>."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:296
 msgid ""
-"The old C<tests/data> and C<tests/guests> directories have been moved to "
-"C<test-data/>.  This new top level directory carries all test data which is "
+"The old F<tests/data> and F<tests/guests> directories have been moved to "
+"F<test-data/>.  This new top level directory carries all test data which is "
 "common, large and/or shared between multiple tests."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:300
 msgid ""
-"There is a new top level C<website/> directory containing the public "
+"There is a new top level F<website/> directory containing the public "
 "L<http://libguestfs.org> website (or most of it)."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:303
-msgid "The fuzz testing of inspection (C<tests/fuzz>) has been removed."
+msgid "The fuzz testing of inspection (F<tests/fuzz>) has been removed."
 msgstr ""
 
 #. type: textblock
@@ -102944,3 +102971,16 @@ msgstr ""
 #: ../v2v/virt-v2v.pod:1860
 msgid "Shahar Havivi"
 msgstr ""
+
+#~ msgid ""
+#~ " git tag -a 1.XX.0 -m \"Version 1.XX.0 (stable)\"\n"
+#~ " git tag -a 1.YY.0 -m \"Version 1.YY.0 (development)\"\n"
+#~ " git branch stable-1.XX\n"
+#~ " git push origin tag 1.XX.0 1.YY.0 stable-1.XX\n"
+#~ "\n"
+#~ msgstr ""
+#~ " git tag -a 1.XX.0 -m \"Version 1.XX.0 (stable)\"\n"
+#~ " git tag -a 1.YY.0 -m \"Version 1.YY.0 (development)\"\n"
+#~ " git branch stable-1.XX\n"
+#~ " git push origin tag 1.XX.0 1.YY.0 stable-1.XX\n"
+#~ "\n"

po-docs/ja.po

@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.31.29\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2016-01-06 10:49+0000\n"
+"POT-Creation-Date: 2016-01-06 11:32+0000\n"
 "PO-Revision-Date: 2014-10-18 04:01-0400\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/libguestfs/"
@@ -1315,18 +1315,20 @@ msgstr "このプログラムは以下を返します:"
 #: ../docs/guestfs-hacking.pod:692 ../docs/guestfs-hacking.pod:696
 #: ../docs/guestfs-hacking.pod:700 ../docs/guestfs-hacking.pod:714
 #: ../docs/guestfs-hacking.pod:718 ../docs/guestfs-hacking.pod:723
-#: ../docs/guestfs-hacking.pod:727 ../docs/guestfs-performance.pod:105
-#: ../docs/guestfs-performance.pod:111 ../docs/guestfs-performance.pod:116
-#: ../docs/guestfs-performance.pod:243 ../docs/guestfs-performance.pod:248
-#: ../docs/guestfs-performance.pod:253 ../docs/guestfs-performance.pod:373
-#: ../docs/guestfs-performance.pod:377 ../docs/guestfs-performance.pod:383
-#: ../docs/guestfs-performance.pod:389 ../docs/guestfs-recipes.pod:229
-#: ../docs/guestfs-recipes.pod:233 ../docs/guestfs-recipes.pod:237
-#: ../docs/guestfs-recipes.pod:263 ../docs/guestfs-recipes.pod:268
-#: ../docs/guestfs-recipes.pod:375 ../docs/guestfs-recipes.pod:379
-#: ../docs/guestfs-recipes.pod:383 ../docs/guestfs-recipes.pod:387
-#: ../docs/guestfs-recipes.pod:391 ../docs/guestfs-release-notes.pod:144
-#: ../docs/guestfs-release-notes.pod:149 ../docs/guestfs-release-notes.pod:2045
+#: ../docs/guestfs-hacking.pod:727 ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:746 ../docs/guestfs-hacking.pod:750
+#: ../docs/guestfs-performance.pod:105 ../docs/guestfs-performance.pod:111
+#: ../docs/guestfs-performance.pod:116 ../docs/guestfs-performance.pod:243
+#: ../docs/guestfs-performance.pod:248 ../docs/guestfs-performance.pod:253
+#: ../docs/guestfs-performance.pod:373 ../docs/guestfs-performance.pod:377
+#: ../docs/guestfs-performance.pod:383 ../docs/guestfs-performance.pod:389
+#: ../docs/guestfs-recipes.pod:229 ../docs/guestfs-recipes.pod:233
+#: ../docs/guestfs-recipes.pod:237 ../docs/guestfs-recipes.pod:263
+#: ../docs/guestfs-recipes.pod:268 ../docs/guestfs-recipes.pod:375
+#: ../docs/guestfs-recipes.pod:379 ../docs/guestfs-recipes.pod:383
+#: ../docs/guestfs-recipes.pod:387 ../docs/guestfs-recipes.pod:391
+#: ../docs/guestfs-release-notes.pod:144 ../docs/guestfs-release-notes.pod:149
+#: ../docs/guestfs-release-notes.pod:2045
 #: ../docs/guestfs-release-notes.pod:2050
 #: ../docs/guestfs-release-notes.pod:2521
 #: ../docs/guestfs-release-notes.pod:2525
@@ -1519,7 +1521,7 @@ msgstr ""
 #: ../cat/virt-log.pod:135 ../cat/virt-ls.pod:518
 #: ../customize/virt-customize.pod:252 ../daemon/guestfsd.pod:143
 #: ../df/virt-df.pod:256 ../dib/virt-dib.pod:645 ../diff/virt-diff.pod:248
-#: ../docs/guestfs-faq.pod:1372 ../docs/guestfs-hacking.pod:738
+#: ../docs/guestfs-faq.pod:1372 ../docs/guestfs-hacking.pod:757
 #: ../docs/guestfs-internals.pod:400 ../docs/guestfs-performance.pod:567
 #: ../docs/guestfs-recipes.pod:668 ../docs/guestfs-release-notes.pod:4813
 #: ../docs/guestfs-security.pod:324 ../docs/guestfs-testing.pod:384
@@ -1597,7 +1599,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
 #: ../cat/virt-log.pod:149 ../cat/virt-ls.pod:532
 #: ../customize/virt-customize.pod:273 ../daemon/guestfsd.pod:152
 #: ../df/virt-df.pod:268 ../dib/virt-dib.pod:656 ../diff/virt-diff.pod:262
-#: ../docs/guestfs-faq.pod:1382 ../docs/guestfs-hacking.pod:754
+#: ../docs/guestfs-faq.pod:1382 ../docs/guestfs-hacking.pod:773
 #: ../docs/guestfs-internals.pod:413 ../docs/guestfs-performance.pod:584
 #: ../docs/guestfs-recipes.pod:687 ../docs/guestfs-release-notes.pod:4828
 #: ../docs/guestfs-security.pod:336 ../docs/guestfs-testing.pod:395
@@ -1929,7 +1931,7 @@ msgstr ""
 #. type: =head1
 #: ../appliance/libguestfs-make-fixed-appliance.pod:148
 #: ../customize/virt-customize.pod:269 ../docs/guestfs-faq.pod:1378
-#: ../docs/guestfs-hacking.pod:750 ../docs/guestfs-internals.pod:409
+#: ../docs/guestfs-hacking.pod:769 ../docs/guestfs-internals.pod:409
 #: ../docs/guestfs-performance.pod:580 ../docs/guestfs-recipes.pod:683
 #: ../docs/guestfs-security.pod:332 ../docs/guestfs-testing.pod:391
 #: ../erlang/examples/guestfs-erlang.pod:110
@@ -1952,7 +1954,7 @@ msgstr "著者"
 
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:150
-#: ../docs/guestfs-faq.pod:1380 ../docs/guestfs-hacking.pod:752
+#: ../docs/guestfs-faq.pod:1380 ../docs/guestfs-hacking.pod:771
 #: ../docs/guestfs-internals.pod:411 ../docs/guestfs-performance.pod:582
 #: ../docs/guestfs-recipes.pod:685 ../docs/guestfs-security.pod:334
 #: ../docs/guestfs-testing.pod:393 ../erlang/examples/guestfs-erlang.pod:112
@@ -1972,7 +1974,7 @@ msgstr "Richard W.M. Jones (C<rjones at redhat dot com>)"
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:154 ../cat/virt-ls.pod:534
 #: ../daemon/guestfsd.pod:154 ../df/virt-df.pod:270 ../diff/virt-diff.pod:264
-#: ../docs/guestfs-hacking.pod:756 ../docs/guestfs-internals.pod:415
+#: ../docs/guestfs-hacking.pod:775 ../docs/guestfs-internals.pod:415
 #: ../docs/guestfs-recipes.pod:689 ../docs/guestfs-release-notes.pod:4830
 #: ../docs/guestfs-security.pod:338 ../edit/virt-edit.pod:406
 #: ../fish/guestfish.pod:1636 ../fuse/guestmount.pod:448
@@ -15522,27 +15524,54 @@ msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-hacking.pod:729
-msgid "Create the branch in git:"
+msgid ""
+"Set the version (in F<configure.ac>) to the new I<stable> version, ie. 1."
+"XX.0, and commit it:"
+msgstr ""
+
+#. type: verbatim
+#: ../docs/guestfs-hacking.pod:732
+#, no-wrap
+msgid ""
+" ./localconfigure\n"
+" make distclean -k\n"
+" ./localconfigure\n"
+" make && make dist\n"
+" make maintainer-commit\n"
+" make maintainer-tag\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:741
+#, fuzzy
+#| msgid "Create the branch in git:"
+msgid "Create the stable branch in git:"
 msgstr "git に分岐を作成します:"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:731
+#: ../docs/guestfs-hacking.pod:743
 #, no-wrap
 msgid ""
-" git tag -a 1.XX.0 -m \"Version 1.XX.0 (stable)\"\n"
-" git tag -a 1.YY.0 -m \"Version 1.YY.0 (development)\"\n"
 " git branch stable-1.XX\n"
-" git push origin tag 1.XX.0 1.YY.0 stable-1.XX\n"
+" git push origin tag stable-1.XX\n"
 "\n"
 msgstr ""
-" git tag -a 1.XX.0 -m \"Version 1.XX.0 (安定版)\"\n"
-" git tag -a 1.YY.0 -m \"Version 1.YY.0 (開発版)\"\n"
-" git branch stable-1.XX\n"
-" git push origin tag 1.XX.0 1.YY.0 stable-1.XX\n"
-"\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:740
+#: ../docs/guestfs-hacking.pod:748
+msgid "Do a full release of the stable branch."
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:752
+msgid ""
+"Set the version to the next development version and commit that.  Optionally "
+"do a full release of the development branch."
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:759
 msgid ""
 "L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-internals(3)>, L<guestfs-"
 "performance(1)>, L<guestfs-release-notes(1)>, L<guestfs-testing(1)>, "
@@ -19176,7 +19205,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:30
 msgid ""
-"The new L<virt-v2v-copy-to-local(1)> tool is an auxiliary tool for L<virt-"
+"The new L<virt-v2v-copy-to-local(1)> tool is an ancillary tool for L<virt-"
 "v2v(1)> allowing you to convert source guests that virt-v2v is unable to "
 "access directly."
 msgstr ""
@@ -19238,13 +19267,13 @@ msgstr ""
 msgid ""
 "Virt-builder will now correctly handle output filenames containing colon "
 "characters (C<:>), and will create temporary files in the libguestfs cache "
-"directory instead of defaulting to C</tmp> (Pino Toscano)."
+"directory instead of defaulting to F</tmp> (Pino Toscano)."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:61
 msgid ""
-"Virt-builder has a new I<--unknown-filesystems> option to control what to do "
+"Virt-resize has a new I<--unknown-filesystems> option to control what to do "
 "when asked to resize a filesystem that libguestfs doesn't know how to resize."
 msgstr ""
 
@@ -19348,7 +19377,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:111
 msgid ""
-"If it exists, C</etc/os-release> will be preferred for inspecting Linux "
+"If it exists, F</etc/os-release> will be preferred for inspecting Linux "
 "guests (Pino Toscano)."
 msgstr ""
 
@@ -19369,7 +19398,7 @@ msgstr "mount-options"
 msgid ""
 "The large L<guestfs(3)> man page has been split into several separate man "
 "pages: L<guestfs-hacking(1)> L<guestfs-internals(1)> L<guestfs-"
-"security(1)>.  In the source tree, a new C<docs> directory contains this "
+"security(1)>.  In the source tree, a new F<docs> directory contains this "
 "documentation."
 msgstr ""
 
@@ -19451,7 +19480,7 @@ msgstr ""
 
 #. type: =item
 #: ../docs/guestfs-release-notes.pod:158
-msgid "Virt-customize permissions on C<.ssh>, C<.ssh/authorized_keys>"
+msgid "Virt-customize permissions on F<.ssh>, F<.ssh/authorized_keys>"
 msgstr ""
 
 #. type: textblock
@@ -19465,7 +19494,7 @@ msgstr "L<https://bugzilla.redhat.com/916780>"
 #: ../docs/guestfs-release-notes.pod:162
 msgid ""
 "Previously when asked to inject an SSH key into a guest, virt-customize "
-"(hence virt-builder too) would create the C<.ssh> directory and C<.ssh/"
+"(hence virt-builder too) would create the F<.ssh> directory and F<.ssh/"
 "authorized_keys> file with too broad permissions, allowing other users to "
 "read.  They are now created as C<0700> and C<0600> respectively, which is "
 "the same as the L<ssh-copy-id(1)> utility."
@@ -19691,7 +19720,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:251
 msgid ""
-"C<make install> no longer installs OCaml C<bindtests.*> files incorrectly."
+"C<make install> no longer installs OCaml F<bindtests.*> files incorrectly."
 msgstr ""
 
 #. type: textblock
@@ -19795,28 +19824,28 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:293
 msgid ""
-"The C<configure.ac> file has been split into several smaller files called "
-"C<m4/guestfs_*.m4>."
+"The huge F<configure.ac> file has been split into several smaller files "
+"called F<m4/guestfs_*.m4>."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:296
 msgid ""
-"The old C<tests/data> and C<tests/guests> directories have been moved to "
-"C<test-data/>.  This new top level directory carries all test data which is "
+"The old F<tests/data> and F<tests/guests> directories have been moved to "
+"F<test-data/>.  This new top level directory carries all test data which is "
 "common, large and/or shared between multiple tests."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:300
 msgid ""
-"There is a new top level C<website/> directory containing the public "
+"There is a new top level F<website/> directory containing the public "
 "L<http://libguestfs.org> website (or most of it)."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:303
-msgid "The fuzz testing of inspection (C<tests/fuzz>) has been removed."
+msgid "The fuzz testing of inspection (F<tests/fuzz>) has been removed."
 msgstr ""
 
 #. type: textblock
@@ -102662,6 +102691,19 @@ msgstr ""
 msgid "Shahar Havivi"
 msgstr ""
 
+#~ msgid ""
+#~ " git tag -a 1.XX.0 -m \"Version 1.XX.0 (stable)\"\n"
+#~ " git tag -a 1.YY.0 -m \"Version 1.YY.0 (development)\"\n"
+#~ " git branch stable-1.XX\n"
+#~ " git push origin tag 1.XX.0 1.YY.0 stable-1.XX\n"
+#~ "\n"
+#~ msgstr ""
+#~ " git tag -a 1.XX.0 -m \"Version 1.XX.0 (安定版)\"\n"
+#~ " git tag -a 1.YY.0 -m \"Version 1.YY.0 (開発版)\"\n"
+#~ " git branch stable-1.XX\n"
+#~ " git push origin tag 1.XX.0 1.YY.0 stable-1.XX\n"
+#~ "\n"
+
 #, fuzzy
 #~ msgid "Copyright (C) 2010-2015 Red Hat Inc."
 #~ msgstr "Copyright (C) 2010-2012 Red Hat Inc."

po-docs/nl.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.31.29\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2016-01-06 10:49+0000\n"
+"POT-Creation-Date: 2016-01-06 11:32+0000\n"
 "PO-Revision-Date: 2014-10-18 04:01-0400\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/libguestfs/"
@@ -1154,18 +1154,20 @@ msgstr ""
 #: ../docs/guestfs-hacking.pod:692 ../docs/guestfs-hacking.pod:696
 #: ../docs/guestfs-hacking.pod:700 ../docs/guestfs-hacking.pod:714
 #: ../docs/guestfs-hacking.pod:718 ../docs/guestfs-hacking.pod:723
-#: ../docs/guestfs-hacking.pod:727 ../docs/guestfs-performance.pod:105
-#: ../docs/guestfs-performance.pod:111 ../docs/guestfs-performance.pod:116
-#: ../docs/guestfs-performance.pod:243 ../docs/guestfs-performance.pod:248
-#: ../docs/guestfs-performance.pod:253 ../docs/guestfs-performance.pod:373
-#: ../docs/guestfs-performance.pod:377 ../docs/guestfs-performance.pod:383
-#: ../docs/guestfs-performance.pod:389 ../docs/guestfs-recipes.pod:229
-#: ../docs/guestfs-recipes.pod:233 ../docs/guestfs-recipes.pod:237
-#: ../docs/guestfs-recipes.pod:263 ../docs/guestfs-recipes.pod:268
-#: ../docs/guestfs-recipes.pod:375 ../docs/guestfs-recipes.pod:379
-#: ../docs/guestfs-recipes.pod:383 ../docs/guestfs-recipes.pod:387
-#: ../docs/guestfs-recipes.pod:391 ../docs/guestfs-release-notes.pod:144
-#: ../docs/guestfs-release-notes.pod:149 ../docs/guestfs-release-notes.pod:2045
+#: ../docs/guestfs-hacking.pod:727 ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:746 ../docs/guestfs-hacking.pod:750
+#: ../docs/guestfs-performance.pod:105 ../docs/guestfs-performance.pod:111
+#: ../docs/guestfs-performance.pod:116 ../docs/guestfs-performance.pod:243
+#: ../docs/guestfs-performance.pod:248 ../docs/guestfs-performance.pod:253
+#: ../docs/guestfs-performance.pod:373 ../docs/guestfs-performance.pod:377
+#: ../docs/guestfs-performance.pod:383 ../docs/guestfs-performance.pod:389
+#: ../docs/guestfs-recipes.pod:229 ../docs/guestfs-recipes.pod:233
+#: ../docs/guestfs-recipes.pod:237 ../docs/guestfs-recipes.pod:263
+#: ../docs/guestfs-recipes.pod:268 ../docs/guestfs-recipes.pod:375
+#: ../docs/guestfs-recipes.pod:379 ../docs/guestfs-recipes.pod:383
+#: ../docs/guestfs-recipes.pod:387 ../docs/guestfs-recipes.pod:391
+#: ../docs/guestfs-release-notes.pod:144 ../docs/guestfs-release-notes.pod:149
+#: ../docs/guestfs-release-notes.pod:2045
 #: ../docs/guestfs-release-notes.pod:2050
 #: ../docs/guestfs-release-notes.pod:2521
 #: ../docs/guestfs-release-notes.pod:2525
@@ -1352,7 +1354,7 @@ msgstr ""
 #: ../cat/virt-log.pod:135 ../cat/virt-ls.pod:518
 #: ../customize/virt-customize.pod:252 ../daemon/guestfsd.pod:143
 #: ../df/virt-df.pod:256 ../dib/virt-dib.pod:645 ../diff/virt-diff.pod:248
-#: ../docs/guestfs-faq.pod:1372 ../docs/guestfs-hacking.pod:738
+#: ../docs/guestfs-faq.pod:1372 ../docs/guestfs-hacking.pod:757
 #: ../docs/guestfs-internals.pod:400 ../docs/guestfs-performance.pod:567
 #: ../docs/guestfs-recipes.pod:668 ../docs/guestfs-release-notes.pod:4813
 #: ../docs/guestfs-security.pod:324 ../docs/guestfs-testing.pod:384
@@ -1428,7 +1430,7 @@ msgstr ""
 #: ../cat/virt-log.pod:149 ../cat/virt-ls.pod:532
 #: ../customize/virt-customize.pod:273 ../daemon/guestfsd.pod:152
 #: ../df/virt-df.pod:268 ../dib/virt-dib.pod:656 ../diff/virt-diff.pod:262
-#: ../docs/guestfs-faq.pod:1382 ../docs/guestfs-hacking.pod:754
+#: ../docs/guestfs-faq.pod:1382 ../docs/guestfs-hacking.pod:773
 #: ../docs/guestfs-internals.pod:413 ../docs/guestfs-performance.pod:584
 #: ../docs/guestfs-recipes.pod:687 ../docs/guestfs-release-notes.pod:4828
 #: ../docs/guestfs-security.pod:336 ../docs/guestfs-testing.pod:395
@@ -1721,7 +1723,7 @@ msgstr ""
 #. type: =head1
 #: ../appliance/libguestfs-make-fixed-appliance.pod:148
 #: ../customize/virt-customize.pod:269 ../docs/guestfs-faq.pod:1378
-#: ../docs/guestfs-hacking.pod:750 ../docs/guestfs-internals.pod:409
+#: ../docs/guestfs-hacking.pod:769 ../docs/guestfs-internals.pod:409
 #: ../docs/guestfs-performance.pod:580 ../docs/guestfs-recipes.pod:683
 #: ../docs/guestfs-security.pod:332 ../docs/guestfs-testing.pod:391
 #: ../erlang/examples/guestfs-erlang.pod:110
@@ -1744,7 +1746,7 @@ msgstr ""
 
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:150
-#: ../docs/guestfs-faq.pod:1380 ../docs/guestfs-hacking.pod:752
+#: ../docs/guestfs-faq.pod:1380 ../docs/guestfs-hacking.pod:771
 #: ../docs/guestfs-internals.pod:411 ../docs/guestfs-performance.pod:582
 #: ../docs/guestfs-recipes.pod:685 ../docs/guestfs-security.pod:334
 #: ../docs/guestfs-testing.pod:393 ../erlang/examples/guestfs-erlang.pod:112
@@ -1764,7 +1766,7 @@ msgstr ""
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:154 ../cat/virt-ls.pod:534
 #: ../daemon/guestfsd.pod:154 ../df/virt-df.pod:270 ../diff/virt-diff.pod:264
-#: ../docs/guestfs-hacking.pod:756 ../docs/guestfs-internals.pod:415
+#: ../docs/guestfs-hacking.pod:775 ../docs/guestfs-internals.pod:415
 #: ../docs/guestfs-recipes.pod:689 ../docs/guestfs-release-notes.pod:4830
 #: ../docs/guestfs-security.pod:338 ../edit/virt-edit.pod:406
 #: ../fish/guestfish.pod:1636 ../fuse/guestmount.pod:448
@@ -14849,22 +14851,52 @@ msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-hacking.pod:729
-msgid "Create the branch in git:"
+msgid ""
+"Set the version (in F<configure.ac>) to the new I<stable> version, ie. 1."
+"XX.0, and commit it:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:731
+#: ../docs/guestfs-hacking.pod:732
 #, no-wrap
 msgid ""
-" git tag -a 1.XX.0 -m \"Version 1.XX.0 (stable)\"\n"
-" git tag -a 1.YY.0 -m \"Version 1.YY.0 (development)\"\n"
-" git branch stable-1.XX\n"
-" git push origin tag 1.XX.0 1.YY.0 stable-1.XX\n"
+" ./localconfigure\n"
+" make distclean -k\n"
+" ./localconfigure\n"
+" make && make dist\n"
+" make maintainer-commit\n"
+" make maintainer-tag\n"
 "\n"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:740
+#: ../docs/guestfs-hacking.pod:741
+msgid "Create the stable branch in git:"
+msgstr ""
+
+#. type: verbatim
+#: ../docs/guestfs-hacking.pod:743
+#, no-wrap
+msgid ""
+" git branch stable-1.XX\n"
+" git push origin tag stable-1.XX\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:748
+msgid "Do a full release of the stable branch."
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:752
+msgid ""
+"Set the version to the next development version and commit that.  Optionally "
+"do a full release of the development branch."
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:759
 msgid ""
 "L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-internals(3)>, L<guestfs-"
 "performance(1)>, L<guestfs-release-notes(1)>, L<guestfs-testing(1)>, "
@@ -18149,7 +18181,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:30
 msgid ""
-"The new L<virt-v2v-copy-to-local(1)> tool is an auxiliary tool for L<virt-"
+"The new L<virt-v2v-copy-to-local(1)> tool is an ancillary tool for L<virt-"
 "v2v(1)> allowing you to convert source guests that virt-v2v is unable to "
 "access directly."
 msgstr ""
@@ -18211,13 +18243,13 @@ msgstr ""
 msgid ""
 "Virt-builder will now correctly handle output filenames containing colon "
 "characters (C<:>), and will create temporary files in the libguestfs cache "
-"directory instead of defaulting to C</tmp> (Pino Toscano)."
+"directory instead of defaulting to F</tmp> (Pino Toscano)."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:61
 msgid ""
-"Virt-builder has a new I<--unknown-filesystems> option to control what to do "
+"Virt-resize has a new I<--unknown-filesystems> option to control what to do "
 "when asked to resize a filesystem that libguestfs doesn't know how to resize."
 msgstr ""
 
@@ -18321,7 +18353,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:111
 msgid ""
-"If it exists, C</etc/os-release> will be preferred for inspecting Linux "
+"If it exists, F</etc/os-release> will be preferred for inspecting Linux "
 "guests (Pino Toscano)."
 msgstr ""
 
@@ -18340,7 +18372,7 @@ msgstr ""
 msgid ""
 "The large L<guestfs(3)> man page has been split into several separate man "
 "pages: L<guestfs-hacking(1)> L<guestfs-internals(1)> L<guestfs-"
-"security(1)>.  In the source tree, a new C<docs> directory contains this "
+"security(1)>.  In the source tree, a new F<docs> directory contains this "
 "documentation."
 msgstr ""
 
@@ -18417,7 +18449,7 @@ msgstr ""
 
 #. type: =item
 #: ../docs/guestfs-release-notes.pod:158
-msgid "Virt-customize permissions on C<.ssh>, C<.ssh/authorized_keys>"
+msgid "Virt-customize permissions on F<.ssh>, F<.ssh/authorized_keys>"
 msgstr ""
 
 #. type: textblock
@@ -18429,7 +18461,7 @@ msgstr ""
 #: ../docs/guestfs-release-notes.pod:162
 msgid ""
 "Previously when asked to inject an SSH key into a guest, virt-customize "
-"(hence virt-builder too) would create the C<.ssh> directory and C<.ssh/"
+"(hence virt-builder too) would create the F<.ssh> directory and F<.ssh/"
 "authorized_keys> file with too broad permissions, allowing other users to "
 "read.  They are now created as C<0700> and C<0600> respectively, which is "
 "the same as the L<ssh-copy-id(1)> utility."
@@ -18635,7 +18667,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:251
 msgid ""
-"C<make install> no longer installs OCaml C<bindtests.*> files incorrectly."
+"C<make install> no longer installs OCaml F<bindtests.*> files incorrectly."
 msgstr ""
 
 #. type: textblock
@@ -18739,28 +18771,28 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:293
 msgid ""
-"The C<configure.ac> file has been split into several smaller files called "
-"C<m4/guestfs_*.m4>."
+"The huge F<configure.ac> file has been split into several smaller files "
+"called F<m4/guestfs_*.m4>."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:296
 msgid ""
-"The old C<tests/data> and C<tests/guests> directories have been moved to "
-"C<test-data/>.  This new top level directory carries all test data which is "
+"The old F<tests/data> and F<tests/guests> directories have been moved to "
+"F<test-data/>.  This new top level directory carries all test data which is "
 "common, large and/or shared between multiple tests."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:300
 msgid ""
-"There is a new top level C<website/> directory containing the public "
+"There is a new top level F<website/> directory containing the public "
 "L<http://libguestfs.org> website (or most of it)."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:303
-msgid "The fuzz testing of inspection (C<tests/fuzz>) has been removed."
+msgid "The fuzz testing of inspection (F<tests/fuzz>) has been removed."
 msgstr ""
 
 #. type: textblock

po-docs/pt_BR.po

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.31.29\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2016-01-06 10:49+0000\n"
+"POT-Creation-Date: 2016-01-06 11:32+0000\n"
 "PO-Revision-Date: 2015-10-28 05:02-0400\n"
 "Last-Translator: Marco Aurélio Krause <ouesten@me.com>\n"
 "Language-Team: Portuguese (Brazil)\n"
@@ -1148,18 +1148,20 @@ msgstr ""
 #: ../docs/guestfs-hacking.pod:692 ../docs/guestfs-hacking.pod:696
 #: ../docs/guestfs-hacking.pod:700 ../docs/guestfs-hacking.pod:714
 #: ../docs/guestfs-hacking.pod:718 ../docs/guestfs-hacking.pod:723
-#: ../docs/guestfs-hacking.pod:727 ../docs/guestfs-performance.pod:105
-#: ../docs/guestfs-performance.pod:111 ../docs/guestfs-performance.pod:116
-#: ../docs/guestfs-performance.pod:243 ../docs/guestfs-performance.pod:248
-#: ../docs/guestfs-performance.pod:253 ../docs/guestfs-performance.pod:373
-#: ../docs/guestfs-performance.pod:377 ../docs/guestfs-performance.pod:383
-#: ../docs/guestfs-performance.pod:389 ../docs/guestfs-recipes.pod:229
-#: ../docs/guestfs-recipes.pod:233 ../docs/guestfs-recipes.pod:237
-#: ../docs/guestfs-recipes.pod:263 ../docs/guestfs-recipes.pod:268
-#: ../docs/guestfs-recipes.pod:375 ../docs/guestfs-recipes.pod:379
-#: ../docs/guestfs-recipes.pod:383 ../docs/guestfs-recipes.pod:387
-#: ../docs/guestfs-recipes.pod:391 ../docs/guestfs-release-notes.pod:144
-#: ../docs/guestfs-release-notes.pod:149 ../docs/guestfs-release-notes.pod:2045
+#: ../docs/guestfs-hacking.pod:727 ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:746 ../docs/guestfs-hacking.pod:750
+#: ../docs/guestfs-performance.pod:105 ../docs/guestfs-performance.pod:111
+#: ../docs/guestfs-performance.pod:116 ../docs/guestfs-performance.pod:243
+#: ../docs/guestfs-performance.pod:248 ../docs/guestfs-performance.pod:253
+#: ../docs/guestfs-performance.pod:373 ../docs/guestfs-performance.pod:377
+#: ../docs/guestfs-performance.pod:383 ../docs/guestfs-performance.pod:389
+#: ../docs/guestfs-recipes.pod:229 ../docs/guestfs-recipes.pod:233
+#: ../docs/guestfs-recipes.pod:237 ../docs/guestfs-recipes.pod:263
+#: ../docs/guestfs-recipes.pod:268 ../docs/guestfs-recipes.pod:375
+#: ../docs/guestfs-recipes.pod:379 ../docs/guestfs-recipes.pod:383
+#: ../docs/guestfs-recipes.pod:387 ../docs/guestfs-recipes.pod:391
+#: ../docs/guestfs-release-notes.pod:144 ../docs/guestfs-release-notes.pod:149
+#: ../docs/guestfs-release-notes.pod:2045
 #: ../docs/guestfs-release-notes.pod:2050
 #: ../docs/guestfs-release-notes.pod:2521
 #: ../docs/guestfs-release-notes.pod:2525
@@ -1346,7 +1348,7 @@ msgstr ""
 #: ../cat/virt-log.pod:135 ../cat/virt-ls.pod:518
 #: ../customize/virt-customize.pod:252 ../daemon/guestfsd.pod:143
 #: ../df/virt-df.pod:256 ../dib/virt-dib.pod:645 ../diff/virt-diff.pod:248
-#: ../docs/guestfs-faq.pod:1372 ../docs/guestfs-hacking.pod:738
+#: ../docs/guestfs-faq.pod:1372 ../docs/guestfs-hacking.pod:757
 #: ../docs/guestfs-internals.pod:400 ../docs/guestfs-performance.pod:567
 #: ../docs/guestfs-recipes.pod:668 ../docs/guestfs-release-notes.pod:4813
 #: ../docs/guestfs-security.pod:324 ../docs/guestfs-testing.pod:384
@@ -1422,7 +1424,7 @@ msgstr ""
 #: ../cat/virt-log.pod:149 ../cat/virt-ls.pod:532
 #: ../customize/virt-customize.pod:273 ../daemon/guestfsd.pod:152
 #: ../df/virt-df.pod:268 ../dib/virt-dib.pod:656 ../diff/virt-diff.pod:262
-#: ../docs/guestfs-faq.pod:1382 ../docs/guestfs-hacking.pod:754
+#: ../docs/guestfs-faq.pod:1382 ../docs/guestfs-hacking.pod:773
 #: ../docs/guestfs-internals.pod:413 ../docs/guestfs-performance.pod:584
 #: ../docs/guestfs-recipes.pod:687 ../docs/guestfs-release-notes.pod:4828
 #: ../docs/guestfs-security.pod:336 ../docs/guestfs-testing.pod:395
@@ -1715,7 +1717,7 @@ msgstr ""
 #. type: =head1
 #: ../appliance/libguestfs-make-fixed-appliance.pod:148
 #: ../customize/virt-customize.pod:269 ../docs/guestfs-faq.pod:1378
-#: ../docs/guestfs-hacking.pod:750 ../docs/guestfs-internals.pod:409
+#: ../docs/guestfs-hacking.pod:769 ../docs/guestfs-internals.pod:409
 #: ../docs/guestfs-performance.pod:580 ../docs/guestfs-recipes.pod:683
 #: ../docs/guestfs-security.pod:332 ../docs/guestfs-testing.pod:391
 #: ../erlang/examples/guestfs-erlang.pod:110
@@ -1738,7 +1740,7 @@ msgstr ""
 
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:150
-#: ../docs/guestfs-faq.pod:1380 ../docs/guestfs-hacking.pod:752
+#: ../docs/guestfs-faq.pod:1380 ../docs/guestfs-hacking.pod:771
 #: ../docs/guestfs-internals.pod:411 ../docs/guestfs-performance.pod:582
 #: ../docs/guestfs-recipes.pod:685 ../docs/guestfs-security.pod:334
 #: ../docs/guestfs-testing.pod:393 ../erlang/examples/guestfs-erlang.pod:112
@@ -1758,7 +1760,7 @@ msgstr ""
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:154 ../cat/virt-ls.pod:534
 #: ../daemon/guestfsd.pod:154 ../df/virt-df.pod:270 ../diff/virt-diff.pod:264
-#: ../docs/guestfs-hacking.pod:756 ../docs/guestfs-internals.pod:415
+#: ../docs/guestfs-hacking.pod:775 ../docs/guestfs-internals.pod:415
 #: ../docs/guestfs-recipes.pod:689 ../docs/guestfs-release-notes.pod:4830
 #: ../docs/guestfs-security.pod:338 ../edit/virt-edit.pod:406
 #: ../fish/guestfish.pod:1636 ../fuse/guestmount.pod:448
@@ -14843,22 +14845,52 @@ msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-hacking.pod:729
-msgid "Create the branch in git:"
+msgid ""
+"Set the version (in F<configure.ac>) to the new I<stable> version, ie. 1."
+"XX.0, and commit it:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:731
+#: ../docs/guestfs-hacking.pod:732
 #, no-wrap
 msgid ""
-" git tag -a 1.XX.0 -m \"Version 1.XX.0 (stable)\"\n"
-" git tag -a 1.YY.0 -m \"Version 1.YY.0 (development)\"\n"
-" git branch stable-1.XX\n"
-" git push origin tag 1.XX.0 1.YY.0 stable-1.XX\n"
+" ./localconfigure\n"
+" make distclean -k\n"
+" ./localconfigure\n"
+" make && make dist\n"
+" make maintainer-commit\n"
+" make maintainer-tag\n"
 "\n"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:740
+#: ../docs/guestfs-hacking.pod:741
+msgid "Create the stable branch in git:"
+msgstr ""
+
+#. type: verbatim
+#: ../docs/guestfs-hacking.pod:743
+#, no-wrap
+msgid ""
+" git branch stable-1.XX\n"
+" git push origin tag stable-1.XX\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:748
+msgid "Do a full release of the stable branch."
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:752
+msgid ""
+"Set the version to the next development version and commit that.  Optionally "
+"do a full release of the development branch."
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:759
 msgid ""
 "L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-internals(3)>, L<guestfs-"
 "performance(1)>, L<guestfs-release-notes(1)>, L<guestfs-testing(1)>, "
@@ -18143,7 +18175,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:30
 msgid ""
-"The new L<virt-v2v-copy-to-local(1)> tool is an auxiliary tool for L<virt-"
+"The new L<virt-v2v-copy-to-local(1)> tool is an ancillary tool for L<virt-"
 "v2v(1)> allowing you to convert source guests that virt-v2v is unable to "
 "access directly."
 msgstr ""
@@ -18205,13 +18237,13 @@ msgstr ""
 msgid ""
 "Virt-builder will now correctly handle output filenames containing colon "
 "characters (C<:>), and will create temporary files in the libguestfs cache "
-"directory instead of defaulting to C</tmp> (Pino Toscano)."
+"directory instead of defaulting to F</tmp> (Pino Toscano)."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:61
 msgid ""
-"Virt-builder has a new I<--unknown-filesystems> option to control what to do "
+"Virt-resize has a new I<--unknown-filesystems> option to control what to do "
 "when asked to resize a filesystem that libguestfs doesn't know how to resize."
 msgstr ""
 
@@ -18315,7 +18347,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:111
 msgid ""
-"If it exists, C</etc/os-release> will be preferred for inspecting Linux "
+"If it exists, F</etc/os-release> will be preferred for inspecting Linux "
 "guests (Pino Toscano)."
 msgstr ""
 
@@ -18334,7 +18366,7 @@ msgstr ""
 msgid ""
 "The large L<guestfs(3)> man page has been split into several separate man "
 "pages: L<guestfs-hacking(1)> L<guestfs-internals(1)> L<guestfs-"
-"security(1)>.  In the source tree, a new C<docs> directory contains this "
+"security(1)>.  In the source tree, a new F<docs> directory contains this "
 "documentation."
 msgstr ""
 
@@ -18411,7 +18443,7 @@ msgstr ""
 
 #. type: =item
 #: ../docs/guestfs-release-notes.pod:158
-msgid "Virt-customize permissions on C<.ssh>, C<.ssh/authorized_keys>"
+msgid "Virt-customize permissions on F<.ssh>, F<.ssh/authorized_keys>"
 msgstr ""
 
 #. type: textblock
@@ -18423,7 +18455,7 @@ msgstr ""
 #: ../docs/guestfs-release-notes.pod:162
 msgid ""
 "Previously when asked to inject an SSH key into a guest, virt-customize "
-"(hence virt-builder too) would create the C<.ssh> directory and C<.ssh/"
+"(hence virt-builder too) would create the F<.ssh> directory and F<.ssh/"
 "authorized_keys> file with too broad permissions, allowing other users to "
 "read.  They are now created as C<0700> and C<0600> respectively, which is "
 "the same as the L<ssh-copy-id(1)> utility."
@@ -18629,7 +18661,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:251
 msgid ""
-"C<make install> no longer installs OCaml C<bindtests.*> files incorrectly."
+"C<make install> no longer installs OCaml F<bindtests.*> files incorrectly."
 msgstr ""
 
 #. type: textblock
@@ -18733,28 +18765,28 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:293
 msgid ""
-"The C<configure.ac> file has been split into several smaller files called "
-"C<m4/guestfs_*.m4>."
+"The huge F<configure.ac> file has been split into several smaller files "
+"called F<m4/guestfs_*.m4>."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:296
 msgid ""
-"The old C<tests/data> and C<tests/guests> directories have been moved to "
-"C<test-data/>.  This new top level directory carries all test data which is "
+"The old F<tests/data> and F<tests/guests> directories have been moved to "
+"F<test-data/>.  This new top level directory carries all test data which is "
 "common, large and/or shared between multiple tests."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:300
 msgid ""
-"There is a new top level C<website/> directory containing the public "
+"There is a new top level F<website/> directory containing the public "
 "L<http://libguestfs.org> website (or most of it)."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:303
-msgid "The fuzz testing of inspection (C<tests/fuzz>) has been removed."
+msgid "The fuzz testing of inspection (F<tests/fuzz>) has been removed."
 msgstr ""
 
 #. type: textblock

po-docs/tg.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.31.29\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2016-01-06 10:49+0000\n"
+"POT-Creation-Date: 2016-01-06 11:32+0000\n"
 "PO-Revision-Date: 2014-10-18 04:01-0400\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Tajik (http://www.transifex.com/projects/p/libguestfs/"
@@ -1153,18 +1153,20 @@ msgstr ""
 #: ../docs/guestfs-hacking.pod:692 ../docs/guestfs-hacking.pod:696
 #: ../docs/guestfs-hacking.pod:700 ../docs/guestfs-hacking.pod:714
 #: ../docs/guestfs-hacking.pod:718 ../docs/guestfs-hacking.pod:723
-#: ../docs/guestfs-hacking.pod:727 ../docs/guestfs-performance.pod:105
-#: ../docs/guestfs-performance.pod:111 ../docs/guestfs-performance.pod:116
-#: ../docs/guestfs-performance.pod:243 ../docs/guestfs-performance.pod:248
-#: ../docs/guestfs-performance.pod:253 ../docs/guestfs-performance.pod:373
-#: ../docs/guestfs-performance.pod:377 ../docs/guestfs-performance.pod:383
-#: ../docs/guestfs-performance.pod:389 ../docs/guestfs-recipes.pod:229
-#: ../docs/guestfs-recipes.pod:233 ../docs/guestfs-recipes.pod:237
-#: ../docs/guestfs-recipes.pod:263 ../docs/guestfs-recipes.pod:268
-#: ../docs/guestfs-recipes.pod:375 ../docs/guestfs-recipes.pod:379
-#: ../docs/guestfs-recipes.pod:383 ../docs/guestfs-recipes.pod:387
-#: ../docs/guestfs-recipes.pod:391 ../docs/guestfs-release-notes.pod:144
-#: ../docs/guestfs-release-notes.pod:149 ../docs/guestfs-release-notes.pod:2045
+#: ../docs/guestfs-hacking.pod:727 ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:746 ../docs/guestfs-hacking.pod:750
+#: ../docs/guestfs-performance.pod:105 ../docs/guestfs-performance.pod:111
+#: ../docs/guestfs-performance.pod:116 ../docs/guestfs-performance.pod:243
+#: ../docs/guestfs-performance.pod:248 ../docs/guestfs-performance.pod:253
+#: ../docs/guestfs-performance.pod:373 ../docs/guestfs-performance.pod:377
+#: ../docs/guestfs-performance.pod:383 ../docs/guestfs-performance.pod:389
+#: ../docs/guestfs-recipes.pod:229 ../docs/guestfs-recipes.pod:233
+#: ../docs/guestfs-recipes.pod:237 ../docs/guestfs-recipes.pod:263
+#: ../docs/guestfs-recipes.pod:268 ../docs/guestfs-recipes.pod:375
+#: ../docs/guestfs-recipes.pod:379 ../docs/guestfs-recipes.pod:383
+#: ../docs/guestfs-recipes.pod:387 ../docs/guestfs-recipes.pod:391
+#: ../docs/guestfs-release-notes.pod:144 ../docs/guestfs-release-notes.pod:149
+#: ../docs/guestfs-release-notes.pod:2045
 #: ../docs/guestfs-release-notes.pod:2050
 #: ../docs/guestfs-release-notes.pod:2521
 #: ../docs/guestfs-release-notes.pod:2525
@@ -1351,7 +1353,7 @@ msgstr ""
 #: ../cat/virt-log.pod:135 ../cat/virt-ls.pod:518
 #: ../customize/virt-customize.pod:252 ../daemon/guestfsd.pod:143
 #: ../df/virt-df.pod:256 ../dib/virt-dib.pod:645 ../diff/virt-diff.pod:248
-#: ../docs/guestfs-faq.pod:1372 ../docs/guestfs-hacking.pod:738
+#: ../docs/guestfs-faq.pod:1372 ../docs/guestfs-hacking.pod:757
 #: ../docs/guestfs-internals.pod:400 ../docs/guestfs-performance.pod:567
 #: ../docs/guestfs-recipes.pod:668 ../docs/guestfs-release-notes.pod:4813
 #: ../docs/guestfs-security.pod:324 ../docs/guestfs-testing.pod:384
@@ -1427,7 +1429,7 @@ msgstr ""
 #: ../cat/virt-log.pod:149 ../cat/virt-ls.pod:532
 #: ../customize/virt-customize.pod:273 ../daemon/guestfsd.pod:152
 #: ../df/virt-df.pod:268 ../dib/virt-dib.pod:656 ../diff/virt-diff.pod:262
-#: ../docs/guestfs-faq.pod:1382 ../docs/guestfs-hacking.pod:754
+#: ../docs/guestfs-faq.pod:1382 ../docs/guestfs-hacking.pod:773
 #: ../docs/guestfs-internals.pod:413 ../docs/guestfs-performance.pod:584
 #: ../docs/guestfs-recipes.pod:687 ../docs/guestfs-release-notes.pod:4828
 #: ../docs/guestfs-security.pod:336 ../docs/guestfs-testing.pod:395
@@ -1720,7 +1722,7 @@ msgstr ""
 #. type: =head1
 #: ../appliance/libguestfs-make-fixed-appliance.pod:148
 #: ../customize/virt-customize.pod:269 ../docs/guestfs-faq.pod:1378
-#: ../docs/guestfs-hacking.pod:750 ../docs/guestfs-internals.pod:409
+#: ../docs/guestfs-hacking.pod:769 ../docs/guestfs-internals.pod:409
 #: ../docs/guestfs-performance.pod:580 ../docs/guestfs-recipes.pod:683
 #: ../docs/guestfs-security.pod:332 ../docs/guestfs-testing.pod:391
 #: ../erlang/examples/guestfs-erlang.pod:110
@@ -1743,7 +1745,7 @@ msgstr "МУАЛЛИФ"
 
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:150
-#: ../docs/guestfs-faq.pod:1380 ../docs/guestfs-hacking.pod:752
+#: ../docs/guestfs-faq.pod:1380 ../docs/guestfs-hacking.pod:771
 #: ../docs/guestfs-internals.pod:411 ../docs/guestfs-performance.pod:582
 #: ../docs/guestfs-recipes.pod:685 ../docs/guestfs-security.pod:334
 #: ../docs/guestfs-testing.pod:393 ../erlang/examples/guestfs-erlang.pod:112
@@ -1763,7 +1765,7 @@ msgstr ""
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:154 ../cat/virt-ls.pod:534
 #: ../daemon/guestfsd.pod:154 ../df/virt-df.pod:270 ../diff/virt-diff.pod:264
-#: ../docs/guestfs-hacking.pod:756 ../docs/guestfs-internals.pod:415
+#: ../docs/guestfs-hacking.pod:775 ../docs/guestfs-internals.pod:415
 #: ../docs/guestfs-recipes.pod:689 ../docs/guestfs-release-notes.pod:4830
 #: ../docs/guestfs-security.pod:338 ../edit/virt-edit.pod:406
 #: ../fish/guestfish.pod:1636 ../fuse/guestmount.pod:448
@@ -14848,22 +14850,52 @@ msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-hacking.pod:729
-msgid "Create the branch in git:"
+msgid ""
+"Set the version (in F<configure.ac>) to the new I<stable> version, ie. 1."
+"XX.0, and commit it:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:731
+#: ../docs/guestfs-hacking.pod:732
 #, no-wrap
 msgid ""
-" git tag -a 1.XX.0 -m \"Version 1.XX.0 (stable)\"\n"
-" git tag -a 1.YY.0 -m \"Version 1.YY.0 (development)\"\n"
-" git branch stable-1.XX\n"
-" git push origin tag 1.XX.0 1.YY.0 stable-1.XX\n"
+" ./localconfigure\n"
+" make distclean -k\n"
+" ./localconfigure\n"
+" make && make dist\n"
+" make maintainer-commit\n"
+" make maintainer-tag\n"
 "\n"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:740
+#: ../docs/guestfs-hacking.pod:741
+msgid "Create the stable branch in git:"
+msgstr ""
+
+#. type: verbatim
+#: ../docs/guestfs-hacking.pod:743
+#, no-wrap
+msgid ""
+" git branch stable-1.XX\n"
+" git push origin tag stable-1.XX\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:748
+msgid "Do a full release of the stable branch."
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:752
+msgid ""
+"Set the version to the next development version and commit that.  Optionally "
+"do a full release of the development branch."
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:759
 msgid ""
 "L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-internals(3)>, L<guestfs-"
 "performance(1)>, L<guestfs-release-notes(1)>, L<guestfs-testing(1)>, "
@@ -18148,7 +18180,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:30
 msgid ""
-"The new L<virt-v2v-copy-to-local(1)> tool is an auxiliary tool for L<virt-"
+"The new L<virt-v2v-copy-to-local(1)> tool is an ancillary tool for L<virt-"
 "v2v(1)> allowing you to convert source guests that virt-v2v is unable to "
 "access directly."
 msgstr ""
@@ -18210,13 +18242,13 @@ msgstr ""
 msgid ""
 "Virt-builder will now correctly handle output filenames containing colon "
 "characters (C<:>), and will create temporary files in the libguestfs cache "
-"directory instead of defaulting to C</tmp> (Pino Toscano)."
+"directory instead of defaulting to F</tmp> (Pino Toscano)."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:61
 msgid ""
-"Virt-builder has a new I<--unknown-filesystems> option to control what to do "
+"Virt-resize has a new I<--unknown-filesystems> option to control what to do "
 "when asked to resize a filesystem that libguestfs doesn't know how to resize."
 msgstr ""
 
@@ -18320,7 +18352,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:111
 msgid ""
-"If it exists, C</etc/os-release> will be preferred for inspecting Linux "
+"If it exists, F</etc/os-release> will be preferred for inspecting Linux "
 "guests (Pino Toscano)."
 msgstr ""
 
@@ -18339,7 +18371,7 @@ msgstr ""
 msgid ""
 "The large L<guestfs(3)> man page has been split into several separate man "
 "pages: L<guestfs-hacking(1)> L<guestfs-internals(1)> L<guestfs-"
-"security(1)>.  In the source tree, a new C<docs> directory contains this "
+"security(1)>.  In the source tree, a new F<docs> directory contains this "
 "documentation."
 msgstr ""
 
@@ -18416,7 +18448,7 @@ msgstr ""
 
 #. type: =item
 #: ../docs/guestfs-release-notes.pod:158
-msgid "Virt-customize permissions on C<.ssh>, C<.ssh/authorized_keys>"
+msgid "Virt-customize permissions on F<.ssh>, F<.ssh/authorized_keys>"
 msgstr ""
 
 #. type: textblock
@@ -18428,7 +18460,7 @@ msgstr ""
 #: ../docs/guestfs-release-notes.pod:162
 msgid ""
 "Previously when asked to inject an SSH key into a guest, virt-customize "
-"(hence virt-builder too) would create the C<.ssh> directory and C<.ssh/"
+"(hence virt-builder too) would create the F<.ssh> directory and F<.ssh/"
 "authorized_keys> file with too broad permissions, allowing other users to "
 "read.  They are now created as C<0700> and C<0600> respectively, which is "
 "the same as the L<ssh-copy-id(1)> utility."
@@ -18636,7 +18668,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:251
 msgid ""
-"C<make install> no longer installs OCaml C<bindtests.*> files incorrectly."
+"C<make install> no longer installs OCaml F<bindtests.*> files incorrectly."
 msgstr ""
 
 #. type: textblock
@@ -18740,28 +18772,28 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:293
 msgid ""
-"The C<configure.ac> file has been split into several smaller files called "
-"C<m4/guestfs_*.m4>."
+"The huge F<configure.ac> file has been split into several smaller files "
+"called F<m4/guestfs_*.m4>."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:296
 msgid ""
-"The old C<tests/data> and C<tests/guests> directories have been moved to "
-"C<test-data/>.  This new top level directory carries all test data which is "
+"The old F<tests/data> and F<tests/guests> directories have been moved to "
+"F<test-data/>.  This new top level directory carries all test data which is "
 "common, large and/or shared between multiple tests."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:300
 msgid ""
-"There is a new top level C<website/> directory containing the public "
+"There is a new top level F<website/> directory containing the public "
 "L<http://libguestfs.org> website (or most of it)."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:303
-msgid "The fuzz testing of inspection (C<tests/fuzz>) has been removed."
+msgid "The fuzz testing of inspection (F<tests/fuzz>) has been removed."
 msgstr ""
 
 #. type: textblock

po-docs/uk.po

@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.31.29\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2016-01-06 10:49+0000\n"
+"POT-Creation-Date: 2016-01-06 11:32+0000\n"
 "PO-Revision-Date: 2015-03-20 01:39-0400\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -1306,18 +1306,20 @@ msgstr "Ця програма повертає:"
 #: ../docs/guestfs-hacking.pod:692 ../docs/guestfs-hacking.pod:696
 #: ../docs/guestfs-hacking.pod:700 ../docs/guestfs-hacking.pod:714
 #: ../docs/guestfs-hacking.pod:718 ../docs/guestfs-hacking.pod:723
-#: ../docs/guestfs-hacking.pod:727 ../docs/guestfs-performance.pod:105
-#: ../docs/guestfs-performance.pod:111 ../docs/guestfs-performance.pod:116
-#: ../docs/guestfs-performance.pod:243 ../docs/guestfs-performance.pod:248
-#: ../docs/guestfs-performance.pod:253 ../docs/guestfs-performance.pod:373
-#: ../docs/guestfs-performance.pod:377 ../docs/guestfs-performance.pod:383
-#: ../docs/guestfs-performance.pod:389 ../docs/guestfs-recipes.pod:229
-#: ../docs/guestfs-recipes.pod:233 ../docs/guestfs-recipes.pod:237
-#: ../docs/guestfs-recipes.pod:263 ../docs/guestfs-recipes.pod:268
-#: ../docs/guestfs-recipes.pod:375 ../docs/guestfs-recipes.pod:379
-#: ../docs/guestfs-recipes.pod:383 ../docs/guestfs-recipes.pod:387
-#: ../docs/guestfs-recipes.pod:391 ../docs/guestfs-release-notes.pod:144
-#: ../docs/guestfs-release-notes.pod:149 ../docs/guestfs-release-notes.pod:2045
+#: ../docs/guestfs-hacking.pod:727 ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:746 ../docs/guestfs-hacking.pod:750
+#: ../docs/guestfs-performance.pod:105 ../docs/guestfs-performance.pod:111
+#: ../docs/guestfs-performance.pod:116 ../docs/guestfs-performance.pod:243
+#: ../docs/guestfs-performance.pod:248 ../docs/guestfs-performance.pod:253
+#: ../docs/guestfs-performance.pod:373 ../docs/guestfs-performance.pod:377
+#: ../docs/guestfs-performance.pod:383 ../docs/guestfs-performance.pod:389
+#: ../docs/guestfs-recipes.pod:229 ../docs/guestfs-recipes.pod:233
+#: ../docs/guestfs-recipes.pod:237 ../docs/guestfs-recipes.pod:263
+#: ../docs/guestfs-recipes.pod:268 ../docs/guestfs-recipes.pod:375
+#: ../docs/guestfs-recipes.pod:379 ../docs/guestfs-recipes.pod:383
+#: ../docs/guestfs-recipes.pod:387 ../docs/guestfs-recipes.pod:391
+#: ../docs/guestfs-release-notes.pod:144 ../docs/guestfs-release-notes.pod:149
+#: ../docs/guestfs-release-notes.pod:2045
 #: ../docs/guestfs-release-notes.pod:2050
 #: ../docs/guestfs-release-notes.pod:2521
 #: ../docs/guestfs-release-notes.pod:2525
@@ -1506,7 +1508,7 @@ msgstr ""
 #: ../cat/virt-log.pod:135 ../cat/virt-ls.pod:518
 #: ../customize/virt-customize.pod:252 ../daemon/guestfsd.pod:143
 #: ../df/virt-df.pod:256 ../dib/virt-dib.pod:645 ../diff/virt-diff.pod:248
-#: ../docs/guestfs-faq.pod:1372 ../docs/guestfs-hacking.pod:738
+#: ../docs/guestfs-faq.pod:1372 ../docs/guestfs-hacking.pod:757
 #: ../docs/guestfs-internals.pod:400 ../docs/guestfs-performance.pod:567
 #: ../docs/guestfs-recipes.pod:668 ../docs/guestfs-release-notes.pod:4813
 #: ../docs/guestfs-security.pod:324 ../docs/guestfs-testing.pod:384
@@ -1584,7 +1586,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
 #: ../cat/virt-log.pod:149 ../cat/virt-ls.pod:532
 #: ../customize/virt-customize.pod:273 ../daemon/guestfsd.pod:152
 #: ../df/virt-df.pod:268 ../dib/virt-dib.pod:656 ../diff/virt-diff.pod:262
-#: ../docs/guestfs-faq.pod:1382 ../docs/guestfs-hacking.pod:754
+#: ../docs/guestfs-faq.pod:1382 ../docs/guestfs-hacking.pod:773
 #: ../docs/guestfs-internals.pod:413 ../docs/guestfs-performance.pod:584
 #: ../docs/guestfs-recipes.pod:687 ../docs/guestfs-release-notes.pod:4828
 #: ../docs/guestfs-security.pod:336 ../docs/guestfs-testing.pod:395
@@ -1903,7 +1905,7 @@ msgstr ""
 #. type: =head1
 #: ../appliance/libguestfs-make-fixed-appliance.pod:148
 #: ../customize/virt-customize.pod:269 ../docs/guestfs-faq.pod:1378
-#: ../docs/guestfs-hacking.pod:750 ../docs/guestfs-internals.pod:409
+#: ../docs/guestfs-hacking.pod:769 ../docs/guestfs-internals.pod:409
 #: ../docs/guestfs-performance.pod:580 ../docs/guestfs-recipes.pod:683
 #: ../docs/guestfs-security.pod:332 ../docs/guestfs-testing.pod:391
 #: ../erlang/examples/guestfs-erlang.pod:110
@@ -1926,7 +1928,7 @@ msgstr "АВТОРИ"
 
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:150
-#: ../docs/guestfs-faq.pod:1380 ../docs/guestfs-hacking.pod:752
+#: ../docs/guestfs-faq.pod:1380 ../docs/guestfs-hacking.pod:771
 #: ../docs/guestfs-internals.pod:411 ../docs/guestfs-performance.pod:582
 #: ../docs/guestfs-recipes.pod:685 ../docs/guestfs-security.pod:334
 #: ../docs/guestfs-testing.pod:393 ../erlang/examples/guestfs-erlang.pod:112
@@ -1946,7 +1948,7 @@ msgstr "Richard W.M. Jones (C<rjones at redhat dot com>)"
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:154 ../cat/virt-ls.pod:534
 #: ../daemon/guestfsd.pod:154 ../df/virt-df.pod:270 ../diff/virt-diff.pod:264
-#: ../docs/guestfs-hacking.pod:756 ../docs/guestfs-internals.pod:415
+#: ../docs/guestfs-hacking.pod:775 ../docs/guestfs-internals.pod:415
 #: ../docs/guestfs-recipes.pod:689 ../docs/guestfs-release-notes.pod:4830
 #: ../docs/guestfs-security.pod:338 ../edit/virt-edit.pod:406
 #: ../fish/guestfish.pod:1636 ../fuse/guestmount.pod:448
@@ -15670,27 +15672,54 @@ msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-hacking.pod:729
-msgid "Create the branch in git:"
+msgid ""
+"Set the version (in F<configure.ac>) to the new I<stable> version, ie. 1."
+"XX.0, and commit it:"
+msgstr ""
+
+#. type: verbatim
+#: ../docs/guestfs-hacking.pod:732
+#, no-wrap
+msgid ""
+" ./localconfigure\n"
+" make distclean -k\n"
+" ./localconfigure\n"
+" make && make dist\n"
+" make maintainer-commit\n"
+" make maintainer-tag\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:741
+#, fuzzy
+#| msgid "Create the branch in git:"
+msgid "Create the stable branch in git:"
 msgstr "Створення гілки у git:"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:731
+#: ../docs/guestfs-hacking.pod:743
 #, no-wrap
 msgid ""
-" git tag -a 1.XX.0 -m \"Version 1.XX.0 (stable)\"\n"
-" git tag -a 1.YY.0 -m \"Version 1.YY.0 (development)\"\n"
 " git branch stable-1.XX\n"
-" git push origin tag 1.XX.0 1.YY.0 stable-1.XX\n"
+" git push origin tag stable-1.XX\n"
 "\n"
 msgstr ""
-" git tag -a 1.XX.0 -m \"Version 1.XX.0 (stable)\"\n"
-" git tag -a 1.YY.0 -m \"Version 1.YY.0 (development)\"\n"
-" git branch stable-1.XX\n"
-" git push origin tag 1.XX.0 1.YY.0 stable-1.XX\n"
-"\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:740
+#: ../docs/guestfs-hacking.pod:748
+msgid "Do a full release of the stable branch."
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:752
+msgid ""
+"Set the version to the next development version and commit that.  Optionally "
+"do a full release of the development branch."
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:759
 msgid ""
 "L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-internals(3)>, L<guestfs-"
 "performance(1)>, L<guestfs-release-notes(1)>, L<guestfs-testing(1)>, "
@@ -19212,7 +19241,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:30
 msgid ""
-"The new L<virt-v2v-copy-to-local(1)> tool is an auxiliary tool for L<virt-"
+"The new L<virt-v2v-copy-to-local(1)> tool is an ancillary tool for L<virt-"
 "v2v(1)> allowing you to convert source guests that virt-v2v is unable to "
 "access directly."
 msgstr ""
@@ -19274,13 +19303,13 @@ msgstr ""
 msgid ""
 "Virt-builder will now correctly handle output filenames containing colon "
 "characters (C<:>), and will create temporary files in the libguestfs cache "
-"directory instead of defaulting to C</tmp> (Pino Toscano)."
+"directory instead of defaulting to F</tmp> (Pino Toscano)."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:61
 msgid ""
-"Virt-builder has a new I<--unknown-filesystems> option to control what to do "
+"Virt-resize has a new I<--unknown-filesystems> option to control what to do "
 "when asked to resize a filesystem that libguestfs doesn't know how to resize."
 msgstr ""
 
@@ -19384,7 +19413,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:111
 msgid ""
-"If it exists, C</etc/os-release> will be preferred for inspecting Linux "
+"If it exists, F</etc/os-release> will be preferred for inspecting Linux "
 "guests (Pino Toscano)."
 msgstr ""
 
@@ -19405,7 +19434,7 @@ msgstr "mount-options"
 msgid ""
 "The large L<guestfs(3)> man page has been split into several separate man "
 "pages: L<guestfs-hacking(1)> L<guestfs-internals(1)> L<guestfs-"
-"security(1)>.  In the source tree, a new C<docs> directory contains this "
+"security(1)>.  In the source tree, a new F<docs> directory contains this "
 "documentation."
 msgstr ""
 
@@ -19490,7 +19519,7 @@ msgstr ""
 #: ../docs/guestfs-release-notes.pod:158
 #, fuzzy
 #| msgid "Permissions of F<.ssh> and F<.ssh/authorized_keys>"
-msgid "Virt-customize permissions on C<.ssh>, C<.ssh/authorized_keys>"
+msgid "Virt-customize permissions on F<.ssh>, F<.ssh/authorized_keys>"
 msgstr "Права доступу до F<.ssh> і F<.ssh/authorized_keys>"
 
 #. type: textblock
@@ -19504,7 +19533,7 @@ msgstr "L<https://bugzilla.redhat.com/1260778>"
 #: ../docs/guestfs-release-notes.pod:162
 msgid ""
 "Previously when asked to inject an SSH key into a guest, virt-customize "
-"(hence virt-builder too) would create the C<.ssh> directory and C<.ssh/"
+"(hence virt-builder too) would create the F<.ssh> directory and F<.ssh/"
 "authorized_keys> file with too broad permissions, allowing other users to "
 "read.  They are now created as C<0700> and C<0600> respectively, which is "
 "the same as the L<ssh-copy-id(1)> utility."
@@ -19734,7 +19763,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:251
 msgid ""
-"C<make install> no longer installs OCaml C<bindtests.*> files incorrectly."
+"C<make install> no longer installs OCaml F<bindtests.*> files incorrectly."
 msgstr ""
 
 #. type: textblock
@@ -19838,28 +19867,28 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:293
 msgid ""
-"The C<configure.ac> file has been split into several smaller files called "
-"C<m4/guestfs_*.m4>."
+"The huge F<configure.ac> file has been split into several smaller files "
+"called F<m4/guestfs_*.m4>."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:296
 msgid ""
-"The old C<tests/data> and C<tests/guests> directories have been moved to "
-"C<test-data/>.  This new top level directory carries all test data which is "
+"The old F<tests/data> and F<tests/guests> directories have been moved to "
+"F<test-data/>.  This new top level directory carries all test data which is "
 "common, large and/or shared between multiple tests."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:300
 msgid ""
-"There is a new top level C<website/> directory containing the public "
+"There is a new top level F<website/> directory containing the public "
 "L<http://libguestfs.org> website (or most of it)."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:303
-msgid "The fuzz testing of inspection (C<tests/fuzz>) has been removed."
+msgid "The fuzz testing of inspection (F<tests/fuzz>) has been removed."
 msgstr ""
 
 #. type: textblock
@@ -102438,5 +102467,18 @@ msgstr ""
 msgid "Shahar Havivi"
 msgstr "Shahar Havivi"
 
+#~ msgid ""
+#~ " git tag -a 1.XX.0 -m \"Version 1.XX.0 (stable)\"\n"
+#~ " git tag -a 1.YY.0 -m \"Version 1.YY.0 (development)\"\n"
+#~ " git branch stable-1.XX\n"
+#~ " git push origin tag 1.XX.0 1.YY.0 stable-1.XX\n"
+#~ "\n"
+#~ msgstr ""
+#~ " git tag -a 1.XX.0 -m \"Version 1.XX.0 (stable)\"\n"
+#~ " git tag -a 1.YY.0 -m \"Version 1.YY.0 (development)\"\n"
+#~ " git branch stable-1.XX\n"
+#~ " git push origin tag 1.XX.0 1.YY.0 stable-1.XX\n"
+#~ "\n"
+
 #~ msgid "Copyright (C) 2010-2015 Red Hat Inc."
 #~ msgstr "© Red Hat Inc., 2010–2015"

po-docs/zh_CN.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.31.29\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2016-01-06 10:49+0000\n"
+"POT-Creation-Date: 2016-01-06 11:32+0000\n"
 "PO-Revision-Date: 2014-10-18 04:01-0400\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/"
@@ -1154,18 +1154,20 @@ msgstr ""
 #: ../docs/guestfs-hacking.pod:692 ../docs/guestfs-hacking.pod:696
 #: ../docs/guestfs-hacking.pod:700 ../docs/guestfs-hacking.pod:714
 #: ../docs/guestfs-hacking.pod:718 ../docs/guestfs-hacking.pod:723
-#: ../docs/guestfs-hacking.pod:727 ../docs/guestfs-performance.pod:105
-#: ../docs/guestfs-performance.pod:111 ../docs/guestfs-performance.pod:116
-#: ../docs/guestfs-performance.pod:243 ../docs/guestfs-performance.pod:248
-#: ../docs/guestfs-performance.pod:253 ../docs/guestfs-performance.pod:373
-#: ../docs/guestfs-performance.pod:377 ../docs/guestfs-performance.pod:383
-#: ../docs/guestfs-performance.pod:389 ../docs/guestfs-recipes.pod:229
-#: ../docs/guestfs-recipes.pod:233 ../docs/guestfs-recipes.pod:237
-#: ../docs/guestfs-recipes.pod:263 ../docs/guestfs-recipes.pod:268
-#: ../docs/guestfs-recipes.pod:375 ../docs/guestfs-recipes.pod:379
-#: ../docs/guestfs-recipes.pod:383 ../docs/guestfs-recipes.pod:387
-#: ../docs/guestfs-recipes.pod:391 ../docs/guestfs-release-notes.pod:144
-#: ../docs/guestfs-release-notes.pod:149 ../docs/guestfs-release-notes.pod:2045
+#: ../docs/guestfs-hacking.pod:727 ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:746 ../docs/guestfs-hacking.pod:750
+#: ../docs/guestfs-performance.pod:105 ../docs/guestfs-performance.pod:111
+#: ../docs/guestfs-performance.pod:116 ../docs/guestfs-performance.pod:243
+#: ../docs/guestfs-performance.pod:248 ../docs/guestfs-performance.pod:253
+#: ../docs/guestfs-performance.pod:373 ../docs/guestfs-performance.pod:377
+#: ../docs/guestfs-performance.pod:383 ../docs/guestfs-performance.pod:389
+#: ../docs/guestfs-recipes.pod:229 ../docs/guestfs-recipes.pod:233
+#: ../docs/guestfs-recipes.pod:237 ../docs/guestfs-recipes.pod:263
+#: ../docs/guestfs-recipes.pod:268 ../docs/guestfs-recipes.pod:375
+#: ../docs/guestfs-recipes.pod:379 ../docs/guestfs-recipes.pod:383
+#: ../docs/guestfs-recipes.pod:387 ../docs/guestfs-recipes.pod:391
+#: ../docs/guestfs-release-notes.pod:144 ../docs/guestfs-release-notes.pod:149
+#: ../docs/guestfs-release-notes.pod:2045
 #: ../docs/guestfs-release-notes.pod:2050
 #: ../docs/guestfs-release-notes.pod:2521
 #: ../docs/guestfs-release-notes.pod:2525
@@ -1352,7 +1354,7 @@ msgstr ""
 #: ../cat/virt-log.pod:135 ../cat/virt-ls.pod:518
 #: ../customize/virt-customize.pod:252 ../daemon/guestfsd.pod:143
 #: ../df/virt-df.pod:256 ../dib/virt-dib.pod:645 ../diff/virt-diff.pod:248
-#: ../docs/guestfs-faq.pod:1372 ../docs/guestfs-hacking.pod:738
+#: ../docs/guestfs-faq.pod:1372 ../docs/guestfs-hacking.pod:757
 #: ../docs/guestfs-internals.pod:400 ../docs/guestfs-performance.pod:567
 #: ../docs/guestfs-recipes.pod:668 ../docs/guestfs-release-notes.pod:4813
 #: ../docs/guestfs-security.pod:324 ../docs/guestfs-testing.pod:384
@@ -1428,7 +1430,7 @@ msgstr ""
 #: ../cat/virt-log.pod:149 ../cat/virt-ls.pod:532
 #: ../customize/virt-customize.pod:273 ../daemon/guestfsd.pod:152
 #: ../df/virt-df.pod:268 ../dib/virt-dib.pod:656 ../diff/virt-diff.pod:262
-#: ../docs/guestfs-faq.pod:1382 ../docs/guestfs-hacking.pod:754
+#: ../docs/guestfs-faq.pod:1382 ../docs/guestfs-hacking.pod:773
 #: ../docs/guestfs-internals.pod:413 ../docs/guestfs-performance.pod:584
 #: ../docs/guestfs-recipes.pod:687 ../docs/guestfs-release-notes.pod:4828
 #: ../docs/guestfs-security.pod:336 ../docs/guestfs-testing.pod:395
@@ -1721,7 +1723,7 @@ msgstr ""
 #. type: =head1
 #: ../appliance/libguestfs-make-fixed-appliance.pod:148
 #: ../customize/virt-customize.pod:269 ../docs/guestfs-faq.pod:1378
-#: ../docs/guestfs-hacking.pod:750 ../docs/guestfs-internals.pod:409
+#: ../docs/guestfs-hacking.pod:769 ../docs/guestfs-internals.pod:409
 #: ../docs/guestfs-performance.pod:580 ../docs/guestfs-recipes.pod:683
 #: ../docs/guestfs-security.pod:332 ../docs/guestfs-testing.pod:391
 #: ../erlang/examples/guestfs-erlang.pod:110
@@ -1744,7 +1746,7 @@ msgstr ""
 
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:150
-#: ../docs/guestfs-faq.pod:1380 ../docs/guestfs-hacking.pod:752
+#: ../docs/guestfs-faq.pod:1380 ../docs/guestfs-hacking.pod:771
 #: ../docs/guestfs-internals.pod:411 ../docs/guestfs-performance.pod:582
 #: ../docs/guestfs-recipes.pod:685 ../docs/guestfs-security.pod:334
 #: ../docs/guestfs-testing.pod:393 ../erlang/examples/guestfs-erlang.pod:112
@@ -1764,7 +1766,7 @@ msgstr ""
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:154 ../cat/virt-ls.pod:534
 #: ../daemon/guestfsd.pod:154 ../df/virt-df.pod:270 ../diff/virt-diff.pod:264
-#: ../docs/guestfs-hacking.pod:756 ../docs/guestfs-internals.pod:415
+#: ../docs/guestfs-hacking.pod:775 ../docs/guestfs-internals.pod:415
 #: ../docs/guestfs-recipes.pod:689 ../docs/guestfs-release-notes.pod:4830
 #: ../docs/guestfs-security.pod:338 ../edit/virt-edit.pod:406
 #: ../fish/guestfish.pod:1636 ../fuse/guestmount.pod:448
@@ -14849,22 +14851,52 @@ msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-hacking.pod:729
-msgid "Create the branch in git:"
+msgid ""
+"Set the version (in F<configure.ac>) to the new I<stable> version, ie. 1."
+"XX.0, and commit it:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:731
+#: ../docs/guestfs-hacking.pod:732
 #, no-wrap
 msgid ""
-" git tag -a 1.XX.0 -m \"Version 1.XX.0 (stable)\"\n"
-" git tag -a 1.YY.0 -m \"Version 1.YY.0 (development)\"\n"
-" git branch stable-1.XX\n"
-" git push origin tag 1.XX.0 1.YY.0 stable-1.XX\n"
+" ./localconfigure\n"
+" make distclean -k\n"
+" ./localconfigure\n"
+" make && make dist\n"
+" make maintainer-commit\n"
+" make maintainer-tag\n"
 "\n"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:740
+#: ../docs/guestfs-hacking.pod:741
+msgid "Create the stable branch in git:"
+msgstr ""
+
+#. type: verbatim
+#: ../docs/guestfs-hacking.pod:743
+#, no-wrap
+msgid ""
+" git branch stable-1.XX\n"
+" git push origin tag stable-1.XX\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:748
+msgid "Do a full release of the stable branch."
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:752
+msgid ""
+"Set the version to the next development version and commit that.  Optionally "
+"do a full release of the development branch."
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:759
 msgid ""
 "L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-internals(3)>, L<guestfs-"
 "performance(1)>, L<guestfs-release-notes(1)>, L<guestfs-testing(1)>, "
@@ -18149,7 +18181,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:30
 msgid ""
-"The new L<virt-v2v-copy-to-local(1)> tool is an auxiliary tool for L<virt-"
+"The new L<virt-v2v-copy-to-local(1)> tool is an ancillary tool for L<virt-"
 "v2v(1)> allowing you to convert source guests that virt-v2v is unable to "
 "access directly."
 msgstr ""
@@ -18211,13 +18243,13 @@ msgstr ""
 msgid ""
 "Virt-builder will now correctly handle output filenames containing colon "
 "characters (C<:>), and will create temporary files in the libguestfs cache "
-"directory instead of defaulting to C</tmp> (Pino Toscano)."
+"directory instead of defaulting to F</tmp> (Pino Toscano)."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:61
 msgid ""
-"Virt-builder has a new I<--unknown-filesystems> option to control what to do "
+"Virt-resize has a new I<--unknown-filesystems> option to control what to do "
 "when asked to resize a filesystem that libguestfs doesn't know how to resize."
 msgstr ""
 
@@ -18321,7 +18353,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:111
 msgid ""
-"If it exists, C</etc/os-release> will be preferred for inspecting Linux "
+"If it exists, F</etc/os-release> will be preferred for inspecting Linux "
 "guests (Pino Toscano)."
 msgstr ""
 
@@ -18340,7 +18372,7 @@ msgstr ""
 msgid ""
 "The large L<guestfs(3)> man page has been split into several separate man "
 "pages: L<guestfs-hacking(1)> L<guestfs-internals(1)> L<guestfs-"
-"security(1)>.  In the source tree, a new C<docs> directory contains this "
+"security(1)>.  In the source tree, a new F<docs> directory contains this "
 "documentation."
 msgstr ""
 
@@ -18417,7 +18449,7 @@ msgstr ""
 
 #. type: =item
 #: ../docs/guestfs-release-notes.pod:158
-msgid "Virt-customize permissions on C<.ssh>, C<.ssh/authorized_keys>"
+msgid "Virt-customize permissions on F<.ssh>, F<.ssh/authorized_keys>"
 msgstr ""
 
 #. type: textblock
@@ -18429,7 +18461,7 @@ msgstr ""
 #: ../docs/guestfs-release-notes.pod:162
 msgid ""
 "Previously when asked to inject an SSH key into a guest, virt-customize "
-"(hence virt-builder too) would create the C<.ssh> directory and C<.ssh/"
+"(hence virt-builder too) would create the F<.ssh> directory and F<.ssh/"
 "authorized_keys> file with too broad permissions, allowing other users to "
 "read.  They are now created as C<0700> and C<0600> respectively, which is "
 "the same as the L<ssh-copy-id(1)> utility."
@@ -18635,7 +18667,7 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:251
 msgid ""
-"C<make install> no longer installs OCaml C<bindtests.*> files incorrectly."
+"C<make install> no longer installs OCaml F<bindtests.*> files incorrectly."
 msgstr ""
 
 #. type: textblock
@@ -18739,28 +18771,28 @@ msgstr ""
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:293
 msgid ""
-"The C<configure.ac> file has been split into several smaller files called "
-"C<m4/guestfs_*.m4>."
+"The huge F<configure.ac> file has been split into several smaller files "
+"called F<m4/guestfs_*.m4>."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:296
 msgid ""
-"The old C<tests/data> and C<tests/guests> directories have been moved to "
-"C<test-data/>.  This new top level directory carries all test data which is "
+"The old F<tests/data> and F<tests/guests> directories have been moved to "
+"F<test-data/>.  This new top level directory carries all test data which is "
 "common, large and/or shared between multiple tests."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:300
 msgid ""
-"There is a new top level C<website/> directory containing the public "
+"There is a new top level F<website/> directory containing the public "
 "L<http://libguestfs.org> website (or most of it)."
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-release-notes.pod:303
-msgid "The fuzz testing of inspection (C<tests/fuzz>) has been removed."
+msgid "The fuzz testing of inspection (F<tests/fuzz>) has been removed."
 msgstr ""
 
 #. type: textblock

po/libguestfs.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: libguestfs 1.31.30\n"
+"Project-Id-Version: libguestfs 1.32.0\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2016-01-06 10:49+0000\n"
+"POT-Creation-Date: 2016-01-06 11:32+0000\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"