On Thu, Apr 26, 2012 at 01:53:05PM +0100, Richard W.M. Jones wrote:
 On Thu, Apr 26, 2012 at 01:20:44PM +0100, Matthew Booth wrote:
 > ---
 >  generator/generator_actions.ml |    2 +-
 >  1 file changed, 1 insertion(+), 1 deletion(-)
 > 
 > diff --git a/generator/generator_actions.ml b/generator/generator_actions.ml
 > index c237061..a8009f5 100644
 > --- a/generator/generator_actions.ml
 > +++ b/generator/generator_actions.ml
 > @@ -7180,7 +7180,7 @@ which is mounted at C<fs>.");
 >     "set default btrfs subvolume",
 >     "\
 >  Set the subvolume of the btrfs filesystem C<fs> which will
 > -be mounted by default.  See <guestfs_btrfs_subvolume_list> to
 > +be mounted by default.  See L<guestfs_btrfs_subvolume_list> to
 >  get a list of subvolumes.");
 
 No, it should be C<guestfs_...> which is magically rewritten to the
 correct thing by the generator. 
I pushed a corrected fix for this, so it'll conflict with
your patch unless you remove your patch before pulling.
Rich.
-- 
Richard Jones, Virtualization Group, Red Hat 
http://people.redhat.com/~rjones
Read my programming blog: 
http://rwmj.wordpress.com
Fedora now supports 80 OCaml packages (the OPEN alternative to F#)
http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora