From 02b64d5cec1ac0a6f7627d5489996de4474a67f6 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 1 Sep 2025 17:00:16 +0100
Subject: [PATCH] generator: Use quoted string literals in many places

This change was done almost entirely automatically using the script
below.  This uses the OCaml lexer to read the source files and extract
the strings and locations.  Strings which are "candidates" (in this
case, longer than 3 lines) are replaced in the output with quoted
string literals.

Since the OCaml lexer is used, it already substitutes all escape
sequences correctly.  I diffed the output of the generator and it is
identical after this change, except for UUIDs, which change because of
how Utils.stable_uuid is implemented.

Thanks: Nicolas Ojeda Bar

$ ocamlfind opt -package unix,compiler-libs.common find_strings.ml \
                -o find_strings.opt -linkpkg
$ for f in $( git ls-files -- \*.ml ) ; do ./find_strings.opt $f ; done

open Printf

let read_whole_file path =
  let buf = Buffer.create 16384 in
  let chan = open_in path in
  let maxlen = 16384 in
  let b = Bytes.create maxlen in
  let rec loop () =
    let r = input chan b 0 maxlen in
    if r > 0 then (
      Buffer.add_substring buf (Bytes.to_string b) 0 r;
      loop ()
    )
  in
  loop ();
  close_in chan;
  Buffer.contents buf

let count_chars c str =
  let count = ref 0 in
  for i = 0 to String.length str - 1 do
    if c = String.unsafe_get str i then incr count
  done;
  !count

let subs = ref []

let consider_string str loc =
  let nr_lines = count_chars '\n' str in
  if nr_lines > 3 then
    subs := (str, loc) :: !subs

let () =
  Lexer.init ();
  let filename = Sys.argv.(1) in
  let content = read_whole_file filename in
  let lexbuf = Lexing.from_string content in
  let rec loop () =
    let token = Lexer.token lexbuf in
    (match token with
     | Parser.EOF -> ();
     | STRING (s, loc, sopt) ->
        consider_string s loc; (* sopt? *)
        loop ();
     | token ->
        loop ();
    )
  in
  loop ();

  (* The list of subs is already reversed, which is convenient
   * because we must the file substitutions in reverse order.
   *)
  let subs = !subs in
  let new_content = ref content in
  List.iter (
    fun (str, loc) ->
      let { Location.loc_start = { pos_cnum = p1 };
            loc_end = { pos_cnum = p2 } } = loc in
      let len = String.length !new_content in
      let before = String.sub !new_content 0 (p1-1) in
      let after = String.sub !new_content (p2+1) (len - p2 - 1) in
      new_content := before ^ "{|" ^ str ^ "|}" ^ after
  ) subs;

  let new_content = !new_content in

  if content <> new_content then (
    (* Update the file in place. *)
    let new_filename = filename ^ ".new"
    and backup_filename = filename ^ ".bak" in
    let chan = open_out new_filename in
    fprintf chan "%s" new_content;
    close_out chan;
    Unix.rename filename backup_filename;
    Unix.rename new_filename filename
  )
---
 generator/GObject.ml                       |   91 +-
 generator/OCaml.ml                         |   78 +-
 generator/XDR.ml                           |   12 +-
 generator/actions_augeas.ml                |   30 +-
 generator/actions_core.ml                  | 1414 ++++++++------------
 generator/actions_core_deprecated.ml       |  105 +-
 generator/actions_debug.ml                 |   10 +-
 generator/actions_hivex.ml                 |   25 +-
 generator/actions_hivex_deprecated.ml      |    5 +-
 generator/actions_inspection.ml            |  255 ++--
 generator/actions_inspection_deprecated.ml |   30 +-
 generator/actions_internal_tests.ml        |   35 +-
 generator/actions_properties.ml            |  140 +-
 generator/actions_properties_deprecated.ml |   20 +-
 generator/actions_tsk.ml                   |   15 +-
 generator/actions_yara.ml                  |   10 +-
 generator/bindtests.ml                     |   65 +-
 generator/c.ml                             |  198 ++-
 generator/csharp.ml                        |   13 +-
 generator/customize.ml                     |  187 ++-
 generator/daemon.ml                        |   71 +-
 generator/docstrings.ml                    |    8 +-
 generator/erlang.ml                        |   45 +-
 generator/errnostring.ml                   |   43 +-
 generator/fish.ml                          |  107 +-
 generator/fish_commands.ml                 |   68 +-
 generator/golang.ml                        |   29 +-
 generator/haskell.ml                       |   20 +-
 generator/java.ml                          |   48 +-
 generator/lua.ml                           |  137 +-
 generator/perl.ml                          |   75 +-
 generator/php.ml                           |   57 +-
 generator/prepopts.ml                      |   16 +-
 generator/python.ml                        |   97 +-
 generator/ruby.ml                          |   57 +-
 generator/rust.ml                          |    6 +-
 generator/tests_c_api.ml                   |   37 +-
 37 files changed, 1605 insertions(+), 2054 deletions(-)

diff --git a/generator/GObject.ml b/generator/GObject.ml
index 87c5b33bf..f7d872d20 100644
--- a/generator/GObject.ml
+++ b/generator/GObject.ml
@@ -120,23 +120,23 @@ let header_start filename =
   let guard = "GUESTFS_GOBJECT_" ^ String.uppercase_ascii guard ^ "_H__" in
   pr "#ifndef %s\n" guard;
   pr "#define %s\n" guard;
-  pr "
+  pr {|
 #include <glib-object.h>
 #include <gio/gio.h>
 
 #include <guestfs-gobject.h>
 
 G_BEGIN_DECLS
-"
+|}
 
 and header_end filename =
   let guard = Str.global_replace (Str.regexp "-") "_" filename in
   let guard = "GUESTFS_GOBJECT_" ^ String.uppercase_ascii guard ^ "_H__" in
-  pr "
+  pr {|
 G_END_DECLS
 
 #endif /* %s */
-" guard
+|} guard
 
 let source_start ?title ?shortdesc ?longdesc filename =
   generate_header CStyle GPLv2plus;
@@ -518,7 +518,7 @@ let generate_gobject_optargs_source filename name optargs f () =
 let generate_gobject_tristate_header () =
   let filename = "tristate" in
   header_start filename;
-  pr "
+  pr {|
 /**
  * GuestfsTristate:
  * @GUESTFS_TRISTATE_FALSE: False
@@ -539,7 +539,7 @@ typedef enum
 
 GType guestfs_tristate_get_type (void);
 #define GUESTFS_TYPE_TRISTATE (guestfs_tristate_get_type ())
-";
+|};
   header_end filename
 
 let generate_gobject_tristate_source () =
@@ -547,33 +547,33 @@ let generate_gobject_tristate_source () =
   let title = "GuestfsTristate" in
   let shortdesc = "An object representing a tristate value" in
   source_start ~title ~shortdesc filename;
-  pr "
+  pr {|
 GType
 guestfs_tristate_get_type (void)
 {
   static GType etype = 0;
   if (etype == 0) {
     static const GEnumValue values[] = {
-      { GUESTFS_TRISTATE_FALSE, \"GUESTFS_TRISTATE_FALSE\", \"false\" },
-      { GUESTFS_TRISTATE_TRUE,  \"GUESTFS_TRISTATE_TRUE\",  \"true\" },
-      { GUESTFS_TRISTATE_NONE,  \"GUESTFS_TRISTATE_NONE\",  \"none\" },
+      { GUESTFS_TRISTATE_FALSE, "GUESTFS_TRISTATE_FALSE", "false" },
+      { GUESTFS_TRISTATE_TRUE,  "GUESTFS_TRISTATE_TRUE",  "true" },
+      { GUESTFS_TRISTATE_NONE,  "GUESTFS_TRISTATE_NONE",  "none" },
       { 0, NULL, NULL }
     };
-    etype = g_enum_register_static (\"GuestfsTristate\", values);
+    etype = g_enum_register_static ("GuestfsTristate", values);
   }
   return etype;
 }
-"
+|}
 
 let generate_gobject_session_header () =
   let filename = "session" in
   header_start filename;
-  pr "
+  pr {|
 /* GuestfsSessionEvent */
 
 /**
  * GuestfsSessionEvent:
-";
+|};
 
   List.iter (
     fun (name, _) ->
@@ -581,18 +581,18 @@ let generate_gobject_session_header () =
         (String.uppercase_ascii name) name;
   ) events;
 
-  pr " *
- * For more detail on libguestfs events, see \"SETTING CALLBACKS TO HANDLE
- * EVENTS\" in guestfs(3).
+  pr {| *
+ * For more detail on libguestfs events, see "SETTING CALLBACKS TO HANDLE
+ * EVENTS" in guestfs(3).
  */
-typedef enum {";
+typedef enum {|};
 
   List.iter (
     fun (name, _) ->
       pr "\n  GUESTFS_SESSION_EVENT_%s," (String.uppercase_ascii name);
   ) events;
 
-  pr "
+  pr {|
 } GuestfsSessionEvent;
 GType guestfs_session_event_get_type (void);
 #define GUESTFS_TYPE_SESSION_EVENT (guestfs_session_event_get_type ())
@@ -625,24 +625,11 @@ GType guestfs_session_event_params_get_type (void);
 
 /* GuestfsSession object definition */
 #define GUESTFS_TYPE_SESSION             (guestfs_session_get_type ())
-#define GUESTFS_SESSION(obj)             (G_TYPE_CHECK_INSTANCE_CAST ( \
-                                          (obj), \
-                                          GUESTFS_TYPE_SESSION, \
-                                          GuestfsSession))
-#define GUESTFS_SESSION_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ( \
-                                          (klass), \
-                                          GUESTFS_TYPE_SESSION, \
-                                          GuestfsSessionClass))
-#define GUESTFS_IS_SESSION(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ( \
-                                          (obj), \
-                                          GUESTFS_TYPE_SESSION))
-#define GUESTFS_IS_SESSION_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ( \
-                                          (klass), \
-                                          GUESTFS_TYPE_SESSION))
-#define GUESTFS_SESSION_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ( \
-                                          (obj), \
-                                          GUESTFS_TYPE_SESSION, \
-                                          GuestfsSessionClass))
+#define GUESTFS_SESSION(obj)             (G_TYPE_CHECK_INSTANCE_CAST ( (obj), GUESTFS_TYPE_SESSION, GuestfsSession))
+#define GUESTFS_SESSION_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ( (klass), GUESTFS_TYPE_SESSION, GuestfsSessionClass))
+#define GUESTFS_IS_SESSION(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ( (obj), GUESTFS_TYPE_SESSION))
+#define GUESTFS_IS_SESSION_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ( (klass), GUESTFS_TYPE_SESSION))
+#define GUESTFS_SESSION_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ( (obj), GUESTFS_TYPE_SESSION, GuestfsSessionClass))
 
 typedef struct _GuestfsSessionPrivate GuestfsSessionPrivate;
 
@@ -674,7 +661,7 @@ GType guestfs_session_get_type (void);
 GuestfsSession *guestfs_session_new (void);
 gboolean guestfs_session_close (GuestfsSession *session, GError **err);
 
-";
+|};
 
   List.iter (
     fun ({ name; style } as f) ->
@@ -689,7 +676,7 @@ let generate_gobject_session_source () =
   let shortdesc = "A libguestfs session" in
   source_start ~shortdesc filename;
 
-  pr "
+  pr {|
 /* It is safe to call deprecated functions from this file. */
 #define GUESTFS_NO_WARN_DEPRECATED
 #undef GUESTFS_NO_DEPRECATED
@@ -709,7 +696,7 @@ let generate_gobject_session_source () =
 static GQuark
 guestfs_error_quark (void)
 {
-  return g_quark_from_static_string (\"guestfs\");
+  return g_quark_from_static_string ("guestfs");
 }
 
 /* Cancellation handler */
@@ -739,15 +726,15 @@ G_DEFINE_BOXED_TYPE (GuestfsSessionEventParams,
                     guestfs_session_event_params_free)
 
 /* Event callback */
-";
+|};
 
   pr "static guint signals[%i] = { 0 };\n" (List.length events);
 
-pr "
+pr {|
 static GuestfsSessionEvent
 guestfs_session_event_from_guestfs_event (uint64_t event)
 {
-  switch (event) {";
+  switch (event) {|};
 
   List.iter (
     fun (name, _) ->
@@ -756,10 +743,10 @@ guestfs_session_event_from_guestfs_event (uint64_t event)
       pr "\n    case %s: return %s;" guestfs_name enum_name;
   ) events;
 
-pr "
+pr {|
   }
 
-  g_warning (\"guestfs_session_event_from_guestfs_event: invalid event %%\" PRIu64,
+  g_warning ("guestfs_session_event_from_guestfs_event: invalid event %%" PRIu64,
             event);
   return UINT32_MAX;
 }
@@ -801,7 +788,7 @@ guestfs_session_event_get_type (void)
 {
   static GType etype = 0;
   if (etype == 0) {
-    static const GEnumValue values[] = {";
+    static const GEnumValue values[] = {|};
 
   List.iter (
     fun (name, _) ->
@@ -809,9 +796,9 @@ guestfs_session_event_get_type (void)
       pr "\n      { %s, \"%s\", \"%s\" }," enum_name enum_name name
   ) events;
 
-  pr "
+  pr {|
     };
-    etype = g_enum_register_static (\"GuestfsSessionEvent\", values);
+    etype = g_enum_register_static ("GuestfsSessionEvent", values);
   }
   return etype;
 }
@@ -843,7 +830,7 @@ guestfs_session_class_init (GuestfsSessionClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  object_class->finalize = guestfs_session_finalize;";
+  object_class->finalize = guestfs_session_finalize;|};
 
   List.iter (
     fun (name, _) ->
@@ -868,7 +855,7 @@ guestfs_session_class_init (GuestfsSessionClass *klass)
       pr "                 1, guestfs_session_event_params_get_type ());";
   ) events;
 
-  pr "
+  pr {|
 }
 
 static void
@@ -912,7 +899,7 @@ guestfs_session_close (GuestfsSession *session, GError **err)
   guestfs_h *g = session->priv->g;
 
   if (g == NULL) {
-    g_set_error_literal (err, GUESTFS_ERROR, 0, \"session is already closed\");
+    g_set_error_literal (err, GUESTFS_ERROR, 0, "session is already closed");
     return FALSE;
   }
 
@@ -920,7 +907,7 @@ guestfs_session_close (GuestfsSession *session, GError **err)
   session->priv->g = NULL;
 
   return TRUE;
-}";
+}|};
 
   let urls = Str.regexp "L<\\(https?\\)://\\([^>]*\\)>" in
   let bz = Str.regexp "RHBZ#\\([0-9]+\\)" in
diff --git a/generator/OCaml.ml b/generator/OCaml.ml
index d4dfe9ed0..95e4c5b97 100644
--- a/generator/OCaml.ml
+++ b/generator/OCaml.ml
@@ -48,8 +48,7 @@ let ocaml_errnos = [
 let rec generate_ocaml_mli () =
   generate_header OCamlStyle LGPLv2plus;
 
-  pr "\
-(** libguestfs bindings for OCaml.
+  pr {|(** libguestfs bindings for OCaml.
 
     For API documentation, the canonical reference is the
     {{:http://libguestfs.org/guestfs.3.html}guestfs(3)} man page.
@@ -98,15 +97,14 @@ val close : t -> unit
 (** {3 Events} *)
 
 type event =
-";
+|};
   List.iter (
     fun (name, _) ->
       pr "  | EVENT_%s\n" (String.uppercase_ascii name)
   ) events;
   pr "\n";
 
-  pr "\
-val event_all : event list
+  pr {|val event_all : event list
 (** A list containing all event types. *)
 
 type event_handle
@@ -149,18 +147,17 @@ val last_errno : t -> int
     which you can use to test the return value of {!Guestfs.last_errno}. *)
 
 module Errno : sig
-";
+|};
   List.iter (
     fun e ->
       pr "  val errno_%s : int\n" e;
       pr "  (** Integer value of errno [%s].  See {!Guestfs.last_errno}. *)\n" e
   ) ocaml_errnos;
-  pr "\
-end
+  pr {|end
 
 (** {3 Structs} *)
 
-";
+|};
   generate_ocaml_structure_decls ();
 
   pr "\
@@ -234,8 +231,7 @@ end
       pr "\n";
   ) (actions |> external_functions |> sort);
 
-  pr "\
-(** {2 Object-oriented API}
+  pr {|(** {2 Object-oriented API}
 
     This is an alternate way of calling the API using an object-oriented
     style, so you can use
@@ -268,7 +264,7 @@ class guestfs : ?environment:bool -> ?close_on_exit:bool -> unit -> object
   (** See {!Guestfs.last_errno} *)
   method ocaml_handle : t
   (** Return the {!Guestfs.t} handle *)
-";
+|};
 
   List.iter (
     fun ({ name; style; non_c_aliases } as f) ->
@@ -306,15 +302,14 @@ class guestfs : ?environment:bool -> ?close_on_exit:bool -> unit -> object
 and generate_ocaml_ml () =
   generate_header OCamlStyle LGPLv2plus;
 
-  pr "\
-type t
+  pr {|type t
 
 exception Error of string
 exception Handle_closed of string
 
 external _create : ?environment:bool -> ?close_on_exit:bool -> unit -> t =
-  \"guestfs_int_ocaml_create\"
-external close : t -> unit = \"guestfs_int_ocaml_close\"
+  "guestfs_int_ocaml_create"
+external close : t -> unit = "guestfs_int_ocaml_close"
 
 let create ?environment ?close_on_exit () =
   let g = _create ?environment ?close_on_exit () in
@@ -322,7 +317,7 @@ let create ?environment ?close_on_exit () =
   g
 
 type event =
-";
+|};
   List.iter (
     fun (name, _) ->
       pr "  | EVENT_%s\n" (String.uppercase_ascii name)
@@ -337,24 +332,23 @@ let event_all = [
       pr "  EVENT_%s;\n" (String.uppercase_ascii name)
   ) events;
 
-  pr "\
-]
+  pr {|]
 
 type event_handle = int
 
 type event_callback = event -> event_handle -> string -> int64 array -> unit
 
 external set_event_callback : t -> event_callback -> event list -> event_handle
-  = \"guestfs_int_ocaml_set_event_callback\"
+  = "guestfs_int_ocaml_set_event_callback"
 external delete_event_callback : t -> event_handle -> unit
-  = \"guestfs_int_ocaml_delete_event_callback\"
+  = "guestfs_int_ocaml_delete_event_callback"
 external event_to_string : event list -> string
-  = \"guestfs_int_ocaml_event_to_string\"
+  = "guestfs_int_ocaml_event_to_string"
 
-external last_errno : t -> int = \"guestfs_int_ocaml_last_errno\"
+external last_errno : t -> int = "guestfs_int_ocaml_last_errno"
 
 module Errno = struct
-";
+|};
   List.iter (
     fun e ->
       let le = String.lowercase_ascii e in
@@ -362,15 +356,14 @@ module Errno = struct
         le e;
       pr "  let errno_%s = %s ()\n" e le
   ) ocaml_errnos;
-  pr "\
-end
+  pr {|end
 
 (* Give the exceptions names, so they can be raised from the C code. *)
 let () =
-  Callback.register_exception \"guestfs_int_ocaml_error\" (Error \"\");
-  Callback.register_exception \"guestfs_int_ocaml_closed\" (Handle_closed \"\")
+  Callback.register_exception "guestfs_int_ocaml_error" (Error "");
+  Callback.register_exception "guestfs_int_ocaml_closed" (Handle_closed "")
 
-";
+|};
 
   generate_ocaml_structure_decls ();
 
@@ -382,7 +375,7 @@ let () =
   ) (actions |> external_functions |> sort);
 
   (* OO API. *)
-  pr "
+  pr {|
 class guestfs ?environment ?close_on_exit () =
   let g = create ?environment ?close_on_exit () in
   object (self)
@@ -391,7 +384,7 @@ class guestfs ?environment ?close_on_exit () =
     method delete_event_callback = delete_event_callback g
     method last_errno () = last_errno g
     method ocaml_handle = g
-";
+|};
 
   List.iter (
     fun { name; style; non_c_aliases } ->
@@ -415,8 +408,7 @@ class guestfs ?environment ?close_on_exit () =
 and generate_ocaml_c () =
   generate_header CStyle LGPLv2plus;
 
-  pr "\
-#include <config.h>
+  pr {|#include <config.h>
 
 /* It is safe to call deprecated functions from this file. */
 #define GUESTFS_NO_WARN_DEPRECATED
@@ -437,9 +429,9 @@ and generate_ocaml_c () =
 #include <caml/threads.h>
 
 #include <guestfs.h>
-#include \"guestfs-utils.h\"
+#include "guestfs-utils.h"
 
-#include \"guestfs-c.h\"
+#include "guestfs-c.h"
 
 /* Copy a hashtable of string pairs into an assoc-list.  We return
  * the list in reverse order, but hashtables aren't supposed to be
@@ -468,7 +460,7 @@ copy_table (char * const * argv)
   CAMLreturn (rv);
 }
 
-";
+|};
 
   (* Struct copy functions. *)
 
@@ -795,8 +787,7 @@ copy_table (char * const * argv)
 and generate_ocaml_c_errnos () =
   generate_header CStyle LGPLv2plus;
 
-  pr "\
-#include <config.h>
+  pr {|#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -809,12 +800,12 @@ and generate_ocaml_c_errnos () =
 #include <caml/memory.h>
 #include <caml/mlvalues.h>
 
-#include \"guestfs.h\"
+#include "guestfs.h"
 
-#include \"guestfs-c.h\"
+#include "guestfs-c.h"
 
 /* These prototypes are solely to quiet gcc warnings. */
-";
+|};
   List.iter (
     fun e ->
       pr "value guestfs_int_ocaml_get_%s (value unitv);\n" e
@@ -822,15 +813,14 @@ and generate_ocaml_c_errnos () =
 
   List.iter (
     fun e ->
-      pr "\
-
+      pr {|
 /* NB: [@@noalloc] function. */
 value
 guestfs_int_ocaml_get_%s (value unitv)
 {
   return Val_int (%s);
 }
-" e e
+|} e e
   ) ocaml_errnos
 
 and generate_ocaml_structure_decls () =
diff --git a/generator/XDR.ml b/generator/XDR.ml
index 431959819..c79f7c6c9 100644
--- a/generator/XDR.ml
+++ b/generator/XDR.ml
@@ -189,8 +189,7 @@ let generate_xdr () =
   pr "\n";
 
   (* Message header, etc. *)
-  pr "\
-const GUESTFS_PROGRAM = 0x2000F5F5;
+  pr {|const GUESTFS_PROGRAM = 0x2000F5F5;
 const GUESTFS_PROTOCOL_VERSION = 4;
 
 /* These constants must be larger than any possible message length. */
@@ -208,14 +207,13 @@ enum guestfs_message_status {
   GUESTFS_STATUS_ERROR = 1
 };
 
-";
+|};
 
   pr "const GUESTFS_ERROR_LEN = %d;\n" (64 * 1024);
   pr "\n";
 
-  pr "\
-struct guestfs_message_error {
-  string errno_string<32>;           /* errno eg. \"EINVAL\", empty string
+  pr {|struct guestfs_message_error {
+  string errno_string<32>;           /* errno eg. "EINVAL", empty string
                                         if errno not available */
   string error_message<GUESTFS_ERROR_LEN>;
 };
@@ -261,4 +259,4 @@ struct guestfs_progress {
   uint64_t total;                    /* @16: total size of operation */
                                      /* @24: size of structure */
 };
-"
+|}
diff --git a/generator/actions_augeas.ml b/generator/actions_augeas.ml
index 9688c7ca4..d28d4f40b 100644
--- a/generator/actions_augeas.ml
+++ b/generator/actions_augeas.ml
@@ -34,8 +34,7 @@ let daemon_functions = [
          ["aug_get"; "/files/etc/hostname/hostname"]], "test.example.org"), [["aug_close"]]
     ];
     shortdesc = "create a new Augeas handle";
-    longdesc = "\
-Create a new Augeas handle for editing configuration files.
+    longdesc = {|Create a new Augeas handle for editing configuration files.
 If there was any previous Augeas handle associated with this
 guestfs session, then it is closed.
 
@@ -85,7 +84,7 @@ Do not load the tree in C<guestfs_aug_init>.
 
 To close the handle, you can call C<guestfs_aug_close>.
 
-To find out more about Augeas, see L<http://augeas.net/>." };
+To find out more about Augeas, see L<http://augeas.net/>.|} };
 
   { defaults with
     name = "aug_close"; added = (0, 0, 7);
@@ -101,20 +100,18 @@ Augeas functions." };
     name = "aug_defvar"; added = (0, 0, 7);
     style = RInt "nrnodes", [String (PlainString, "name"); OptString "expr"], [];
     shortdesc = "define an Augeas variable";
-    longdesc = "\
-Defines an Augeas variable C<name> whose value is the result
+    longdesc = {|Defines an Augeas variable C<name> whose value is the result
 of evaluating C<expr>.  If C<expr> is NULL, then C<name> is
 undefined.
 
 On success this returns the number of nodes in C<expr>, or
-C<0> if C<expr> evaluates to something which is not a nodeset." };
+C<0> if C<expr> evaluates to something which is not a nodeset.|} };
 
   { defaults with
     name = "aug_defnode"; added = (0, 0, 7);
     style = RStruct ("nrnodescreated", "int_bool"), [String (PlainString, "name"); String (PlainString, "expr"); String (PlainString, "val")], [];
     shortdesc = "define an Augeas node";
-    longdesc = "\
-Defines a variable C<name> whose value is the result of
+    longdesc = {|Defines a variable C<name> whose value is the result of
 evaluating C<expr>.
 
 If C<expr> evaluates to an empty nodeset, a node is created,
@@ -123,7 +120,7 @@ C<name> will be the nodeset containing that single node.
 
 On success this returns a pair containing the
 number of nodes in the nodeset, and a boolean flag
-if a node was created." };
+if a node was created.|} };
 
   { defaults with
     name = "aug_get"; added = (0, 0, 7);
@@ -145,13 +142,12 @@ matches exactly one node, the C<value> is returned." };
          ["aug_get"; "/files/etc/hostname/hostname"]], "replace.example.com"), [["aug_close"]]
     ];
     shortdesc = "set Augeas path to value";
-    longdesc = "\
-Set the value associated with C<augpath> to C<val>.
+    longdesc = {|Set the value associated with C<augpath> to C<val>.
 
 In the Augeas API, it is possible to clear a node by setting
 the value to NULL.  Due to an oversight in the libguestfs API
 you cannot do that with this call.  Instead you must use the
-C<guestfs_aug_clear> call." };
+C<guestfs_aug_clear> call.|} };
 
   { defaults with
     name = "aug_insert"; added = (0, 0, 7);
@@ -170,14 +166,13 @@ C<guestfs_aug_clear> call." };
          ["cat"; "/etc/hosts"]], "\n127.0.0.1\tlocalhost\n"), [["aug_close"]]
     ];
     shortdesc = "insert a sibling Augeas node";
-    longdesc = "\
-Create a new sibling C<label> for C<path>, inserting it into
+    longdesc = {|Create a new sibling C<label> for C<path>, inserting it into
 the tree before or after C<path> (depending on the boolean
 flag C<before>).
 
 C<path> must match exactly one existing node in the tree, and
 C<label> must be a label, ie. not contain F</>, C<*> or end
-with a bracketed index C<[N]>." };
+with a bracketed index C<[N]>.|} };
 
   { defaults with
     name = "aug_rm"; added = (0, 0, 7);
@@ -253,11 +248,10 @@ is the same as the L<augtool(1)> C<clear> command." };
     name = "aug_transform"; added = (1, 35, 2);
     style = RErr, [String (PlainString, "lens"); String (PlainString, "file")], [ OBool "remove"];
     shortdesc = "add/remove an Augeas lens transformation";
-    longdesc = "\
-Add an Augeas transformation for the specified C<lens> so it can
+    longdesc = {|Add an Augeas transformation for the specified C<lens> so it can
 handle C<file>.
 
 If C<remove> is true (C<false> by default), then the transformation
-is removed." };
+is removed.|} };
 
 ]
diff --git a/generator/actions_core.ml b/generator/actions_core.ml
index 3517d9210..f869fde40 100644
--- a/generator/actions_core.ml
+++ b/generator/actions_core.ml
@@ -29,14 +29,13 @@ let non_daemon_functions = [
     style = RErr, [], [];
     fish_alias = ["run"]; progress = true; config_only = true;
     shortdesc = "launch the backend";
-    longdesc = "\
-You should call this after configuring the handle
+    longdesc = {|You should call this after configuring the handle
 (eg. adding drives) but before performing any actions.
 
 Do not call C<guestfs_launch> twice on the same handle.  Although
 it will not give an error (for historical reasons), the precise
 behaviour when you do this is not well defined.  Handles are
-very cheap to create, so create a new one for each launch." };
+very cheap to create, so create a new one for each launch.|} };
 
   { defaults with
     name = "add_drive_ro"; added = (1, 0, 38);
@@ -56,15 +55,14 @@ automatically." };
     config_only = true;
     blocking = false;
     shortdesc = "add hypervisor parameters";
-    longdesc = "\
-This can be used to add arbitrary hypervisor parameters of the
+    longdesc = {|This can be used to add arbitrary hypervisor parameters of the
 form I<-param value>.  Actually it’s not quite arbitrary - we
 prevent you from setting some parameters which would interfere with
 parameters that we use.
 
 The first character of C<hvparam> string must be a C<-> (dash).
 
-C<hvvalue> can be NULL." };
+C<hvvalue> can be NULL.|} };
 
   { defaults with
     name = "is_ready"; added = (1, 0, 2);
@@ -146,8 +144,7 @@ For more information on states, see L<guestfs(3)>." };
     style = RStructList ("entries", "dirent"), [String (Pathname, "dir")], [];
     progress = true; cancellable = true;
     shortdesc = "read directories entries";
-    longdesc = "\
-This returns the list of directory entries in directory C<dir>.
+    longdesc = {|This returns the list of directory entries in directory C<dir>.
 
 All entries in the directory are returned, including C<.> and
 C<..>.  The entries are I<not> sorted, but returned in the same
@@ -199,7 +196,7 @@ unexpected value
 
 This function is primarily intended for use by programs.  To
 get a simple list of names, use C<guestfs_ls>.  To get a printable
-directory for human consumption, use C<guestfs_ll>." };
+directory for human consumption, use C<guestfs_ll>.|} };
 
   { defaults with
     name = "version"; added = (1, 0, 58);
@@ -210,8 +207,7 @@ directory for human consumption, use C<guestfs_ll>." };
         [["version"]], "ret->major == 1"), []
     ];
     shortdesc = "get the library version number";
-    longdesc = "\
-Return the libguestfs version number that the program is linked
+    longdesc = {|Return the libguestfs version number that the program is linked
 against.
 
 Note that because of dynamic linking this is not necessarily
@@ -240,33 +236,31 @@ I<Note:> Don't use this call to test for availability
 of features.  In enterprise distributions we backport
 features from later versions into earlier versions,
 making this an unreliable way to test for features.
-Use C<guestfs_available> or C<guestfs_feature_available> instead." };
+Use C<guestfs_available> or C<guestfs_feature_available> instead.|} };
 
   { defaults with
     name = "mountable_device"; added = (1, 33, 15);
     style = RString (RDevice, "device"), [String (Mountable, "mountable")], [];
     shortdesc = "extract the device part of a mountable";
-    longdesc = "\
-Returns the device name of a mountable. In quite a lot of
+    longdesc = {|Returns the device name of a mountable. In quite a lot of
 cases, the mountable is the device name.
 
 However this doesn't apply for btrfs subvolumes, where the
 mountable is a combination of both the device name and the
 subvolume path (see also C<guestfs_mountable_subvolume> to
-extract the subvolume path of the mountable if any)." };
+extract the subvolume path of the mountable if any).|} };
 
   { defaults with
     name = "mountable_subvolume"; added = (1, 33, 15);
     style = RString (RPlainString, "subvolume"), [String (Mountable, "mountable")], [];
     shortdesc = "extract the subvolume part of a mountable";
-    longdesc = "\
-Returns the subvolume path of a mountable. Btrfs subvolumes
+    longdesc = {|Returns the subvolume path of a mountable. Btrfs subvolumes
 mountables are a combination of both the device name and the
 subvolume path (see also C<guestfs_mountable_device> to extract
 the device of the mountable).
 
 If the mountable does not represent a btrfs subvolume, then
-this function fails and the C<errno> is set to C<EINVAL>." };
+this function fails and the C<errno> is set to C<EINVAL>.|} };
 
   { defaults with
     name = "add_drive"; added = (0, 0, 3);
@@ -275,8 +269,7 @@ this function fails and the C<errno> is set to C<EINVAL>." };
     blocking = false;
     fish_alias = ["add"];
     shortdesc = "add an image to examine or modify";
-    longdesc = "\
-This function adds a disk image called F<filename> to the handle.
+    longdesc = {|This function adds a disk image called F<filename> to the handle.
 F<filename> may be a regular host file or a host device.
 
 When this function is called before C<guestfs_launch> (the
@@ -292,7 +285,7 @@ image).
 
 This call checks that F<filename> exists.
 
-F<filename> may be the special string C<\"/dev/null\">.
+F<filename> may be the special string C<"/dev/null">.
 See L<guestfs(3)/NULL DISKS>.
 
 The optional arguments are:
@@ -344,20 +337,20 @@ See also: L<guestfs(3)/REMOTE STORAGE>.
 
 =over 4
 
-=item C<protocol = \"file\">
+=item C<protocol = "file">
 
 F<filename> is interpreted as a local file or device.
 This is the default if the optional protocol parameter
 is omitted.
 
-=item C<protocol = \"ftp\"|\"ftps\"|\"http\"|\"https\">
+=item C<protocol = "ftp"|"ftps"|"http"|"https">
 
 Connect to a remote FTP or HTTP server.
 The C<server> parameter must also be supplied - see below.
 
 See also: L<guestfs(3)/FTP AND HTTP>
 
-=item C<protocol = \"iscsi\">
+=item C<protocol = "iscsi">
 
 Connect to the iSCSI server.
 The C<server> parameter must also be supplied - see below.
@@ -366,14 +359,14 @@ The C<secret> parameter may be supplied.  See below.
 
 See also: L<guestfs(3)/ISCSI>.
 
-=item C<protocol = \"nbd\">
+=item C<protocol = "nbd">
 
 Connect to the Network Block Device server.
 The C<server> parameter must also be supplied - see below.
 
 See also: L<guestfs(3)/NETWORK BLOCK DEVICE>.
 
-=item C<protocol = \"rbd\">
+=item C<protocol = "rbd">
 
 Connect to the Ceph (librbd/RBD) server.
 The C<server> parameter must also be supplied - see below.
@@ -382,7 +375,7 @@ The C<secret> parameter may be supplied.  See below.
 
 See also: L<guestfs(3)/CEPH>.
 
-=item C<protocol = \"ssh\">
+=item C<protocol = "ssh">
 
 Connect to the Secure Shell (ssh) server.
 
@@ -446,7 +439,7 @@ or not (unsafe but fast).  The possible values for this string are:
 
 =over 4
 
-=item C<cachemode = \"writeback\">
+=item C<cachemode = "writeback">
 
 This is the default.
 
@@ -459,7 +452,7 @@ filesystem journalling, will not return until an L<fdatasync(2)>
 call has completed in the host, indicating that data has been
 committed to disk.
 
-=item C<cachemode = \"unsafe\">
+=item C<cachemode = "unsafe">
 
 In this mode, there are no guarantees.  Libguestfs may cache
 anything and ignore sync requests.  This is suitable only
@@ -478,15 +471,15 @@ Possible discard settings are:
 
 =over 4
 
-=item C<discard = \"disable\">
+=item C<discard = "disable">
 
 Disable discard support.  This is the default.
 
-=item C<discard = \"enable\">
+=item C<discard = "enable">
 
 Enable discard support.  Fail if discard is not possible.
 
-=item C<discard = \"besteffort\">
+=item C<discard = "besteffort">
 
 Enable discard support if possible, but don't fail if it is not
 supported.
@@ -510,21 +503,20 @@ The default is false.
 
 This parameter sets the sector size of the disk.  Possible values are
 C<512> (the default if the parameter is omitted) or C<4096>.  Use
-C<4096> when handling an \"Advanced Format\" disk that uses 4K sector
+C<4096> when handling an "Advanced Format" disk that uses 4K sector
 size (L<https://en.wikipedia.org/wiki/Advanced_Format>).
 
 Only a subset of the backends support this parameter (currently only the
 libvirt and direct backends do).
 
-=back" };
+=back|} };
 
   { defaults with
     name = "add_domain"; added = (1, 7, 4);
     style = RInt "nrdisks", [String (PlainString, "dom")], [OString "libvirturi"; OBool "readonly"; OString "iface"; OBool "live"; OBool "allowuuid"; OString "readonlydisk"; OString "cachemode"; OString "discard"; OBool "copyonread"];
     fish_alias = ["domain"]; config_only = true;
     shortdesc = "add the disk(s) from a named libvirt domain";
-    longdesc = "\
-This function adds the disk(s) attached to the named libvirt
+    longdesc = {|This function adds the disk(s) attached to the named libvirt
 domain C<dom>.  It works by connecting to libvirt, requesting
 the domain and domain XML from libvirt, parsing it for disks,
 and calling C<guestfs_add_drive_opts> on each one.
@@ -560,7 +552,7 @@ Possible values are:
 
 =over 4
 
-=item readonlydisk = \"error\"
+=item readonlydisk = "error"
 
 If C<readonly> is false:
 
@@ -571,7 +563,7 @@ If C<readonly> is true:
 
 Disks with the E<lt>readonly/E<gt> flag are added read-only.
 
-=item readonlydisk = \"read\"
+=item readonlydisk = "read"
 
 If C<readonly> is false:
 
@@ -582,7 +574,7 @@ If C<readonly> is true:
 
 Disks with the E<lt>readonly/E<gt> flag are added read-only.
 
-=item readonlydisk = \"write\" (default)
+=item readonlydisk = "write" (default)
 
 If C<readonly> is false:
 
@@ -592,7 +584,7 @@ If C<readonly> is true:
 
 Disks with the E<lt>readonly/E<gt> flag are added read-only.
 
-=item readonlydisk = \"ignore\"
+=item readonlydisk = "ignore"
 
 If C<readonly> is true or false:
 
@@ -605,15 +597,14 @@ tag in libvirt XML will be passed as C<blocksize> parameter to
 C<guestfs_add_drive_opts>.
 
 The other optional parameters are passed directly through to
-C<guestfs_add_drive_opts>." };
+C<guestfs_add_drive_opts>.|} };
 
   { defaults with
     name = "add_libvirt_dom"; added = (1, 29, 14);
     style = RInt "nrdisks", [Pointer ("virDomainPtr", "dom")], [OBool "readonly"; OString "iface"; OBool "live"; OString "readonlydisk"; OString "cachemode"; OString "discard"; OBool "copyonread"];
     config_only = true;
     shortdesc = "add the disk(s) from a libvirt domain";
-    longdesc = "\
-This function adds the disk(s) attached to the libvirt domain C<dom>.
+    longdesc = {|This function adds the disk(s) attached to the libvirt domain C<dom>.
 It works by requesting the domain XML from libvirt, parsing it for
 disks, and calling C<guestfs_add_drive_opts> on each one.
 
@@ -643,14 +634,13 @@ tag in libvirt XML will be passed as C<blocksize> parameter to
 C<guestfs_add_drive_opts>.
 
 The other optional parameters are passed directly through to
-C<guestfs_add_drive_opts>." };
+C<guestfs_add_drive_opts>.|} };
 
   { defaults with
     name = "mount_local"; added = (1, 17, 22);
     style = RErr, [String (PlainString, "localmountpoint")], [OBool "readonly"; OString "options"; OInt "cachetimeout"; OBool "debugcalls"];
     shortdesc = "mount on the local filesystem";
-    longdesc = "\
-This call exports the libguestfs-accessible filesystem to
+    longdesc = {|This call exports the libguestfs-accessible filesystem to
 a local mountpoint (directory) called C<localmountpoint>.
 Ordinary reads and writes to files and directories under
 C<localmountpoint> are redirected through libguestfs.
@@ -672,15 +662,14 @@ When C<guestfs_mount_local> returns, the filesystem is ready,
 but is not processing requests (access to it will block).  You
 have to call C<guestfs_mount_local_run> to run the main loop.
 
-See L<guestfs(3)/MOUNT LOCAL> for full documentation." };
+See L<guestfs(3)/MOUNT LOCAL> for full documentation.|} };
 
   { defaults with
     name = "mount_local_run"; added = (1, 17, 22);
     style = RErr, [], [];
     cancellable = true (* in a future version *);
     shortdesc = "run main loop of mount on the local filesystem";
-    longdesc = "\
-Run the main loop which translates kernel calls to libguestfs
+    longdesc = {|Run the main loop which translates kernel calls to libguestfs
 calls.
 
 This should only be called after C<guestfs_mount_local>
@@ -695,7 +684,7 @@ called C<guestfs_mount_local>, subject to the usual rules
 for threads and libguestfs (see
 L<guestfs(3)/MULTIPLE HANDLES AND MULTIPLE THREADS>).
 
-See L<guestfs(3)/MOUNT LOCAL> for full documentation." };
+See L<guestfs(3)/MOUNT LOCAL> for full documentation.|} };
 
   { defaults with
     name = "umount_local"; added = (1, 17, 22);
@@ -713,15 +702,14 @@ See L<guestfs(3)/MOUNT LOCAL> for full documentation." };
     style = RInt "disks", [], [];
     blocking = false;
     shortdesc = "maximum number of disks that may be added";
-    longdesc = "\
-Return the maximum number of disks that may be added to a
+    longdesc = {|Return the maximum number of disks that may be added to a
 handle (eg. by C<guestfs_add_drive_opts> and similar calls).
 
 This function was added in libguestfs 1.19.7.  In previous
 versions of libguestfs the limit was 25.
 
 See L<guestfs(3)/MAXIMUM NUMBER OF DISKS> for additional
-information on this topic." };
+information on this topic.|} };
 
   { defaults with
     name = "canonical_device_name"; added = (1, 19, 7);
@@ -741,8 +729,7 @@ information on this topic." };
         [["canonical_device_name"; "/dev/md127"]], "/dev/md127"), [];
     ];
     shortdesc = "return canonical device name";
-    longdesc = "\
-This utility function is useful when displaying device names to
+    longdesc = {|This utility function is useful when displaying device names to
 the user.  It takes a number of irregular device names and
 returns them in a consistent format:
 
@@ -764,7 +751,7 @@ Converted to F</dev/VG/LV> form using C<guestfs_lvm_canonical_lv_name>.
 
 =back
 
-Other strings are returned unmodified." };
+Other strings are returned unmodified.|} };
 
   { defaults with
     name = "device_index"; added = (1, 19, 7);
@@ -774,15 +761,14 @@ Other strings are returned unmodified." };
         [["device_index"; "/dev/sda"]], "ret == 0"), []
     ];
     shortdesc = "convert device to index";
-    longdesc = "\
-This function takes a device name (eg. \"/dev/sdb\") and
+    longdesc = {|This function takes a device name (eg. "/dev/sdb") and
 returns the index of the device in the list of devices.
 
 Index numbers start from 0.  The named device must exist,
 for example as a string returned from C<guestfs_list_devices>.
 
 See also C<guestfs_list_devices>, C<guestfs_part_to_dev>,
-C<guestfs_device_name>." };
+C<guestfs_device_name>.|} };
 
   { defaults with
     name = "device_name"; added = (1, 49, 1);
@@ -796,21 +782,19 @@ C<guestfs_device_name>." };
         [["device_name"; "99"]]), []
     ];
     shortdesc = "convert device index to name";
-    longdesc = "\
-This function takes a device index and returns the device
+    longdesc = {|This function takes a device index and returns the device
 name.  For example index C<0> will return the string C</dev/sda>.
 
 The drive index must have been added to the handle.
 
 See also C<guestfs_list_devices>, C<guestfs_part_to_dev>,
-C<guestfs_device_index>." };
+C<guestfs_device_index>.|} };
 
   { defaults with
     name = "shutdown"; added = (1, 19, 16);
     style = RErr, [], [];
     shortdesc = "shutdown the hypervisor";
-    longdesc = "\
-This is the opposite of C<guestfs_launch>.  It performs an orderly
+    longdesc = {|This is the opposite of C<guestfs_launch>.  It performs an orderly
 shutdown of the backend process(es).  If the autosync flag is set
 (which is the default) then the disk image is synchronized.
 
@@ -824,7 +808,7 @@ This call does I<not> close or free up the handle.  You still
 need to call C<guestfs_close> afterwards.
 
 C<guestfs_close> will call this if you don't do it explicitly,
-but note that any errors are ignored in that case." };
+but note that any errors are ignored in that case.|} };
 
   { defaults with
     name = "cat"; added = (0, 0, 4);
@@ -834,13 +818,12 @@ but note that any errors are ignored in that case." };
         [["cat"; "/known-2"]], "abcdef\n"), []
     ];
     shortdesc = "list the contents of a file";
-    longdesc = "\
-Return the contents of the file named C<path>.
+    longdesc = {|Return the contents of the file named C<path>.
 
 Because, in C, this function returns a C<char *>, there is no
-way to differentiate between a C<\\0> character in a file and
+way to differentiate between a C<\0> character in a file and
 end of string.  To handle binary files, use the C<guestfs_read_file>
-or C<guestfs_download> functions." };
+or C<guestfs_download> functions.|} };
 
   { defaults with
     name = "find"; added = (1, 0, 27);
@@ -862,8 +845,7 @@ or C<guestfs_download> functions." };
         "is_string_list (ret, 2, \"c\", \"c/d\")"), []
     ];
     shortdesc = "find all files and directories";
-    longdesc = "\
-This command lists out all files and directories, recursively,
+    longdesc = {|This command lists out all files and directories, recursively,
 starting at F<directory>.  It is essentially equivalent to
 running the shell command C<find directory -print> but some
 post-processing happens on the output, described below.
@@ -886,7 +868,7 @@ then the returned list from C<guestfs_find> F</tmp> would be
 If F<directory> is not a directory, then this command returns
 an error.
 
-The returned list is sorted." };
+The returned list is sorted.|} };
 
   { defaults with
     name = "read_file"; added = (1, 0, 63);
@@ -897,12 +879,11 @@ The returned list is sorted." };
         "compare_buffers (ret, size, \"abc\\ndef\\nghi\", 11) == 0"), []
     ];
     shortdesc = "read a file";
-    longdesc = "\
-This call returns the contents of the file C<path> as a
+    longdesc = {|This call returns the contents of the file C<path> as a
 buffer.
 
 Unlike C<guestfs_cat>, this function can correctly
-handle files that contain embedded ASCII NUL characters." };
+handle files that contain embedded ASCII NUL characters.|} };
 
   { defaults with
     name = "read_lines"; added = (0, 0, 7);
@@ -948,16 +929,15 @@ handle files that contain embedded ASCII NUL characters." };
         "is_string_list (ret, 3, \"a\", \"b\", \"\")"), [];
     ];
     shortdesc = "read file as lines";
-    longdesc = "\
-Return the contents of the file named C<path>.
+    longdesc = {|Return the contents of the file named C<path>.
 
 The file contents are returned as a list of lines.  Trailing
 C<LF> and C<CRLF> character sequences are I<not> returned.
 
 Note that this function cannot correctly handle binary files
-(specifically, files containing C<\\0> character which is treated
+(specifically, files containing C<\0> character which is treated
 as end of string).  For those you need to use the C<guestfs_read_file>
-function and split the buffer into lines yourself." };
+function and split the buffer into lines yourself.|} };
 
   { defaults with
     name = "write"; added = (1, 3, 14);
@@ -1011,8 +991,7 @@ See also C<guestfs_write>." };
     name = "lstatnslist"; added = (1, 27, 53);
     style = RStructList ("statbufs", "statns"), [String (Pathname, "path"); StringList (Filename, "names")], [];
     shortdesc = "lstat on multiple files";
-    longdesc = "\
-This call allows you to perform the C<guestfs_lstatns> operation
+    longdesc = {|This call allows you to perform the C<guestfs_lstatns> operation
 on multiple files, where all files are in the directory C<path>.
 C<names> is the list of files from this directory.
 
@@ -1024,15 +1003,14 @@ is set to C<-1>.
 This call is intended for programs that want to efficiently
 list a directory contents without making many round-trips.
 See also C<guestfs_lxattrlist> for a similarly efficient call
-for getting extended attributes." };
+for getting extended attributes.|} };
 
   { defaults with
     name = "lxattrlist"; added = (1, 0, 77);
     style = RStructList ("xattrs", "xattr"), [String (Pathname, "path"); StringList (Filename, "names")], [];
     optional = Some "linuxxattrs";
     shortdesc = "lgetxattr on multiple files";
-    longdesc = "\
-This call allows you to get the extended attributes
+    longdesc = {|This call allows you to get the extended attributes
 of multiple files, where all files are in the directory C<path>.
 C<names> is the list of files from this directory.
 
@@ -1042,21 +1020,20 @@ C<attrname>.  C<attrval> in this struct is zero-length
 to indicate there was an error doing C<guestfs_lgetxattr> for this
 file, I<or> is a C string which is a decimal number
 (the number of following attributes for this file, which could
-be C<\"0\">).  Then after the first xattr struct are the
+be C<"0">).  Then after the first xattr struct are the
 zero or more attributes for the first named file.
 This repeats for the second and subsequent files.
 
 This call is intended for programs that want to efficiently
 list a directory contents without making many round-trips.
 See also C<guestfs_lstatlist> for a similarly efficient call
-for getting standard stats." };
+for getting standard stats.|} };
 
   { defaults with
     name = "readlinklist"; added = (1, 0, 77);
     style = RStringList (RPlainString, "links"), [String (Pathname, "path"); StringList (Filename, "names")], [];
     shortdesc = "readlink on multiple files";
-    longdesc = "\
-This call allows you to do a C<readlink> operation
+    longdesc = {|This call allows you to do a C<readlink> operation
 on multiple files, where all files are in the directory C<path>.
 C<names> is the list of files from this directory.
 
@@ -1065,14 +1042,14 @@ correspondence to the C<names> list.  Each string is the
 value of the symbolic link.
 
 If the L<readlink(2)> operation fails on any name, then
-the corresponding result string is the empty string C<\"\">.
+the corresponding result string is the empty string C<"">.
 However the whole operation is completed even if there
 were L<readlink(2)> errors, and so you can call this
 function with names where you don't know if they are
 symbolic links already (albeit slightly less efficient).
 
 This call is intended for programs that want to efficiently
-list a directory contents without making many round-trips." };
+list a directory contents without making many round-trips.|} };
 
   { defaults with
     name = "ls"; added = (0, 0, 4);
@@ -1112,15 +1089,14 @@ hidden files are shown." };
         [["disk_format"; "../test-data/blank-disks/blank-disk-with-backing.qcow2"]], "qcow2"), [];
     ];
     shortdesc = "detect the disk format of a disk image";
-    longdesc = "\
-Detect and return the format of the disk image called F<filename>.
+    longdesc = {|Detect and return the format of the disk image called F<filename>.
 F<filename> can also be a host device, etc.  If the format of the
-image could not be detected, then C<\"unknown\"> is returned.
+image could not be detected, then C<"unknown"> is returned.
 
 Note that detecting the disk format can be insecure under some
 circumstances.  See L<guestfs(3)/CVE-2010-3851>.
 
-See also: L<guestfs(3)/DISK IMAGE FORMATS>" };
+See also: L<guestfs(3)/DISK IMAGE FORMATS>|} };
 
   { defaults with
     name = "disk_virtual_size"; added = (1, 19, 39);
@@ -1142,12 +1118,11 @@ See also: L<guestfs(3)/DISK IMAGE FORMATS>" };
         [["disk_virtual_size"; "../test-data/blank-disks/blank-disk-with-backing.qcow2"]], "ret == 1024*1024"), [];
     ];
     shortdesc = "return virtual size of a disk";
-    longdesc = "\
-Detect and return the virtual size in bytes of the disk image
+    longdesc = {|Detect and return the virtual size in bytes of the disk image
 called F<filename>.
 
 Note that detecting disk features can be insecure under some
-circumstances.  See L<guestfs(3)/CVE-2010-3851>." };
+circumstances.  See L<guestfs(3)/CVE-2010-3851>.|} };
 
   { defaults with
     name = "disk_has_backing_file"; added = (1, 19, 39);
@@ -1169,20 +1144,18 @@ circumstances.  See L<guestfs(3)/CVE-2010-3851>." };
         [["disk_has_backing_file"; "../test-data/blank-disks/blank-disk-with-backing.qcow2"]]), [];
     ];
     shortdesc = "return whether disk has a backing file";
-    longdesc = "\
-Detect and return whether the disk image F<filename> has a
+    longdesc = {|Detect and return whether the disk image F<filename> has a
 backing file.
 
 Note that detecting disk features can be insecure under some
-circumstances.  See L<guestfs(3)/CVE-2010-3851>." };
+circumstances.  See L<guestfs(3)/CVE-2010-3851>.|} };
 
   { defaults with
     name = "set_libvirt_supported_credentials"; added = (1, 19, 52);
     style = RErr, [StringList (PlainString, "creds")], [];
     blocking = false;
     shortdesc = "set libvirt credentials supported by calling program";
-    longdesc = "\
-Call this function before setting an event handler for
+    longdesc = {|Call this function before setting an event handler for
 C<GUESTFS_EVENT_LIBVIRT_AUTH>, to supply the list of credential types
 that the program knows how to process.
 
@@ -1213,58 +1186,54 @@ Possible strings are:
 
 See libvirt documentation for the meaning of these credential types.
 
-See L<guestfs(3)/LIBVIRT AUTHENTICATION> for documentation and example code." };
+See L<guestfs(3)/LIBVIRT AUTHENTICATION> for documentation and example code.|} };
 
   { defaults with
     name = "get_libvirt_requested_credentials"; added = (1, 19, 52);
     style = RStringList (RPlainString, "creds"), [], [];
     blocking = false;
     shortdesc = "get list of credentials requested by libvirt";
-    longdesc = "\
-This should only be called during the event callback
+    longdesc = {|This should only be called during the event callback
 for events of type C<GUESTFS_EVENT_LIBVIRT_AUTH>.
 
 Return the list of credentials requested by libvirt.  Possible
 values are a subset of the strings provided when you called
 C<guestfs_set_libvirt_supported_credentials>.
 
-See L<guestfs(3)/LIBVIRT AUTHENTICATION> for documentation and example code." };
+See L<guestfs(3)/LIBVIRT AUTHENTICATION> for documentation and example code.|} };
 
   { defaults with
     name = "get_libvirt_requested_credential_prompt"; added = (1, 19, 52);
     style = RString (RPlainString, "prompt"), [Int "index"], [];
     blocking = false;
     shortdesc = "prompt of i'th requested credential";
-    longdesc = "\
-Get the prompt (provided by libvirt) for the C<index>'th
+    longdesc = {|Get the prompt (provided by libvirt) for the C<index>'th
 requested credential.  If libvirt did not provide a prompt,
-this returns the empty string C<\"\">.
+this returns the empty string C<"">.
 
-See L<guestfs(3)/LIBVIRT AUTHENTICATION> for documentation and example code." };
+See L<guestfs(3)/LIBVIRT AUTHENTICATION> for documentation and example code.|} };
 
   { defaults with
     name = "get_libvirt_requested_credential_challenge"; added = (1, 19, 52);
     style = RString (RPlainString, "challenge"), [Int "index"], [];
     blocking = false;
     shortdesc = "challenge of i'th requested credential";
-    longdesc = "\
-Get the challenge (provided by libvirt) for the C<index>'th
+    longdesc = {|Get the challenge (provided by libvirt) for the C<index>'th
 requested credential.  If libvirt did not provide a challenge,
-this returns the empty string C<\"\">.
+this returns the empty string C<"">.
 
-See L<guestfs(3)/LIBVIRT AUTHENTICATION> for documentation and example code." };
+See L<guestfs(3)/LIBVIRT AUTHENTICATION> for documentation and example code.|} };
 
   { defaults with
     name = "get_libvirt_requested_credential_defresult"; added = (1, 19, 52);
     style = RString (RPlainString, "defresult"), [Int "index"], [];
     blocking = false;
     shortdesc = "default result of i'th requested credential";
-    longdesc = "\
-Get the default result (provided by libvirt) for the C<index>'th
+    longdesc = {|Get the default result (provided by libvirt) for the C<index>'th
 requested credential.  If libvirt did not provide a default result,
-this returns the empty string C<\"\">.
+this returns the empty string C<"">.
 
-See L<guestfs(3)/LIBVIRT AUTHENTICATION> for documentation and example code." };
+See L<guestfs(3)/LIBVIRT AUTHENTICATION> for documentation and example code.|} };
 
   { defaults with
     name = "set_libvirt_requested_credential"; added = (1, 19, 52);
@@ -1282,8 +1251,7 @@ See L<guestfs(3)/LIBVIRT AUTHENTICATION> for documentation and example code." };
     style = RErr, [], [];
     blocking = false;
     shortdesc = "parse the environment and set handle flags accordingly";
-    longdesc = "\
-Parse the program’s environment and set flags in the handle
+    longdesc = {|Parse the program’s environment and set flags in the handle
 accordingly.  For example if C<LIBGUESTFS_DEBUG=1> then the
 ‘verbose’ flag is set in the handle.
 
@@ -1293,30 +1261,28 @@ when you call C<guestfs_create>.
 See L<guestfs(3)/ENVIRONMENT VARIABLES> for a list of environment
 variables that can affect libguestfs handles.  See also
 L<guestfs(3)/guestfs_create_flags>, and
-C<guestfs_parse_environment_list>." };
+C<guestfs_parse_environment_list>.|} };
 
   { defaults with
     name = "parse_environment_list"; added = (1, 19, 53);
     style = RErr, [StringList (PlainString, "environment")], [];
     blocking = false;
     shortdesc = "parse the environment and set handle flags accordingly";
-    longdesc = "\
-Parse the list of strings in the argument C<environment>
+    longdesc = {|Parse the list of strings in the argument C<environment>
 and set flags in the handle accordingly.
 For example if C<LIBGUESTFS_DEBUG=1> is a string in the list,
 then the ‘verbose’ flag is set in the handle.
 
 This is the same as C<guestfs_parse_environment> except that
 it parses an explicit list of strings instead of the program's
-environment." };
+environment.|} };
 
   { defaults with
     name = "user_cancel"; added = (1, 11, 18);
     style = RErr, [], [];
     blocking = false; wrapper = false;
     shortdesc = "cancel the current upload or download operation";
-    longdesc = "\
-This function cancels the current upload or download operation.
+    longdesc = {|This function cancels the current upload or download operation.
 
 Unlike most other libguestfs calls, this function is signal safe and
 thread safe.  You can call it from a signal handler or from another
@@ -1341,7 +1307,7 @@ child processes don't receive the C<^C> signal).
 
 In a graphical program, when the main thread is displaying a progress
 bar with a cancel button, wire up the cancel button to call this
-function." };
+function.|} };
 
   { defaults with
     name = "add_drive_scratch"; added = (1, 23, 10);
@@ -1349,14 +1315,13 @@ function." };
     blocking = false;
     fish_alias = ["scratch"];
     shortdesc = "add a temporary scratch drive";
-    longdesc = "\
-This command adds a temporary scratch drive to the handle.  The
+    longdesc = {|This command adds a temporary scratch drive to the handle.  The
 C<size> parameter is the virtual size (in bytes).  The scratch
 drive is blank initially (all reads return zeroes until you start
 writing to it).  The drive is deleted when the handle is closed.
 
 The optional arguments C<name>, C<label> and C<blocksize> are passed through to
-C<guestfs_add_drive_opts>." };
+C<guestfs_add_drive_opts>.|} };
 
   { defaults with
     name = "journal_get"; added = (1, 23, 11);
@@ -1364,14 +1329,13 @@ C<guestfs_add_drive_opts>." };
     optional = Some "journal";
     test_excuse = "tests in tests/journal subdirectory";
     shortdesc = "read the current journal entry";
-    longdesc = "\
-Read the current journal entry.  This returns all the fields
+    longdesc = {|Read the current journal entry.  This returns all the fields
 in the journal as a set of C<(attrname, attrval)> pairs.  The
 C<attrname> is the field name (a string).
 
 The C<attrval> is the field value (a binary blob, often but
 not always a string).  Please note that C<attrval> is a byte
-array, I<not> a \\0-terminated C string.
+array, I<not> a \0-terminated C string.
 
 The length of data may be truncated to the data threshold
 (see: C<guestfs_journal_set_data_threshold>,
@@ -1379,15 +1343,14 @@ C<guestfs_journal_get_data_threshold>).
 
 If you set the data threshold to unlimited (C<0>) then this call
 can read a journal entry of any size, ie. it is not limited by
-the libguestfs protocol." };
+the libguestfs protocol.|} };
 
   { defaults with
     name = "disk_create"; added = (1, 25, 31);
     style = RErr, [String (PlainString, "filename"); String (PlainString, "format"); Int64 "size"], [OString "backingfile"; OString "backingformat"; OString "preallocation"; OString "compat"; OInt "clustersize"];
     test_excuse = "tests in tests/create subdirectory";
     shortdesc = "create a blank disk image";
-    longdesc = "\
-Create a blank disk image called F<filename> (a host file)
+    longdesc = {|Create a blank disk image called F<filename> (a host file)
 with format C<format> (usually C<raw> or C<qcow2>).
 The size is C<size> bytes.
 
@@ -1432,7 +1395,7 @@ this setting may be any power of two between 512 and 2097152.
 =back
 
 Note that this call does not add the new disk to the handle.  You
-may need to call C<guestfs_add_drive_opts> separately." };
+may need to call C<guestfs_add_drive_opts> separately.|} };
 
   { defaults with
     name = "c_pointer"; added = (1, 29, 17);
@@ -1453,20 +1416,18 @@ to allow other libraries to interwork with libguestfs." };
     style = RErr, [String (PlainString, "localpath"); String (Pathname, "remotedir")], [];
     visibility = VPublicNoFish;
     shortdesc = "copy local files or directories into an image";
-    longdesc = "\
-C<guestfs_copy_in> copies local files or directories recursively into
+    longdesc = {|C<guestfs_copy_in> copies local files or directories recursively into
 the disk image, placing them in the directory called C<remotedir>
 (which must exist).
 
-Wildcards cannot be used." };
+Wildcards cannot be used.|} };
 
   { defaults with
     name = "copy_out"; added = (1, 29, 24);
     style = RErr, [String (Pathname, "remotepath"); String (PlainString, "localdir")], [];
     visibility = VPublicNoFish;
     shortdesc = "copy remote files or directories out of an image";
-    longdesc = "\
-C<guestfs_copy_out> copies remote files or directories recursively
+    longdesc = {|C<guestfs_copy_out> copies remote files or directories recursively
 out of the disk image, placing them on the host disk in a local
 directory called C<localdir> (which must exist).
 
@@ -1474,7 +1435,7 @@ To download to the current directory, use C<.> as in:
 
  C<guestfs_copy_out> /home .
 
-Wildcards cannot be used." };
+Wildcards cannot be used.|} };
 
   { defaults with
     name = "available"; added = (1, 0, 80);
@@ -1483,8 +1444,7 @@ Wildcards cannot be used." };
       InitNone, Always, TestRun [["available"; ""]], []
     ];
     shortdesc = "test availability of some parts of the API";
-    longdesc = "\
-This command is used to check the availability of some
+    longdesc = {|This command is used to check the availability of some
 groups of functionality in the appliance, which not all builds of
 the libguestfs appliance will be able to provide.
 
@@ -1494,7 +1454,7 @@ You can also fetch this list at runtime by calling
 C<guestfs_available_all_groups>.
 
 The argument C<groups> is a list of group names, eg:
-C<[\"inotify\", \"augeas\"]> would check for the availability of
+C<["inotify", "augeas"]> would check for the availability of
 the Linux inotify functions and Augeas (configuration file
 editing) functions.
 
@@ -1547,7 +1507,7 @@ See also C<guestfs_version>.
 
 =back
 
-See also C<guestfs_filesystem_available>." };
+See also C<guestfs_filesystem_available>.|} };
 
   { defaults with
     name = "feature_available"; added = (1, 21, 26);
@@ -1589,8 +1549,7 @@ let daemon_functions = [
          ["cat"; "/new"]], "new file contents"), []
     ];
     shortdesc = "mount a guest disk at a position in the filesystem";
-    longdesc = "\
-Mount a guest disk at a position in the filesystem.  Block devices
+    longdesc = {|Mount a guest disk at a position in the filesystem.  Block devices
 are named F</dev/sda>, F</dev/sdb> and so on, as they were added to
 the guest.  If those block devices contain partitions, they will have
 the usual names (eg. F</dev/sda1>).  Also LVM F</dev/VG/LV>-style
@@ -1610,7 +1569,7 @@ C<sync> and C<noatime>.  The C<sync> option greatly slowed
 writes and caused many problems for users.  If your program
 might need to work with older versions of libguestfs, use
 C<guestfs_mount_options> instead (using an empty string for the
-first parameter if you don't want any options)." };
+first parameter if you don't want any options).|} };
 
   { defaults with
     name = "sync"; added = (0, 0, 3);
@@ -1619,12 +1578,11 @@ first parameter if you don't want any options)." };
       InitEmpty, Always, TestRun [["sync"]], []
     ];
     shortdesc = "sync disks, writes are flushed through to the disk image";
-    longdesc = "\
-This syncs the disk, so that any writes are flushed through to the
+    longdesc = {|This syncs the disk, so that any writes are flushed through to the
 underlying disk image.
 
 You should always call this if you have modified a disk image, before
-closing the handle." };
+closing the handle.|} };
 
   { defaults with
     name = "touch"; added = (0, 0, 3);
@@ -1635,25 +1593,23 @@ closing the handle." };
          ["exists"; "/touch"]]), []
     ];
     shortdesc = "update file timestamps or create a new file";
-    longdesc = "\
-Touch acts like the L<touch(1)> command.  It can be used to
+    longdesc = {|Touch acts like the L<touch(1)> command.  It can be used to
 update the timestamps on a file, or, if the file does not exist,
 to create a new zero-length file.
 
 This command only works on regular files, and will fail on other
-file types such as directories, symbolic links, block special etc." };
+file types such as directories, symbolic links, block special etc.|} };
 
   { defaults with
     name = "ll"; added = (0, 0, 4);
     style = RString (RPlainString, "listing"), [String (Pathname, "directory")], [];
     test_excuse = "tricky to test because it depends on the exact format of the 'ls -l' command, which changed between Fedora 10 and Fedora 11";
     shortdesc = "list the files in a directory (long format)";
-    longdesc = "\
-List the files in F<directory> (relative to the root directory,
+    longdesc = {|List the files in F<directory> (relative to the root directory,
 there is no cwd) in the format of C<ls -la>.
 
 This command is mostly useful for interactive sessions.  It
-is I<not> intended that you try to parse the output string." };
+is I<not> intended that you try to parse the output string.|} };
 
   { defaults with
     name = "list_devices"; added = (0, 0, 4);
@@ -1665,12 +1621,11 @@ is I<not> intended that you try to parse the output string." };
         "is_device_list (ret, 4, \"/dev/sda\", \"/dev/sdb\", \"/dev/sdc\", \"/dev/sdd\")"), []
     ];
     shortdesc = "list the block devices";
-    longdesc = "\
-List all the block devices.
+    longdesc = {|List all the block devices.
 
 The full block device names are returned, eg. F</dev/sda>.
 
-See also C<guestfs_list_filesystems>." };
+See also C<guestfs_list_filesystems>.|} };
 
   { defaults with
     name = "list_partitions"; added = (0, 0, 4);
@@ -1689,15 +1644,14 @@ See also C<guestfs_list_filesystems>." };
         "is_device_list (ret, 4, \"/dev/sda1\", \"/dev/sda2\", \"/dev/sda3\", \"/dev/sdb1\")"), []
     ];
     shortdesc = "list the partitions";
-    longdesc = "\
-List all the partitions detected on all block devices.
+    longdesc = {|List all the partitions detected on all block devices.
 
 The full partition device names are returned, eg. F</dev/sda1>
 
 This does not return logical volumes.  For that you will need to
 call C<guestfs_lvs>.
 
-See also C<guestfs_list_filesystems>." };
+See also C<guestfs_list_filesystems>.|} };
 
   { defaults with
     name = "pvs"; added = (0, 0, 4);
@@ -1718,14 +1672,13 @@ See also C<guestfs_list_filesystems>." };
         "is_device_list (ret, 3, \"/dev/sda1\", \"/dev/sda2\", \"/dev/sda3\")"), []
     ];
     shortdesc = "list the LVM physical volumes (PVs)";
-    longdesc = "\
-List all the physical volumes detected.  This is the equivalent
+    longdesc = {|List all the physical volumes detected.  This is the equivalent
 of the L<pvs(8)> command.
 
 This returns a list of just the device names that contain
 PVs (eg. F</dev/sda2>).
 
-See also C<guestfs_pvs_full>." };
+See also C<guestfs_pvs_full>.|} };
 
   { defaults with
     name = "vgs"; added = (0, 0, 4);
@@ -1748,14 +1701,13 @@ See also C<guestfs_pvs_full>." };
         "is_string_list (ret, 2, \"VG1\", \"VG2\")"), []
     ];
     shortdesc = "list the LVM volume groups (VGs)";
-    longdesc = "\
-List all the volumes groups detected.  This is the equivalent
+    longdesc = {|List all the volumes groups detected.  This is the equivalent
 of the L<vgs(8)> command.
 
 This returns a list of just the volume group names that were
 detected (eg. C<VolGroup00>).
 
-See also C<guestfs_vgs_full>." };
+See also C<guestfs_vgs_full>.|} };
 
   { defaults with
     name = "lvs"; added = (0, 0, 4);
@@ -1783,14 +1735,13 @@ See also C<guestfs_vgs_full>." };
         "is_string_list (ret, 3, \"/dev/VG1/LV1\", \"/dev/VG1/LV2\", \"/dev/VG2/LV3\")"), []
     ];
     shortdesc = "list the LVM logical volumes (LVs)";
-    longdesc = "\
-List all the logical volumes detected.  This is the equivalent
+    longdesc = {|List all the logical volumes detected.  This is the equivalent
 of the L<lvs(8)> command.
 
 This returns a list of the logical volume device names
 (eg. F</dev/VolGroup00/LogVol00>).
 
-See also C<guestfs_lvs_full>, C<guestfs_list_filesystems>." };
+See also C<guestfs_lvs_full>, C<guestfs_list_filesystems>.|} };
 
   { defaults with
     name = "pvs_full"; added = (0, 0, 4);
@@ -1919,26 +1870,24 @@ as necessary.  This is like the C<mkdir -p> shell command." };
     name = "chmod"; added = (0, 0, 8);
     style = RErr, [Int "mode"; String (Pathname, "path")], [];
     shortdesc = "change file mode";
-    longdesc = "\
-Change the mode (permissions) of C<path> to C<mode>.  Only
+    longdesc = {|Change the mode (permissions) of C<path> to C<mode>.  Only
 numeric modes are supported.
 
 I<Note>: When using this command from guestfish, C<mode>
 by default would be decimal, unless you prefix it with
 C<0> to get octal, ie. use C<0700> not C<700>.
 
-The mode actually set is affected by the umask." };
+The mode actually set is affected by the umask.|} };
 
   { defaults with
     name = "chown"; added = (0, 0, 8);
     style = RErr, [Int "owner"; Int "group"; String (Pathname, "path")], [];
     shortdesc = "change file owner and group";
-    longdesc = "\
-Change the file owner to C<owner> and group to C<group>.
+    longdesc = {|Change the file owner to C<owner> and group to C<group>.
 
 Only numeric uid and gid are supported.  If you want to use
 names, you will need to locate and parse the password file
-yourself (Augeas support makes this relatively easy)." };
+yourself (Augeas support makes this relatively easy).|} };
 
   { defaults with
     name = "exists"; added = (0, 0, 8);
@@ -1970,8 +1919,7 @@ See also C<guestfs_is_file>, C<guestfs_is_dir>, C<guestfs_stat>." };
         [["is_file"; "/abssymlink"; "true"]]), []
     ];
     shortdesc = "test if a regular file";
-    longdesc = "\
-This returns C<true> if and only if there is a regular file
+    longdesc = {|This returns C<true> if and only if there is a regular file
 with the given C<path> name.  Note that it returns false for
 other objects like directories.
 
@@ -1979,7 +1927,7 @@ If the optional flag C<followsymlinks> is true, then a symlink
 (or chain of symlinks) that ends with a file also causes the
 function to return true.
 
-See also C<guestfs_stat>." };
+See also C<guestfs_stat>.|} };
 
   { defaults with
     name = "is_dir"; added = (0, 0, 8);
@@ -1993,8 +1941,7 @@ See also C<guestfs_stat>." };
         [["is_dir"; "/directory"; ""]]), []
     ];
     shortdesc = "test if a directory";
-    longdesc = "\
-This returns C<true> if and only if there is a directory
+    longdesc = {|This returns C<true> if and only if there is a directory
 with the given C<path> name.  Note that it returns false for
 other objects like files.
 
@@ -2002,7 +1949,7 @@ If the optional flag C<followsymlinks> is true, then a symlink
 (or chain of symlinks) that ends with a directory also causes the
 function to return true.
 
-See also C<guestfs_stat>." };
+See also C<guestfs_stat>.|} };
 
   { defaults with
     name = "pvcreate"; added = (0, 0, 8);
@@ -2118,13 +2065,12 @@ contains the filesystem." };
         [["mounts"]], "is_device_list (ret, 1, \"/dev/sdb1\")"), []
     ];
     shortdesc = "show mounted filesystems";
-    longdesc = "\
-This returns the list of currently mounted filesystems.  It returns
+    longdesc = {|This returns the list of currently mounted filesystems.  It returns
 the list of devices (eg. F</dev/sda1>, F</dev/VG/LV>).
 
 Some internal mounts are not shown.
 
-See also: C<guestfs_mountpoints>" };
+See also: C<guestfs_mountpoints>|} };
 
   { defaults with
     name = "umount_all"; added = (0, 0, 8);
@@ -2184,8 +2130,7 @@ and physical volumes." };
         [["file"; "/directory"]], "directory"), []
     ];
     shortdesc = "determine file type";
-    longdesc = "\
-This call uses the standard L<file(1)> command to determine
+    longdesc = {|This call uses the standard L<file(1)> command to determine
 the type or contents of the file.
 
 This call will also transparently look inside various types
@@ -2199,7 +2144,7 @@ command and it can change in future in ways beyond our control.
 In other words, the output is not guaranteed by the ABI.
 
 See also: L<file(1)>, C<guestfs_vfs_type>, C<guestfs_lstat>,
-C<guestfs_is_file>, C<guestfs_is_blockdev> (etc), C<guestfs_is_zero>." };
+C<guestfs_is_file>, C<guestfs_is_blockdev> (etc), C<guestfs_is_zero>.|} };
 
   { defaults with
     name = "command"; added = (1, 9, 1);
@@ -2235,7 +2180,11 @@ C<guestfs_is_file>, C<guestfs_is_blockdev> (etc), C<guestfs_is_zero>." };
         [["mkdir"; "/command6"];
          ["upload"; "c-api/test-command"; "/command6/test-command"];
          ["chmod"; "0o755"; "/command6/test-command"];
-         ["command"; "/command6/test-command 6"]], "\n\nResult6\n\n"), [];
+         ["command"; "/command6/test-command 6"]], {|
+
+Result6
+
+|}), [];
       InitScratchFS, IfNotCrossAppliance, TestResultString (
         [["mkdir"; "/command7"];
          ["upload"; "c-api/test-command"; "/command7/test-command"];
@@ -2273,8 +2222,7 @@ C<guestfs_is_file>, C<guestfs_is_blockdev> (etc), C<guestfs_is_zero>." };
          ["command"; "/pwd/test-pwd"]], "/"), [];
     ];
     shortdesc = "run a command from the guest filesystem";
-    longdesc = "\
-This call runs a command from the guest filesystem.  The
+    longdesc = {|This call runs a command from the guest filesystem.  The
 filesystem must be mounted, and must contain a compatible
 operating system (ie. something Linux, with the same
 or compatible processor architecture).
@@ -2302,7 +2250,7 @@ Shared libraries and data files required by the program
 must be available on filesystems which are mounted in the
 correct places.  It is the caller’s responsibility to ensure
 all filesystems that are needed are mounted at the right
-locations." };
+locations.|} };
 
   { defaults with
     name = "command_lines"; added = (1, 9, 1);
@@ -2389,12 +2337,11 @@ See also: C<guestfs_sh_lines>" };
     progress = true; cancellable = true;
     test_excuse = "there is a separate test in the tests directory";
     shortdesc = "run a command from the guest filesystem";
-    longdesc = "\
-This is the same as C<guestfs_command>, but streams the output
+    longdesc = {|This is the same as C<guestfs_command>, but streams the output
 back, handling the case where the output from the command is
 larger than the protocol limit.
 
-See also: C<guestfs_sh_out>" };
+See also: C<guestfs_sh_out>|} };
 
   { defaults with
     name = "statvfs"; added = (1, 9, 2);
@@ -2405,12 +2352,11 @@ See also: C<guestfs_sh_out>" };
         [["statvfs"; "/"]], "ret->namemax == 255"), []
     ];
     shortdesc = "get file system statistics";
-    longdesc = "\
-Returns file system statistics for any mounted file system.
+    longdesc = {|Returns file system statistics for any mounted file system.
 C<path> should be a file or directory in the mounted file system
 (typically it is the mount point itself, but it doesn't need to be).
 
-This is the same as the L<statvfs(2)> system call." };
+This is the same as the L<statvfs(2)> system call.|} };
 
   { defaults with
     name = "tune2fs_l"; added = (1, 9, 2);
@@ -2422,14 +2368,13 @@ This is the same as the L<statvfs(2)> system call." };
           "check_hash (ret, \"Filesystem OS type\", \"Linux\") == 0"), [];
     ];
     shortdesc = "get ext2/ext3/ext4 superblock details";
-    longdesc = "\
-This returns the contents of the ext2, ext3 or ext4 filesystem
+    longdesc = {|This returns the contents of the ext2, ext3 or ext4 filesystem
 superblock on C<device>.
 
 It is the same as running C<tune2fs -l device>.  See L<tune2fs(8)>
 manpage for more details.  The list of fields returned isn't
 clearly defined, and depends on both the version of C<tune2fs>
-that libguestfs was built against, and the filesystem itself." };
+that libguestfs was built against, and the filesystem itself.|} };
 
   { defaults with
     name = "blockdev_setro"; added = (1, 9, 3);
@@ -2482,22 +2427,20 @@ This uses the L<blockdev(8)> command." };
         [["blockdev_getss"; "/dev/sda"]], "ret == 512"), []
     ];
     shortdesc = "get sectorsize of block device";
-    longdesc = "\
-This returns the size of sectors on a block device.
+    longdesc = {|This returns the size of sectors on a block device.
 Usually 512, but can be larger for modern devices.
 
 (Note, this is not the size in sectors, use C<guestfs_blockdev_getsz>
 for that).
 
-This uses the L<blockdev(8)> command." };
+This uses the L<blockdev(8)> command.|} };
 
   { defaults with
     name = "blockdev_getbsz"; added = (1, 9, 3);
     style = RInt "blocksize", [String (Device, "device")], [];
     test_excuse = "cannot be tested because output differs depending on page size";
     shortdesc = "get blocksize of block device";
-    longdesc = "\
-This returns the block size of a device.
+    longdesc = {|This returns the block size of a device.
 
 Note: this is different from both I<size in blocks> and
 I<filesystem block size>.  Also this setting is not really
@@ -2505,7 +2448,7 @@ used by anything.  You should probably not use it for
 anything.  Filesystems have their own idea about what
 block size to choose.
 
-This uses the L<blockdev(8)> command." };
+This uses the L<blockdev(8)> command.|} };
 
   { defaults with
     name = "blockdev_getsz"; added = (1, 9, 3);
@@ -2516,15 +2459,14 @@ This uses the L<blockdev(8)> command." };
           "ret == INT64_C(2)*1024*1024*1024/512"), []
     ];
     shortdesc = "get total size of device in 512-byte sectors";
-    longdesc = "\
-This returns the size of the device in units of 512-byte sectors
+    longdesc = {|This returns the size of the device in units of 512-byte sectors
 (even if the sectorsize isn't 512 bytes ... weird).
 
 See also C<guestfs_blockdev_getss> for the real sector size of
 the device, and C<guestfs_blockdev_getsize64> for the more
 useful I<size in bytes>.
 
-This uses the L<blockdev(8)> command." };
+This uses the L<blockdev(8)> command.|} };
 
   { defaults with
     name = "blockdev_getsize64"; added = (1, 9, 3);
@@ -2535,12 +2477,11 @@ This uses the L<blockdev(8)> command." };
           "ret == INT64_C(2)*1024*1024*1024"), []
     ];
     shortdesc = "get total size of device in bytes";
-    longdesc = "\
-This returns the size of the device in bytes.
+    longdesc = {|This returns the size of the device in bytes.
 
 See also C<guestfs_blockdev_getsz>.
 
-This uses the L<blockdev(8)> command." };
+This uses the L<blockdev(8)> command.|} };
 
   { defaults with
     name = "blockdev_flushbufs"; added = (1, 9, 3);
@@ -2582,13 +2523,12 @@ This uses the L<blockdev(8)> command." };
         Digest.to_hex (Digest.file "COPYING.LIB")), []
     ];
     shortdesc = "upload a file from the local machine";
-    longdesc = "\
-Upload local file F<filename> to F<remotefilename> on the
+    longdesc = {|Upload local file F<filename> to F<remotefilename> on the
 filesystem.
 
 F<filename> can also be a named pipe.
 
-See also C<guestfs_download>." };
+See also C<guestfs_download>.|} };
 
   { defaults with
     name = "download"; added = (1, 0, 2);
@@ -2605,13 +2545,12 @@ See also C<guestfs_download>." };
         Digest.to_hex (Digest.file "COPYING.LIB")), []
     ];
     shortdesc = "download a file to the local machine";
-    longdesc = "\
-Download file F<remotefilename> and save it as F<filename>
+    longdesc = {|Download file F<remotefilename> and save it as F<filename>
 on the local machine.
 
 F<filename> can also be a named pipe.
 
-See also C<guestfs_upload>, C<guestfs_cat>." };
+See also C<guestfs_upload>, C<guestfs_cat>.|} };
 
   { defaults with
     name = "checksum"; added = (1, 0, 2);
@@ -2638,8 +2577,7 @@ See also C<guestfs_upload>, C<guestfs_cat>." };
         [["checksum"; "sha512"; "/abssymlink"]], "5f57d0639bc95081c53afc63a449403883818edc64da48930ad6b1a4fb49be90404686877743fbcd7c99811f3def7df7bc22635c885c6a8cf79c806b43451c1a"), []
     ];
     shortdesc = "compute MD5, SHAx or CRC checksum of file";
-    longdesc = "\
-This call computes the MD5, SHAx or CRC checksum of the
+    longdesc = {|This call computes the MD5, SHAx or CRC checksum of the
 file named C<path>.
 
 The type of checksum to compute is given by the C<csumtype>
@@ -2689,7 +2627,7 @@ The checksum is returned as a printable string.
 
 To get the checksum for a device, use C<guestfs_checksum_device>.
 
-To get the checksums for many files, use C<guestfs_checksums_out>." };
+To get the checksums for many files, use C<guestfs_checksums_out>.|} };
 
   { defaults with
     name = "tar_in"; added = (1, 0, 3);
@@ -2711,8 +2649,7 @@ To get the checksums for many files, use C<guestfs_checksums_out>." };
          ["cat"; "/tar_in_xz/hello"]], "hello\n"), []
     ];
     shortdesc = "unpack tarfile to directory";
-    longdesc = "\
-This command uploads and unpacks local file C<tarfile> into F<directory>.
+    longdesc = {|This command uploads and unpacks local file C<tarfile> into F<directory>.
 
 The optional C<compress> flag controls compression.  If not given,
 then the input should be an uncompressed tar file.  Otherwise one
@@ -2737,7 +2674,7 @@ If set to true, SELinux contexts are restored from the tar file.
 
 If set to true, POSIX ACLs are restored from the tar file.
 
-=back" };
+=back|} };
 
   { defaults with
     name = "tar_out"; added = (1, 0, 3);
@@ -2745,8 +2682,7 @@ If set to true, POSIX ACLs are restored from the tar file.
     once_had_no_optargs = true;
     cancellable = true;
     shortdesc = "pack directory into tarfile";
-    longdesc = "\
-This command packs the contents of F<directory> and downloads
+    longdesc = {|This command packs the contents of F<directory> and downloads
 it to local file C<tarfile>.
 
 The optional C<compress> flag controls compression.  If not given,
@@ -2782,7 +2718,7 @@ If set to true, SELinux contexts are saved in the output tar.
 
 If set to true, POSIX ACLs are saved in the output tar.
 
-=back" };
+=back|} };
 
   { defaults with
     name = "mount_ro"; added = (1, 0, 10);
@@ -2809,14 +2745,13 @@ mounts the filesystem with the read-only (I<-o ro>) flag." };
     style = RErr, [String (PlainString, "options"); String (Mountable, "mountable"); String (PlainString, "mountpoint")], [];
     impl = OCaml "Mount.mount_options";
     shortdesc = "mount a guest disk with mount options";
-    longdesc = "\
-This is the same as the C<guestfs_mount> command, but it
+    longdesc = {|This is the same as the C<guestfs_mount> command, but it
 allows you to set the mount options as for the
 L<mount(8)> I<-o> flag.
 
 If the C<options> parameter is an empty string, then
 no options are passed (all options default to whatever
-the filesystem uses)." };
+the filesystem uses).|} };
 
   { defaults with
     name = "mount_vfs"; added = (1, 0, 10);
@@ -2862,12 +2797,11 @@ as for the L<mount(8)> I<-o> and I<-t> flags." };
         "is_string_list (ret, 1, \"VG\")"), []
     ];
     shortdesc = "remove an LVM logical volume";
-    longdesc = "\
-Remove an LVM logical volume C<device>, where C<device> is
+    longdesc = {|Remove an LVM logical volume C<device>, where C<device> is
 the path to the LV, such as F</dev/VG/LV>.
 
 You can also remove all LVs in a volume group by specifying
-the VG name, F</dev/VG>." };
+the VG name, F</dev/VG>.|} };
 
   { defaults with
     name = "vgremove"; added = (1, 0, 13);
@@ -2937,13 +2871,12 @@ group (if any)." };
         "is_string_list (ret, 0)"), []
     ];
     shortdesc = "remove an LVM physical volume";
-    longdesc = "\
-This wipes a physical volume C<device> so that LVM will no longer
+    longdesc = {|This wipes a physical volume C<device> so that LVM will no longer
 recognise it.
 
 The implementation uses the L<pvremove(8)> command which refuses to
 wipe physical volumes that contain any volume groups, so you have
-to remove those first." };
+to remove those first.|} };
 
   { defaults with
     name = "fsck"; added = (1, 0, 16);
@@ -2959,8 +2892,7 @@ to remove those first." };
          ["fsck"; "ext2"; "/dev/sda1"]], "ret == 8"), []
     ];
     shortdesc = "run the filesystem checker";
-    longdesc = "\
-This runs the filesystem checker (fsck) on C<device> which
+    longdesc = {|This runs the filesystem checker (fsck) on C<device> which
 should have filesystem type C<fstype>.
 
 The returned integer is the status.  See L<fsck(8)> for the
@@ -2976,7 +2908,7 @@ Multiple status codes can be summed together.
 
 =item *
 
-A non-zero return code can mean \"success\", for example if
+A non-zero return code can mean "success", for example if
 errors have been corrected on the filesystem.
 
 =item *
@@ -2986,7 +2918,7 @@ Checking or repairing NTFS volumes is not supported
 
 =back
 
-This command is entirely equivalent to running C<fsck -a -t fstype device>." };
+This command is entirely equivalent to running C<fsck -a -t fstype device>.|} };
 
   { defaults with
     name = "zero"; added = (1, 0, 16);
@@ -2998,8 +2930,7 @@ This command is entirely equivalent to running C<fsck -a -t fstype device>." };
          ["zero"; "/dev/sda1"]]), []
     ];
     shortdesc = "write zeroes to the device";
-    longdesc = "\
-This command writes zeroes over the first few blocks of C<device>.
+    longdesc = {|This command writes zeroes over the first few blocks of C<device>.
 
 How many blocks are zeroed isn't specified (but it’s I<not> enough
 to securely wipe the device).  It should be sufficient to remove
@@ -3010,7 +2941,7 @@ zeroes.  This prevents the underlying device from becoming non-sparse
 or growing unnecessarily.
 
 See also: C<guestfs_zero_device>, C<guestfs_scrub_device>,
-C<guestfs_is_zero_device>" };
+C<guestfs_is_zero_device>|} };
 
   { defaults with
     name = "grub_install"; added = (1, 0, 17);
@@ -3028,8 +2959,7 @@ C<guestfs_is_zero_device>" };
          ["is_dir"; "/boot"; ""]]), []
     ];
     shortdesc = "install GRUB 1";
-    longdesc = "\
-This command installs GRUB 1 (the Grand Unified Bootloader) on
+    longdesc = {|This command installs GRUB 1 (the Grand Unified Bootloader) on
 C<device>, with the root directory being C<root>.
 
 Notes:
@@ -3053,7 +2983,7 @@ is advisable.
 =item *
 
 If grub-install reports the error
-\"No suitable drive was found in the generated device map.\"
+"No suitable drive was found in the generated device map."
 it may be that you need to create a F</boot/grub/device.map>
 file first that contains the mapping between grub device names
 and Linux device names.  It is usually sufficient to create
@@ -3063,7 +2993,7 @@ a file containing:
 
 replacing F</dev/vda> with the name of the installation device.
 
-=back" };
+=back|} };
 
   { defaults with
     name = "cp"; added = (1, 0, 18);
@@ -3137,8 +3067,7 @@ See also: C<guestfs_rename>." };
         [["drop_caches"; "3"]]), []
     ];
     shortdesc = "drop kernel page cache, dentries and inodes";
-    longdesc = "\
-This instructs the guest kernel to drop its page cache,
+    longdesc = {|This instructs the guest kernel to drop its page cache,
 and/or dentries and inode caches.  The parameter C<whattodrop>
 tells the kernel what precisely to drop, see
 L<https://linux-mm.org/Drop_Caches>
@@ -3146,7 +3075,7 @@ L<https://linux-mm.org/Drop_Caches>
 Setting C<whattodrop> to 3 should drop everything.
 
 This automatically calls L<sync(2)> before the operation,
-so that the maximum guest memory is freed." };
+so that the maximum guest memory is freed.|} };
 
   { defaults with
     name = "dmesg"; added = (1, 0, 18);
@@ -3156,15 +3085,14 @@ so that the maximum guest memory is freed." };
         [["dmesg"]]), []
     ];
     shortdesc = "return kernel messages";
-    longdesc = "\
-This returns the kernel messages (L<dmesg(1)> output) from
+    longdesc = {|This returns the kernel messages (L<dmesg(1)> output) from
 the guest kernel.  This is sometimes useful for extended
 debugging of problems.
 
 Another way to get the same information is to enable
 verbose messages with C<guestfs_set_verbose> or by setting
 the environment variable C<LIBGUESTFS_DEBUG=1> before
-running the program." };
+running the program.|} };
 
   { defaults with
     name = "ping_daemon"; added = (1, 0, 18);
@@ -3221,13 +3149,12 @@ The external L<cmp(1)> program is used for the comparison." };
         [["strings"; "/abssymlink"]]), []
     ];
     shortdesc = "print the printable strings in a file";
-    longdesc = "\
-This runs the L<strings(1)> command on a file and returns
+    longdesc = {|This runs the L<strings(1)> command on a file and returns
 the list of printable strings found.
 
 The C<strings> command has, in the past, had problems with
 parsing untrusted files.  These are mitigated in the current
-version of libguestfs, but see L<guestfs(3)/CVE-2014-8484>." };
+version of libguestfs, but see L<guestfs(3)/CVE-2014-8484>.|} };
 
   { defaults with
     name = "strings_e"; added = (1, 0, 22);
@@ -3243,8 +3170,7 @@ version of libguestfs, but see L<guestfs(3)/CVE-2014-8484>." };
         "is_string_list (ret, 2, \"hello\", \"world\")"), []
     ];
     shortdesc = "print the printable strings in a file";
-    longdesc = "\
-This is like the C<guestfs_strings> command, but allows you to
+    longdesc = {|This is like the C<guestfs_strings> command, but allows you to
 specify the encoding of strings that are looked for in
 the source file C<path>.
 
@@ -3285,7 +3211,7 @@ The returned strings are transcoded to UTF-8.
 
 The C<strings> command has, in the past, had problems with
 parsing untrusted files.  These are mitigated in the current
-version of libguestfs, but see L<guestfs(3)/CVE-2014-8484>." };
+version of libguestfs, but see L<guestfs(3)/CVE-2014-8484>.|} };
 
   { defaults with
     name = "hexdump"; added = (1, 0, 22);
@@ -3324,8 +3250,7 @@ the human-readable, canonical hex dump of the file." };
          ["cat"; "/new"]], "test file"), []
     ];
     shortdesc = "zero unused inodes and disk blocks on ext2/3 filesystem";
-    longdesc = "\
-This runs the I<zerofree> program on C<device>.  This program
+    longdesc = {|This runs the I<zerofree> program on C<device>.  This program
 claims to zero unused inodes and disk blocks on an ext2/3
 filesystem, thus making it possible to compress the filesystem
 more effectively.
@@ -3334,7 +3259,7 @@ You should B<not> run this program if the filesystem is
 mounted.
 
 It is possible that using this program can damage the filesystem
-or data on the filesystem." };
+or data on the filesystem.|} };
 
   { defaults with
     name = "pvresize"; added = (1, 0, 26);
@@ -3359,14 +3284,13 @@ be parsed." };
     name = "sfdisk_disk_geometry"; added = (1, 0, 26);
     style = RString (RPlainString, "partitions"), [String (Device, "device")], [];
     shortdesc = "display the disk geometry from the partition table";
-    longdesc = "\
-This displays the disk geometry of C<device> read from the
+    longdesc = {|This displays the disk geometry of C<device> read from the
 partition table.  Especially in the case where the underlying
 block device has been resized, this can be different from the
 kernel’s idea of the geometry (see C<guestfs_sfdisk_kernel_geometry>).
 
 The result is in human-readable format, and not designed to
-be parsed." };
+be parsed.|} };
 
   { defaults with
     name = "vg_activate_all"; added = (1, 0, 26);
@@ -3384,14 +3308,13 @@ This command is the same as running C<vgchange -a y|n>" };
     style = RErr, [Bool "activate"; StringList (PlainString, "volgroups")], [];
     optional = Some "lvm2";
     shortdesc = "activate or deactivate some volume groups";
-    longdesc = "\
-This command activates or (if C<activate> is false) deactivates
+    longdesc = {|This command activates or (if C<activate> is false) deactivates
 all logical volumes in the listed volume groups C<volgroups>.
 
 This command is the same as running C<vgchange -a y|n volgroups...>
 
 Note that if C<volgroups> is an empty list then B<all> volume groups
-are activated or deactivated." };
+are activated or deactivated.|} };
 
   { defaults with
     name = "lvresize"; added = (1, 0, 27);
@@ -3464,8 +3387,7 @@ Sleep for C<secs> seconds." };
          ["ntfs_3g_probe"; "true"; "/dev/sda1"]], "ret == 12"), []
     ];
     shortdesc = "probe NTFS volume";
-    longdesc = "\
-This command runs the L<ntfs-3g.probe(8)> command which probes
+    longdesc = {|This command runs the L<ntfs-3g.probe(8)> command which probes
 an NTFS C<device> for mountability.  (Not all NTFS volumes can
 be mounted read-write, and some cannot be mounted at all).
 
@@ -3475,25 +3397,24 @@ you want to test if the volume can be mounted read-only.
 
 The return value is an integer which C<0> if the operation
 would succeed, or some non-zero value documented in the
-L<ntfs-3g.probe(8)> manual page." };
+L<ntfs-3g.probe(8)> manual page.|} };
 
   { defaults with
     name = "sh"; added = (1, 0, 50);
     style = RString (RPlainString, "output"), [String (PlainString, "command")], [];
     shortdesc = "run a command via the shell";
-    longdesc = "\
-This call runs a command from the guest filesystem via the
+    longdesc = {|This call runs a command from the guest filesystem via the
 guest’s F</bin/sh>.
 
 This is like C<guestfs_command>, but passes the command to:
 
- /bin/sh -c \"command\"
+ /bin/sh -c "command"
 
 Depending on the guest’s shell, this usually results in
 wildcards being expanded, shell expressions being interpolated
 and so on.
 
-All the provisos about C<guestfs_command> apply to this call." };
+All the provisos about C<guestfs_command> apply to this call.|} };
 
   { defaults with
     name = "sh_lines"; added = (1, 0, 50);
@@ -3510,12 +3431,11 @@ See also: C<guestfs_command_lines>" };
     style = RErr, [String (PlainString, "command"); String (FileOut, "output")], [];
     test_excuse = "there is a separate test in the tests directory";
     shortdesc = "run a command via the shell";
-    longdesc = "\
-This is the same as C<guestfs_sh>, but streams the output
+    longdesc = {|This is the same as C<guestfs_sh>, but streams the output
 back, handling the case where the output from the command is
 larger than the protocol limit.
 
-See also: C<guestfs_command_out>" };
+See also: C<guestfs_command_out>|} };
 
   { defaults with
     name = "glob_expand"; added = (1, 0, 50);
@@ -3553,8 +3473,7 @@ See also: C<guestfs_command_out>" };
         "is_string_list (ret, 2, \"/glob_expand4/b\", \"/glob_expand4/b1\")"), [];
     ];
     shortdesc = "expand a wildcard path";
-    longdesc = "\
-This command searches for all the pathnames matching
+    longdesc = {|This command searches for all the pathnames matching
 C<pattern> according to the wildcard expansion rules
 used by the shell.
 
@@ -3571,7 +3490,7 @@ off to return no trailing slashes in filenames of directories.
 
 Notice that there is no equivalent command for expanding a device
 name (eg. F</dev/sd*>).  Use C<guestfs_list_devices>,
-C<guestfs_list_partitions> etc functions instead." };
+C<guestfs_list_partitions> etc functions instead.|} };
 
   { defaults with
     name = "scrub_device"; added = (1, 0, 52);
@@ -3582,12 +3501,11 @@ C<guestfs_list_partitions> etc functions instead." };
         [["scrub_device"; "/dev/sdc"]]), []
     ];
     shortdesc = "scrub (securely wipe) a device";
-    longdesc = "\
-This command writes patterns over C<device> to make data retrieval
+    longdesc = {|This command writes patterns over C<device> to make data retrieval
 more difficult.
 
 It is an interface to the L<scrub(1)> program.  See that
-manual page for more details." };
+manual page for more details.|} };
 
   { defaults with
     name = "scrub_file"; added = (1, 0, 52);
@@ -3610,14 +3528,13 @@ manual page for more details." };
          ["scrub_file"; "/scrub_file_4_link"]]), [];
     ];
     shortdesc = "scrub (securely wipe) a file";
-    longdesc = "\
-This command writes patterns over a file to make data retrieval
+    longdesc = {|This command writes patterns over a file to make data retrieval
 more difficult.
 
 The file is I<removed> after scrubbing.
 
 It is an interface to the L<scrub(1)> program.  See that
-manual page for more details." };
+manual page for more details.|} };
 
   { defaults with
     name = "scrub_freespace"; added = (1, 0, 52);
@@ -3625,15 +3542,14 @@ manual page for more details." };
     optional = Some "scrub";
     tests = [] (* XXX needs testing *);
     shortdesc = "scrub (securely wipe) free space";
-    longdesc = "\
-This command creates the directory C<dir> and then fills it
+    longdesc = {|This command creates the directory C<dir> and then fills it
 with files until the filesystem is full, and scrubs the files
 as for C<guestfs_scrub_file>, and deletes them.
 The intention is to scrub any free space on the partition
 containing C<dir>.
 
 It is an interface to the L<scrub(1)> program.  See that
-manual page for more details." };
+manual page for more details.|} };
 
   { defaults with
     name = "mkdtemp"; added = (1, 0, 54);
@@ -3644,13 +3560,12 @@ manual page for more details." };
          ["mkdtemp"; "/mkdtemp/tmpXXXXXX"]]), []
     ];
     shortdesc = "create a temporary directory";
-    longdesc = "\
-This command creates a temporary directory.  The
+    longdesc = {|This command creates a temporary directory.  The
 C<tmpl> parameter should be a full pathname for the
 temporary directory name with the final six characters being
-\"XXXXXX\".
+"XXXXXX".
 
-For example: \"/tmp/myprogXXXXXX\" or \"/Temp/myprogXXXXXX\",
+For example: "/tmp/myprogXXXXXX" or "/Temp/myprogXXXXXX",
 the second one being suitable for Windows filesystems.
 
 The name of the temporary directory that was created
@@ -3662,7 +3577,7 @@ and is owned by root.
 The caller is responsible for deleting the temporary
 directory and its contents after use.
 
-See also: L<mkdtemp(3)>" };
+See also: L<mkdtemp(3)>|} };
 
   { defaults with
     name = "wc_l"; added = (1, 0, 54);
@@ -3737,14 +3652,13 @@ a list of strings." };
         "is_string_list (ret, 0)"), []
     ];
     shortdesc = "return first N lines of a file";
-    longdesc = "\
-If the parameter C<nrlines> is a positive number, this returns the first
+    longdesc = {|If the parameter C<nrlines> is a positive number, this returns the first
 C<nrlines> lines of the file C<path>.
 
 If the parameter C<nrlines> is a negative number, this returns lines
 from the file C<path>, excluding the last C<nrlines> lines.
 
-If the parameter C<nrlines> is zero, this returns an empty list." };
+If the parameter C<nrlines> is zero, this returns an empty list.|} };
 
   { defaults with
     name = "tail"; added = (1, 0, 54);
@@ -3776,39 +3690,36 @@ a list of strings." };
         "is_string_list (ret, 0)"), []
     ];
     shortdesc = "return last N lines of a file";
-    longdesc = "\
-If the parameter C<nrlines> is a positive number, this returns the last
+    longdesc = {|If the parameter C<nrlines> is a positive number, this returns the last
 C<nrlines> lines of the file C<path>.
 
 If the parameter C<nrlines> is a negative number, this returns lines
 from the file C<path>, starting with the C<-nrlines>'th line.
 
-If the parameter C<nrlines> is zero, this returns an empty list." };
+If the parameter C<nrlines> is zero, this returns an empty list.|} };
 
   { defaults with
     name = "df"; added = (1, 0, 54);
     style = RString (RPlainString, "output"), [], [];
     test_excuse = "tricky to test because it depends on the exact format of the 'df' command and other imponderables";
     shortdesc = "report file system disk space usage";
-    longdesc = "\
-This command runs the L<df(1)> command to report disk space used.
+    longdesc = {|This command runs the L<df(1)> command to report disk space used.
 
 This command is mostly useful for interactive sessions.  It
 is I<not> intended that you try to parse the output string.
-Use C<guestfs_statvfs> from programs." };
+Use C<guestfs_statvfs> from programs.|} };
 
   { defaults with
     name = "df_h"; added = (1, 0, 54);
     style = RString (RPlainString, "output"), [], [];
     test_excuse = "tricky to test because it depends on the exact format of the 'df' command and other imponderables";
     shortdesc = "report file system disk space usage (human readable)";
-    longdesc = "\
-This command runs the C<df -h> command to report disk space used
+    longdesc = {|This command runs the C<df -h> command to report disk space used
 in human-readable format.
 
 This command is mostly useful for interactive sessions.  It
 is I<not> intended that you try to parse the output string.
-Use C<guestfs_statvfs> from programs." };
+Use C<guestfs_statvfs> from programs.|} };
 
   { defaults with
     name = "du"; added = (1, 0, 54);
@@ -3819,8 +3730,7 @@ Use C<guestfs_statvfs> from programs." };
         [["du"; "/directory"]], "ret == 2" (* ISO fs blocksize is 2K *)), []
     ];
     shortdesc = "estimate file space usage";
-    longdesc = "\
-This command runs the C<du -s> command to estimate file space
+    longdesc = {|This command runs the C<du -s> command to estimate file space
 usage for C<path>.
 
 C<path> can be a file or a directory.  If C<path> is a directory
@@ -3828,7 +3738,7 @@ then the estimate includes the contents of the directory and all
 subdirectories (recursively).
 
 The result is the estimated size in I<kilobytes>
-(ie. units of 1024 bytes)." };
+(ie. units of 1024 bytes).|} };
 
   { defaults with
     name = "initrd_list"; added = (1, 0, 54);
@@ -3839,8 +3749,7 @@ The result is the estimated size in I<kilobytes>
         "is_string_list (ret, 6, \"empty\", \"known-1\", \"known-2\", \"known-3\", \"known-4\", \"known-5\")"), []
     ];
     shortdesc = "list files in an initrd";
-    longdesc = "\
-This command lists out files contained in an initrd.
+    longdesc = {|This command lists out files contained in an initrd.
 
 The files are listed without any initial F</> character.  The
 files are listed in the order they appear (not necessarily
@@ -3848,7 +3757,7 @@ alphabetical).  Directory names are listed as separate items.
 
 Old Linux kernels (2.4 and earlier) used a compressed ext2
 filesystem as initrd.  We I<only> support the newer initramfs
-format (compressed cpio files)." };
+format (compressed cpio files).|} };
 
   { defaults with
     name = "mount_loop"; added = (1, 0, 54);
@@ -3902,8 +3811,7 @@ label and/or UUID of the new swap partition." };
         "S_ISBLK (ret->mode) && (ret->mode & 0777) == 0755"), []
     ];
     shortdesc = "make block, character or FIFO devices";
-    longdesc = "\
-This call creates block or character special devices, or
+    longdesc = {|This call creates block or character special devices, or
 named pipes (FIFOs).
 
 The C<mode> parameter should be the mode, using the standard
@@ -3919,7 +3827,7 @@ C<guestfs_mknod_b>, C<guestfs_mknod_c> or C<guestfs_mkfifo>
 which are wrappers around this command which bitwise OR
 in the appropriate constant for you.
 
-The mode actually set is affected by the umask." };
+The mode actually set is affected by the umask.|} };
 
   { defaults with
     name = "mkfifo"; added = (1, 0, 55);
@@ -3934,15 +3842,14 @@ The mode actually set is affected by the umask." };
         [["mkfifo"; "0o20777"; "/mkfifo-2"]]), [];
     ];
     shortdesc = "make FIFO (named pipe)";
-    longdesc = "\
-This call creates a FIFO (named pipe) called C<path> with
+    longdesc = {|This call creates a FIFO (named pipe) called C<path> with
 mode C<mode>.  It is just a convenient wrapper around
 C<guestfs_mknod>.
 
 Unlike with C<guestfs_mknod>, C<mode> B<must> contain only permissions
 bits.
 
-The mode actually set is affected by the umask." };
+The mode actually set is affected by the umask.|} };
 
   { defaults with
     name = "mknod_b"; added = (1, 0, 55);
@@ -3957,15 +3864,14 @@ The mode actually set is affected by the umask." };
         [["mknod_b"; "0o10777"; "99"; "66"; "/mknod_b-2"]]), [];
     ];
     shortdesc = "make block device node";
-    longdesc = "\
-This call creates a block device node called C<path> with
+    longdesc = {|This call creates a block device node called C<path> with
 mode C<mode> and device major/minor C<devmajor> and C<devminor>.
 It is just a convenient wrapper around C<guestfs_mknod>.
 
 Unlike with C<guestfs_mknod>, C<mode> B<must> contain only permissions
 bits.
 
-The mode actually set is affected by the umask." };
+The mode actually set is affected by the umask.|} };
 
   { defaults with
     name = "mknod_c"; added = (1, 0, 55);
@@ -3980,15 +3886,14 @@ The mode actually set is affected by the umask." };
         [["mknod_c"; "0o20777"; "99"; "66"; "/mknod_c-2"]]), [];
     ];
     shortdesc = "make char device node";
-    longdesc = "\
-This call creates a char device node called C<path> with
+    longdesc = {|This call creates a char device node called C<path> with
 mode C<mode> and device major/minor C<devmajor> and C<devminor>.
 It is just a convenient wrapper around C<guestfs_mknod>.
 
 Unlike with C<guestfs_mknod>, C<mode> B<must> contain only permissions
 bits.
 
-The mode actually set is affected by the umask." };
+The mode actually set is affected by the umask.|} };
 
   { defaults with
     name = "umask"; added = (1, 0, 55);
@@ -3999,14 +3904,13 @@ The mode actually set is affected by the umask." };
         [["umask"; "0o22"]], "ret == 022"), []
     ];
     shortdesc = "set file mode creation mask (umask)";
-    longdesc = "\
-This function sets the mask used for creating new files and
+    longdesc = {|This function sets the mask used for creating new files and
 device nodes to C<mask & 0777>.
 
 Typical umask values would be C<022> which creates new files
-with permissions like \"-rw-r--r--\" or \"-rwxr-xr-x\", and
+with permissions like "-rw-r--r--" or "-rwxr-xr-x", and
 C<002> which creates new files with permissions like
-\"-rw-rw-r--\" or \"-rwxrwxr-x\".
+"-rw-rw-r--" or "-rwxrwxr-x".
 
 The default umask is C<022>.  This is important because it
 means that directories and device nodes will be created with
@@ -4015,21 +3919,20 @@ C<0644> or C<0755> mode even if you specify C<0777>.
 See also C<guestfs_get_umask>,
 L<umask(2)>, C<guestfs_mknod>, C<guestfs_mkdir>.
 
-This call returns the previous umask." };
+This call returns the previous umask.|} };
 
   { defaults with
     name = "getxattrs"; added = (1, 0, 59);
     style = RStructList ("xattrs", "xattr"), [String (Pathname, "path")], [];
     optional = Some "linuxxattrs";
     shortdesc = "list extended attributes of a file or directory";
-    longdesc = "\
-This call lists the extended attributes of the file or directory
+    longdesc = {|This call lists the extended attributes of the file or directory
 C<path>.
 
 At the system call level, this is a combination of the
 L<listxattr(2)> and L<getxattr(2)> calls.
 
-See also: C<guestfs_lgetxattrs>, L<attr(5)>." };
+See also: C<guestfs_lgetxattrs>, L<attr(5)>.|} };
 
   { defaults with
     name = "lgetxattrs"; added = (1, 0, 59);
@@ -4048,12 +3951,11 @@ of the link itself." };
                    String (Pathname, "path")], [];
     optional = Some "linuxxattrs";
     shortdesc = "set extended attribute of a file or directory";
-    longdesc = "\
-This call sets the extended attribute named C<xattr>
+    longdesc = {|This call sets the extended attribute named C<xattr>
 of the file C<path> to the value C<val> (of length C<vallen>).
 The value is arbitrary 8 bit data.
 
-See also: C<guestfs_lsetxattr>, L<attr(5)>." };
+See also: C<guestfs_lsetxattr>, L<attr(5)>.|} };
 
   { defaults with
     name = "lsetxattr"; added = (1, 0, 59);
@@ -4106,8 +4008,7 @@ device name to directory where the device is mounted." };
      *)
     style = RErr, [String (PlainString, "exemptpath")], [];
     shortdesc = "create a mountpoint";
-    longdesc = "\
-C<guestfs_mkmountpoint> and C<guestfs_rmmountpoint> are
+    longdesc = {|C<guestfs_mkmountpoint> and C<guestfs_rmmountpoint> are
 specialized calls that can be used to create extra mountpoints
 before mounting the first filesystem.
 
@@ -4115,7 +4016,7 @@ These calls are I<only> necessary in some very limited circumstances,
 mainly the case where you want to mount a mix of unrelated and/or
 read-only filesystems together.
 
-For example, live CDs often contain a \"Russian doll\" nest of
+For example, live CDs often contain a "Russian doll" nest of
 filesystems, an ISO outer layer, with a squashfs image inside, with
 an ext2/3 image inside that.  You can unpack this as follows
 in guestfish:
@@ -4144,7 +4045,7 @@ For more details see L<https://bugzilla.redhat.com/show_bug.cgi?id=599503>
 
 Autosync [see C<guestfs_set_autosync>, this is set by default on
 handles] can cause C<guestfs_umount_all> to be called when the handle
-is closed which can also trigger these issues." };
+is closed which can also trigger these issues.|} };
 
   { defaults with
     name = "rmmountpoint"; added = (1, 0, 62);
@@ -4205,8 +4106,7 @@ for full details." };
         "is_string_list (ret, 3, \"abc\", \"abc123\", \"ABC\")"), []
     ];
     shortdesc = "return lines matching a pattern";
-    longdesc = "\
-This calls the external L<grep(1)> program and returns the
+    longdesc = {|This calls the external L<grep(1)> program and returns the
 matching lines.
 
 The optional flags are:
@@ -4232,7 +4132,7 @@ Match case-insensitive.  This is the same as using the I<-i> flag.
 Use L<zgrep(1)> instead of L<grep(1)>.  This allows the input to be
 compress- or gzip-compressed.
 
-=back" };
+=back|} };
 
   { defaults with
     name = "realpath"; added = (1, 0, 66);
@@ -4325,8 +4225,7 @@ This command reads the target of a symbolic link." };
          ["swapoff_device"; "/dev/sda1"]]), []
     ];
     shortdesc = "enable swap on device";
-    longdesc = "\
-This command enables the libguestfs appliance to use the
+    longdesc = {|This command enables the libguestfs appliance to use the
 swap device or partition named C<device>.  The increased
 memory is made available for all commands, for example
 those run using C<guestfs_command> or C<guestfs_sh>.
@@ -4336,7 +4235,7 @@ partitions unless you know what you are doing.  They may
 contain hibernation information, or other information that
 the guest doesn't want you to trash.  You also risk leaking
 information about the host to the guest this way.  Instead,
-attach a new host device to the guest and swap on that." };
+attach a new host device to the guest and swap on that.|} };
 
   { defaults with
     name = "swapoff_device"; added = (1, 0, 66);
@@ -4444,8 +4343,7 @@ file.  To create the file itself, use something like C<guestfs_fallocate>." };
         [["inotify_init"; "0"]]), []
     ];
     shortdesc = "create an inotify handle";
-    longdesc = "\
-This command creates a new inotify handle.
+    longdesc = {|This command creates a new inotify handle.
 The inotify subsystem can be used to notify events which happen to
 objects in the guest filesystem.
 
@@ -4477,7 +4375,7 @@ watches automatically.
 See also L<inotify(7)> for an overview of the inotify interface
 as exposed by the Linux kernel, which is roughly what we expose
 via libguestfs.  Note that there is one global inotify handle
-per libguestfs instance." };
+per libguestfs instance.|} };
 
   { defaults with
     name = "inotify_add_watch"; added = (1, 0, 66);
@@ -4494,8 +4392,7 @@ per libguestfs instance." };
         "is_string_list (ret, 2, \"a\", \"b\")"), []
     ];
     shortdesc = "add an inotify watch";
-    longdesc = "\
-Watch C<path> for the events listed in C<mask>.
+    longdesc = {|Watch C<path> for the events listed in C<mask>.
 
 Note that if C<path> is a directory then events within that
 directory are watched, but this does I<not> happen recursively
@@ -4503,7 +4400,7 @@ directory are watched, but this does I<not> happen recursively
 
 Note for non-C or non-Linux callers: the inotify events are
 defined by the Linux kernel ABI and are listed in
-F</usr/include/sys/inotify.h>." };
+F</usr/include/sys/inotify.h>.|} };
 
   { defaults with
     name = "inotify_rm_watch"; added = (1, 0, 66);
@@ -4519,8 +4416,7 @@ See C<guestfs_inotify_add_watch>." };
     style = RStructList ("events", "inotify_event"), [], [];
     optional = Some "inotify";
     shortdesc = "return list of inotify events";
-    longdesc = "\
-Return the complete queue of events that have happened
+    longdesc = {|Return the complete queue of events that have happened
 since the previous read call.
 
 If no events have happened, this returns an empty list.
@@ -4529,7 +4425,7 @@ I<Note>: In order to make sure that all events have been
 read, you must call this function repeatedly until it
 returns an empty list.  The reason is that the call will
 read events up to the maximum appliance-to-host message
-size and leave remaining events in the queue." };
+size and leave remaining events in the queue.|} };
 
   { defaults with
     name = "inotify_files"; added = (1, 0, 66);
@@ -4572,13 +4468,12 @@ This loads a kernel module in the appliance." };
         [["echo_daemon"; ""]], ""), [];
     ];
     shortdesc = "echo arguments back to the client";
-    longdesc = "\
-This command concatenates the list of C<words> passed with single spaces
+    longdesc = {|This command concatenates the list of C<words> passed with single spaces
 between them and returns the resulting string.
 
 You can use this command to test the connection through to the daemon.
 
-See also C<guestfs_ping_daemon>." };
+See also C<guestfs_ping_daemon>.|} };
 
   { defaults with
     name = "find0"; added = (1, 0, 74);
@@ -4586,8 +4481,7 @@ See also C<guestfs_ping_daemon>." };
     cancellable = true;
     test_excuse = "there is a regression test for this";
     shortdesc = "find all files and directories, returning NUL-separated list";
-    longdesc = "\
-This command lists out all files and directories, recursively,
+    longdesc = {|This command lists out all files and directories, recursively,
 starting at F<directory>, placing the resulting list in the
 external file called F<files>.
 
@@ -4603,13 +4497,13 @@ The resulting list is written to an external file.
 =item *
 
 Items (filenames) in the result are separated
-by C<\\0> characters.  See L<find(1)> option I<-print0>.
+by C<\0> characters.  See L<find(1)> option I<-print0>.
 
 =item *
 
 The result list is not sorted.
 
-=back" };
+=back|} };
 
   { defaults with
     name = "case_sensitive_path"; added = (1, 0, 75);
@@ -4644,8 +4538,7 @@ The result list is not sorted.
          ["case_sensitive_path"; "/case_SENSITIVE_path4/new_file"]], "/case_sensitive_path4/new_file"), []
     ];
     shortdesc = "return true path on case-insensitive filesystem";
-    longdesc = "\
-This can be used to resolve case insensitive paths on
+    longdesc = {|This can be used to resolve case insensitive paths on
 a filesystem which is case sensitive.  The use case is
 to resolve paths which you have read from Windows configuration
 files or the Windows Registry, to the true path.
@@ -4656,7 +4549,7 @@ the underlying filesystem is case-insensitive, the driver
 exports the filesystem to Linux as case-sensitive.
 
 One consequence of this is that special directories such
-as F<C:\\windows> may appear as F</WINDOWS> or F</windows>
+as F<C:\windows> may appear as F</WINDOWS> or F</windows>
 (or other things) depending on the precise details of how
 they were created.  In Windows itself this would not be
 a problem.
@@ -4669,19 +4562,19 @@ each element in the path. It will return a resolved path if either the
 full path or its parent directory exists. If the parent directory
 exists but the full path does not, the case of the parent directory
 will be correctly resolved, and the remainder appended unmodified. For
-example, if the file C<\"/Windows/System32/netkvm.sys\"> exists:
+example, if the file C<"/Windows/System32/netkvm.sys"> exists:
 
 =over 4
 
-=item C<guestfs_case_sensitive_path> (\"/windows/system32/netkvm.sys\")
+=item C<guestfs_case_sensitive_path> ("/windows/system32/netkvm.sys")
 
-\"Windows/System32/netkvm.sys\"
+"Windows/System32/netkvm.sys"
 
-=item C<guestfs_case_sensitive_path> (\"/windows/system32/NoSuchFile\")
+=item C<guestfs_case_sensitive_path> ("/windows/system32/NoSuchFile")
 
-\"Windows/System32/NoSuchFile\"
+"Windows/System32/NoSuchFile"
 
-=item C<guestfs_case_sensitive_path> (\"/windows/system33/netkvm.sys\")
+=item C<guestfs_case_sensitive_path> ("/windows/system33/netkvm.sys")
 
 I<ERROR>
 
@@ -4694,7 +4587,7 @@ be used to check for the existence of a file.
 I<Note>:
 This function does not handle drive names, backslashes etc.
 
-See also C<guestfs_realpath>." };
+See also C<guestfs_realpath>.|} };
 
   { defaults with
     name = "vfs_type"; added = (1, 0, 75);
@@ -4705,14 +4598,13 @@ See also C<guestfs_realpath>." };
         [["vfs_type"; "/dev/sdb1"]], "ext2"), []
     ];
     shortdesc = "get the Linux VFS type corresponding to a mounted device";
-    longdesc = "\
-This command gets the filesystem type corresponding to
+    longdesc = {|This command gets the filesystem type corresponding to
 the filesystem on C<mountable>.
 
 For most filesystems, the result is the name of the Linux
 VFS module which would be used to mount this filesystem
 if you mounted it without specifying the filesystem type.
-For example a string such as C<ext3> or C<ntfs>." };
+For example a string such as C<ext3> or C<ntfs>.|} };
 
   { defaults with
     name = "truncate"; added = (1, 0, 77);
@@ -4738,15 +4630,14 @@ file must exist already." };
          ["stat"; "/truncate_size"]], "ret->size == 1000"), []
     ];
     shortdesc = "truncate a file to a particular size";
-    longdesc = "\
-This command truncates C<path> to size C<size> bytes.  The file
+    longdesc = {|This command truncates C<path> to size C<size> bytes.  The file
 must exist already.
 
 If the current file size is less than C<size> then
 the file is extended to the required size with zero bytes.
 This creates a sparse file (ie. disk blocks are not allocated
 for the file until you write to it).  To create a non-sparse
-file of zeroes, use C<guestfs_fallocate64> instead." };
+file of zeroes, use C<guestfs_fallocate64> instead.|} };
 
   { defaults with
     name = "utimens"; added = (1, 0, 77);
@@ -4779,8 +4670,7 @@ file of zeroes, use C<guestfs_fallocate64> instead." };
          ["stat"; "/utimens-char"]], "ret->mtime == 9876"), []
     ];
     shortdesc = "set timestamp of a file with nanosecond precision";
-    longdesc = "\
-This command sets the timestamps of a file with nanosecond
+    longdesc = {|This command sets the timestamps of a file with nanosecond
 precision.
 
 C<atsecs>, C<atnsecs> are the last access time (atime) in secs and
@@ -4795,7 +4685,7 @@ C<*secs> field is ignored in this case).
 
 If the C<*nsecs> field contains the special value C<-2> then
 the corresponding timestamp is left unchanged.  (The
-C<*secs> field is ignored in this case)." };
+C<*secs> field is ignored in this case).|} };
 
   { defaults with
     name = "mkdir_mode"; added = (1, 0, 77);
@@ -4807,28 +4697,26 @@ C<*secs> field is ignored in this case)." };
         "S_ISDIR (ret->mode) && (ret->mode & 0777) == 0111"), []
     ];
     shortdesc = "create a directory with a particular mode";
-    longdesc = "\
-This command creates a directory, setting the initial permissions
+    longdesc = {|This command creates a directory, setting the initial permissions
 of the directory to C<mode>.
 
 For common Linux filesystems, the actual mode which is set will
 be C<mode & ~umask & 01777>.  Non-native-Linux filesystems may
 interpret the mode in other ways.
 
-See also C<guestfs_mkdir>, C<guestfs_umask>" };
+See also C<guestfs_mkdir>, C<guestfs_umask>|} };
 
   { defaults with
     name = "lchown"; added = (1, 0, 77);
     style = RErr, [Int "owner"; Int "group"; String (Pathname, "path")], [];
     shortdesc = "change file owner and group";
-    longdesc = "\
-Change the file owner to C<owner> and group to C<group>.
+    longdesc = {|Change the file owner to C<owner> and group to C<group>.
 This is like C<guestfs_chown> but if C<path> is a symlink then
 the link itself is changed, not the target.
 
 Only numeric uid and gid are supported.  If you want to use
 names, you will need to locate and parse the password file
-yourself (Augeas support makes this relatively easy)." };
+yourself (Augeas support makes this relatively easy).|} };
 
   { defaults with
     name = "internal_lxattrlist"; added = (1, 19, 32);
@@ -4836,8 +4724,7 @@ yourself (Augeas support makes this relatively easy)." };
     visibility = VInternal;
     optional = Some "linuxxattrs";
     shortdesc = "lgetxattr on multiple files";
-    longdesc = "\
-This call allows you to get the extended attributes
+    longdesc = {|This call allows you to get the extended attributes
 of multiple files, where all files are in the directory C<path>.
 C<names> is the list of files from this directory.
 
@@ -4847,7 +4734,7 @@ C<attrname>.  C<attrval> in this struct is zero-length
 to indicate there was an error doing C<lgetxattr> for this
 file, I<or> is a C string which is a decimal number
 (the number of following attributes for this file, which could
-be C<\"0\">).  Then after the first xattr struct are the
+be C<"0">).  Then after the first xattr struct are the
 zero or more attributes for the first named file.
 This repeats for the second and subsequent files.
 
@@ -4857,15 +4744,14 @@ See also C<guestfs_lstatlist> for a similarly efficient call
 for getting standard stats.  Very long directory listings
 might cause the protocol message size to be exceeded, causing
 this call to fail.  The caller must split up such requests
-into smaller groups of names." };
+into smaller groups of names.|} };
 
   { defaults with
     name = "internal_readlinklist"; added = (1, 19, 32);
     style = RStringList (RPlainString, "links"), [String (Pathname, "path"); StringList (Filename, "names")], [];
     visibility = VInternal;
     shortdesc = "readlink on multiple files";
-    longdesc = "\
-This call allows you to do a C<readlink> operation
+    longdesc = {|This call allows you to do a C<readlink> operation
 on multiple files, where all files are in the directory C<path>.
 C<names> is the list of files from this directory.
 
@@ -4874,7 +4760,7 @@ correspondence to the C<names> list.  Each string is the
 value of the symbolic link.
 
 If the L<readlink(2)> operation fails on any name, then
-the corresponding result string is the empty string C<\"\">.
+the corresponding result string is the empty string C<"">.
 However the whole operation is completed even if there
 were L<readlink(2)> errors, and so you can call this
 function with names where you don't know if they are
@@ -4885,7 +4771,7 @@ list a directory contents without making many round-trips.
 Very long directory listings might cause the protocol
 message size to be exceeded, causing
 this call to fail.  The caller must split up such requests
-into smaller groups of names." };
+into smaller groups of names.|} };
 
   { defaults with
     name = "pread"; added = (1, 0, 77);
@@ -4900,14 +4786,13 @@ into smaller groups of names." };
         "compare_buffers (ret, size, NULL, 0) == 0"), []
     ];
     shortdesc = "read part of a file";
-    longdesc = "\
-This command lets you read part of a file.  It reads C<count>
+    longdesc = {|This command lets you read part of a file.  It reads C<count>
 bytes of the file, starting at C<offset>, from file C<path>.
 
 This may read fewer bytes than requested.  For further details
 see the L<pread(2)> system call.
 
-See also C<guestfs_pwrite>, C<guestfs_pread_device>." };
+See also C<guestfs_pwrite>, C<guestfs_pread_device>.|} };
 
   { defaults with
     name = "part_init"; added = (1, 0, 78);
@@ -4917,8 +4802,7 @@ See also C<guestfs_pwrite>, C<guestfs_pread_device>." };
         [["part_init"; "/dev/sda"; "gpt"]]), []
     ];
     shortdesc = "create an empty partition table";
-    longdesc = "\
-This creates an empty partition table on C<device> of one of the
+    longdesc = {|This creates an empty partition table on C<device> of one of the
 partition types listed below.  Usually C<parttype> should be
 either C<msdos> or C<gpt> (for large disks).
 
@@ -4943,7 +4827,7 @@ compatibility with the C<mbr> format.
 
 =item C<msdos>
 
-The standard PC \"Master Boot Record\" (MBR) format used
+The standard PC "Master Boot Record" (MBR) format used
 by MS-DOS and Windows.  This partition type will B<only> work
 for device sizes up to 2 TB.  For large disks we recommend
 using C<gpt>.
@@ -4963,7 +4847,7 @@ AIX disk labels.
 
 =item C<rdb>
 
-Amiga \"Rigid Disk Block\" format.
+Amiga "Rigid Disk Block" format.
 
 =item C<bsd>
 
@@ -4989,7 +4873,7 @@ NEC PC-98 format, common in Japan apparently.
 
 Sun disk labels.
 
-=back" };
+=back|} };
 
   { defaults with
     name = "part_add"; added = (1, 0, 78);
@@ -5010,8 +4894,7 @@ Sun disk labels.
          ["part_add"; "/dev/sda"; "primary"; "512"; "-1"]]), []
     ];
     shortdesc = "add a partition to the device";
-    longdesc = "\
-This command adds a partition to C<device>.  If there is no partition
+    longdesc = {|This command adds a partition to C<device>.  If there is no partition
 table on the device, call C<guestfs_part_init> first.
 
 The C<prlogex> parameter is the type of partition.  Normally you
@@ -5024,7 +4907,7 @@ in I<sectors>.  C<endsect> may be negative, which means it counts
 backwards from the end of the disk (C<-1> is the last sector).
 
 Creating a partition which covers the whole disk is not so easy.
-Use C<guestfs_part_disk> to do that." };
+Use C<guestfs_part_disk> to do that.|} };
 
   { defaults with
     name = "part_disk"; added = (1, 0, 78);
@@ -5036,13 +4919,12 @@ Use C<guestfs_part_disk> to do that." };
         [["part_disk"; "/dev/sda"; "gpt"]]), []
     ];
     shortdesc = "partition whole disk with a single primary partition";
-    longdesc = "\
-This command is simply a combination of C<guestfs_part_init>
+    longdesc = {|This command is simply a combination of C<guestfs_part_init>
 followed by C<guestfs_part_add> to create a single primary partition
 covering the whole disk.
 
 C<parttype> is the partition table type, usually C<mbr> or C<gpt>,
-but other possible values are described in C<guestfs_part_init>." };
+but other possible values are described in C<guestfs_part_init>.|} };
 
   { defaults with
     name = "part_set_bootable"; added = (1, 0, 78);
@@ -5053,13 +4935,12 @@ but other possible values are described in C<guestfs_part_init>." };
          ["part_set_bootable"; "/dev/sda"; "1"; "true"]]), []
     ];
     shortdesc = "make a partition bootable";
-    longdesc = "\
-This sets the bootable flag on partition numbered C<partnum> on
+    longdesc = {|This sets the bootable flag on partition numbered C<partnum> on
 device C<device>.  Note that partitions are numbered from 1.
 
 The bootable flag is used by some operating systems (notably
 Windows) to determine which partition to boot from.  It is by
-no means universally recognized." };
+no means universally recognized.|} };
 
   { defaults with
     name = "part_set_name"; added = (1, 0, 78);
@@ -5070,12 +4951,11 @@ no means universally recognized." };
          ["part_set_name"; "/dev/sda"; "1"; "thepartname"]]), []
     ];
     shortdesc = "set partition name";
-    longdesc = "\
-This sets the partition name on partition numbered C<partnum> on
+    longdesc = {|This sets the partition name on partition numbered C<partnum> on
 device C<device>.  Note that partitions are numbered from 1.
 
 The partition name can only be set on certain types of partition
-table.  This works on C<gpt> but not on C<mbr> partitions." };
+table.  This works on C<gpt> but not on C<mbr> partitions.|} };
 
   { defaults with
     name = "part_list"; added = (1, 0, 78);
@@ -5083,8 +4963,7 @@ table.  This works on C<gpt> but not on C<mbr> partitions." };
     impl = OCaml "Parted.part_list";
     tests = [] (* XXX Add a regression test for this. *);
     shortdesc = "list partitions on a device";
-    longdesc = "\
-This command parses the partition table on C<device> and
+    longdesc = {|This command parses the partition table on C<device> and
 returns the list of partitions found.
 
 The fields in the returned structure are:
@@ -5108,7 +4987,7 @@ End of the partition in bytes.
 
 Size of the partition in bytes.
 
-=back" };
+=back|} };
 
   { defaults with
     name = "part_get_parttype"; added = (1, 0, 78);
@@ -5120,14 +4999,13 @@ Size of the partition in bytes.
          ["part_get_parttype"; "/dev/sda"]], "gpt"), []
     ];
     shortdesc = "get the partition table type";
-    longdesc = "\
-This command examines the partition table on C<device> and
+    longdesc = {|This command examines the partition table on C<device> and
 returns the partition table type (format) being used.
 
 Common return values include: C<msdos> (a DOS/Windows style MBR
 partition table), C<gpt> (a GPT/EFI-style partition table).  Other
 values are possible, although unusual.  See C<guestfs_part_init>
-for a full list." };
+for a full list.|} };
 
   { defaults with
     name = "fill"; added = (1, 0, 79);
@@ -5140,15 +5018,14 @@ for a full list." };
         "compare_buffers (ret, size, \"cccccccccc\", 10) == 0"), []
     ];
     shortdesc = "fill a file with octets";
-    longdesc = "\
-This command creates a new file called C<path>.  The initial
+    longdesc = {|This command creates a new file called C<path>.  The initial
 content of the file is C<len> octets of C<c>, where C<c>
 must be a number in the range C<[0..255]>.
 
 To fill a file with zero bytes (sparsely), it is
 much more efficient to use C<guestfs_truncate_size>.
 To create a file with a pattern of repeating bytes
-use C<guestfs_fill_pattern>." };
+use C<guestfs_fill_pattern>.|} };
 
   { defaults with
     name = "filesize"; added = (1, 0, 82);
@@ -5159,12 +5036,11 @@ use C<guestfs_fill_pattern>." };
          ["filesize"; "/filesize"]], "ret == 12"), []
     ];
     shortdesc = "return the size of the file in bytes";
-    longdesc = "\
-This command returns the size of F<file> in bytes.
+    longdesc = {|This command returns the size of F<file> in bytes.
 
 To get other stats about a file, use C<guestfs_stat>, C<guestfs_lstat>,
 C<guestfs_is_dir>, C<guestfs_is_file> etc.
-To get the size of block devices, use C<guestfs_blockdev_getsize64>." };
+To get the size of block devices, use C<guestfs_blockdev_getsize64>.|} };
 
   { defaults with
     name = "lvrename"; added = (1, 0, 83);
@@ -5206,8 +5082,7 @@ Rename a volume group C<volgroup> with the new name C<newvolgroup>." };
         "compare_buffers (ret, size, \"abc\\ndef\\nghi\", 11) == 0"), []
     ];
     shortdesc = "list the contents of a single file in an initrd";
-    longdesc = "\
-This command unpacks the file F<filename> from the initrd file
+    longdesc = {|This command unpacks the file F<filename> from the initrd file
 called F<initrdpath>.  The filename must be given I<without> the
 initial F</> character.
 
@@ -5217,7 +5092,7 @@ contained in a Linux initrd or initramfs image:
 
  initrd-cat /boot/initrd-<version>.img init
 
-See also C<guestfs_initrd_list>." };
+See also C<guestfs_initrd_list>.|} };
 
   { defaults with
     name = "pvuuid"; added = (1, 0, 87);
@@ -5244,27 +5119,25 @@ This command returns the UUID of the LVM LV C<device>." };
     name = "vgpvuuids"; added = (1, 0, 87);
     style = RStringList (RPlainString, "uuids"), [String (PlainString, "vgname")], [];
     shortdesc = "get the PV UUIDs containing the volume group";
-    longdesc = "\
-Given a VG called C<vgname>, this returns the UUIDs of all
+    longdesc = {|Given a VG called C<vgname>, this returns the UUIDs of all
 the physical volumes that this volume group resides on.
 
 You can use this along with C<guestfs_pvs> and C<guestfs_pvuuid>
 calls to associate physical volumes and volume groups.
 
-See also C<guestfs_vglvuuids>." };
+See also C<guestfs_vglvuuids>.|} };
 
   { defaults with
     name = "vglvuuids"; added = (1, 0, 87);
     style = RStringList (RPlainString, "uuids"), [String (PlainString, "vgname")], [];
     shortdesc = "get the LV UUIDs of all LVs in the volume group";
-    longdesc = "\
-Given a VG called C<vgname>, this returns the UUIDs of all
+    longdesc = {|Given a VG called C<vgname>, this returns the UUIDs of all
 the logical volumes created in this volume group.
 
 You can use this along with C<guestfs_lvs> and C<guestfs_lvuuid>
 calls to associate logical volumes and volume groups.
 
-See also C<guestfs_vgpvuuids>." };
+See also C<guestfs_vgpvuuids>.|} };
 
   { defaults with
     name = "zero_device"; added = (1, 3, 1);
@@ -5275,14 +5148,13 @@ See also C<guestfs_vgpvuuids>." };
         [["zero_device"; "/dev/VG/LV"]]), []
     ];
     shortdesc = "write zeroes to an entire device";
-    longdesc = "\
-This command writes zeroes over the entire C<device>.  Compare
+    longdesc = {|This command writes zeroes over the entire C<device>.  Compare
 with C<guestfs_zero> which just zeroes the first few blocks of
 a device.
 
 If blocks are already zero, then this command avoids writing
 zeroes.  This prevents the underlying device from becoming non-sparse
-or growing unnecessarily." };
+or growing unnecessarily.|} };
 
   { defaults with
     name = "part_del"; added = (1, 3, 2);
@@ -5294,12 +5166,11 @@ or growing unnecessarily." };
          ["part_del"; "/dev/sda"; "1"]]), []
     ];
     shortdesc = "delete a partition";
-    longdesc = "\
-This command deletes the partition numbered C<partnum> on C<device>.
+    longdesc = {|This command deletes the partition numbered C<partnum> on C<device>.
 
 Note that in the case of MBR partitioning, deleting an
 extended partition also deletes any logical partitions
-it contains." };
+it contains.|} };
 
   { defaults with
     name = "part_get_bootable"; added = (1, 3, 2);
@@ -5331,28 +5202,26 @@ See also C<guestfs_part_set_bootable>." };
          ["part_get_mbr_id"; "/dev/sda"; "1"]], "ret == 0x7f"), []
     ];
     shortdesc = "get the MBR type byte (ID byte) from a partition";
-    longdesc = "\
-Returns the MBR type byte (also known as the ID byte) from
+    longdesc = {|Returns the MBR type byte (also known as the ID byte) from
 the numbered partition C<partnum>.
 
 Note that only MBR (old DOS-style) partitions have type bytes.
 You will get undefined results for other partition table
-types (see C<guestfs_part_get_parttype>)." };
+types (see C<guestfs_part_get_parttype>).|} };
 
   { defaults with
     name = "part_set_mbr_id"; added = (1, 3, 2);
     style = RErr, [String (Device, "device"); Int "partnum"; Int "idbyte"], [];
     shortdesc = "set the MBR type byte (ID byte) of a partition";
-    longdesc = "\
-Sets the MBR type byte (also known as the ID byte) of
+    longdesc = {|Sets the MBR type byte (also known as the ID byte) of
 the numbered partition C<partnum> to C<idbyte>.  Note
 that the type bytes quoted in most documentation are
 in fact hexadecimal numbers, but usually documented
-without any leading \"0x\" which might be confusing.
+without any leading "0x" which might be confusing.
 
 Note that only MBR (old DOS-style) partitions have type bytes.
 You will get undefined results for other partition table
-types (see C<guestfs_part_get_parttype>)." };
+types (see C<guestfs_part_get_parttype>).|} };
 
   { defaults with
     name = "checksum_device"; added = (1, 3, 2);
@@ -5381,12 +5250,11 @@ checksums supported see the C<guestfs_checksum> command." };
          ["lvresize_free"; "/dev/VG/LV"; "100"]]), []
     ];
     shortdesc = "expand an LV to fill free space";
-    longdesc = "\
-This expands an existing logical volume C<lv> so that it fills
+    longdesc = {|This expands an existing logical volume C<lv> so that it fills
 C<pc> % of the remaining free space in the volume group.  Commonly
 you would call this with pc = 100 which expands the logical volume
 as much as possible, using all remaining free space in the volume
-group." };
+group.|} };
 
   { defaults with
     name = "get_umask"; added = (1, 3, 4);
@@ -5429,8 +5297,7 @@ it out to local file C<base64file> encoded as base64." };
     style = RErr, [String (PlainString, "csumtype"); String (Pathname, "directory"); String (FileOut, "sumsfile")], [];
     cancellable = true;
     shortdesc = "compute MD5, SHAx or CRC checksum of files in a directory";
-    longdesc = "\
-This command computes the checksums of all regular files in
+    longdesc = {|This command computes the checksums of all regular files in
 F<directory> and then emits a list of those checksums to
 the local output file C<sumsfile>.
 
@@ -5440,7 +5307,7 @@ attention to the output of the checksum command (it uses
 the ones from GNU coreutils).  In particular when the
 filename is not printable, coreutils uses a special
 backslash syntax.  For more information, see the GNU
-coreutils info file." };
+coreutils info file.|} };
 
   { defaults with
     name = "fill_pattern"; added = (1, 3, 12);
@@ -5510,8 +5377,7 @@ See also C<guestfs_write_append>." };
          ["cat"; "/pwrite3"]], "new file contents"), []
     ];
     shortdesc = "write to part of a file";
-    longdesc = "\
-This command writes to part of a file.  It writes the data
+    longdesc = {|This command writes to part of a file.  It writes the data
 buffer C<content> to the file C<path> starting at offset C<offset>.
 
 This command implements the L<pwrite(2)> system call, and like
@@ -5520,7 +5386,7 @@ return value is the number of bytes that were actually written
 to the file.  This could even be 0, although short writes are
 unlikely for regular files in ordinary circumstances.
 
-See also C<guestfs_pread>, C<guestfs_pwrite_device>." };
+See also C<guestfs_pread>, C<guestfs_pwrite_device>.|} };
 
   { defaults with
     name = "resize2fs_size"; added = (1, 3, 14);
@@ -5548,15 +5414,14 @@ allows you to specify the new size (in bytes) explicitly." };
       InitNone, Always, TestRun [["available_all_groups"]], []
     ];
     shortdesc = "return a list of all optional groups";
-    longdesc = "\
-This command returns a list of all optional groups that this
+    longdesc = {|This command returns a list of all optional groups that this
 daemon knows about.  Note this returns both supported and unsupported
 groups.  To find out which ones the daemon can actually support
 you have to call C<guestfs_available> / C<guestfs_feature_available>
 on each member of the returned list.
 
 See also C<guestfs_available>, C<guestfs_feature_available>
-and L<guestfs(3)/AVAILABILITY>." };
+and L<guestfs(3)/AVAILABILITY>.|} };
 
   { defaults with
     name = "fallocate64"; added = (1, 3, 17);
@@ -5567,8 +5432,7 @@ and L<guestfs(3)/AVAILABILITY>." };
          ["stat"; "/fallocate64"]], "ret->size == 1000000"), []
     ];
     shortdesc = "preallocate a file in the guest filesystem";
-    longdesc = "\
-This command preallocates a file (containing zero bytes) named
+    longdesc = {|This command preallocates a file (containing zero bytes) named
 C<path> of size C<len> bytes.  If the file exists already, it
 is overwritten.
 
@@ -5582,7 +5446,7 @@ of files created through that call to 1GB.
 
 Do not confuse this with the guestfish-specific
 C<alloc> and C<sparse> commands which create
-a file in the host and attach it as a device." };
+a file in the host and attach it as a device.|} };
 
   { defaults with
     name = "vfs_label"; added = (1, 3, 18);
@@ -5602,12 +5466,11 @@ a file in the host and attach it as a device." };
          ["vfs_label"; "/dev/sda1"]], "test-label-btrfs"), [];
     ];
     shortdesc = "get the filesystem label";
-    longdesc = "\
-This returns the label of the filesystem on C<mountable>.
+    longdesc = {|This returns the label of the filesystem on C<mountable>.
 
 If the filesystem is unlabeled, this returns the empty string.
 
-To find a filesystem from the label, use C<guestfs_findfs_label>." };
+To find a filesystem from the label, use C<guestfs_findfs_label>.|} };
 
   { defaults with
     name = "vfs_uuid"; added = (1, 3, 18);
@@ -5619,12 +5482,11 @@ To find a filesystem from the label, use C<guestfs_findfs_label>." };
            ["vfs_uuid"; "/dev/sda1"]], stable_uuid), []
       ];
     shortdesc = "get the filesystem UUID";
-    longdesc = "\
-This returns the filesystem UUID of the filesystem on C<mountable>.
+    longdesc = {|This returns the filesystem UUID of the filesystem on C<mountable>.
 
 If the filesystem does not have a UUID, this returns the empty string.
 
-To find a filesystem from the UUID, use C<guestfs_findfs_uuid>." };
+To find a filesystem from the UUID, use C<guestfs_findfs_uuid>.|} };
 
   { defaults with
     name = "lvm_set_filter"; added = (1, 5, 1);
@@ -5632,9 +5494,8 @@ To find a filesystem from the UUID, use C<guestfs_findfs_uuid>." };
     optional = Some "lvm2";
     test_excuse = "cannot be tested with the current framework because the VG is being used by the mounted filesystem, so the 'vgchange -an' command we do first will fail";
     shortdesc = "set LVM device filter";
-    longdesc = "\
-This sets the LVM device filter so that LVM will only be
-able to \"see\" the block devices in the list C<devices>,
+    longdesc = {|This sets the LVM device filter so that LVM will only be
+able to "see" the block devices in the list C<devices>,
 and will ignore all other attached block devices.
 
 Where disk image(s) contain duplicate PVs or VGs, this
@@ -5654,19 +5515,18 @@ You can filter whole block devices or individual partitions.
 
 You cannot use this if any VG is currently in use (eg.
 contains a mounted filesystem), even if you are not
-filtering out that VG." };
+filtering out that VG.|} };
 
   { defaults with
     name = "lvm_clear_filter"; added = (1, 5, 1);
     style = RErr, [], [];
     test_excuse = "cannot be tested with the current framework because the VG is being used by the mounted filesystem, so the 'vgchange -an' command we do first will fail";
     shortdesc = "clear LVM device filter";
-    longdesc = "\
-This undoes the effect of C<guestfs_lvm_set_filter>.  LVM
+    longdesc = {|This undoes the effect of C<guestfs_lvm_set_filter>.  LVM
 will be able to see every block device.
 
 This command also clears the LVM cache and performs a volume
-group scan." };
+group scan.|} };
 
   { defaults with
     name = "luks_format"; added = (1, 5, 2);
@@ -5693,15 +5553,14 @@ it also allows you to set the C<cipher> used." };
     style = RErr, [String (Device, "device"); String (Key, "key"); String (Key, "newkey"); Int "keyslot"], [];
     optional = Some "luks";
     shortdesc = "add a key on a LUKS encrypted device";
-    longdesc = "\
-This command adds a new key on LUKS device C<device>.
+    longdesc = {|This command adds a new key on LUKS device C<device>.
 C<key> is any existing key, and is used to access the device.
 C<newkey> is the new key to add.  C<keyslot> is the key slot
 that will be replaced.
 
 Note that if C<keyslot> already contains a key, then this
 command will fail.  You have to use C<guestfs_luks_kill_slot>
-first to remove that key." };
+first to remove that key.|} };
 
   { defaults with
     name = "luks_kill_slot"; added = (1, 5, 2);
@@ -5732,48 +5591,44 @@ returns true iff this is the case." };
     style = RString (RDevice, "device"), [String (PlainString, "uuid")], [];
     impl = OCaml "Findfs.findfs_uuid";
     shortdesc = "find a filesystem by UUID";
-    longdesc = "\
-This command searches the filesystems and returns the one
+    longdesc = {|This command searches the filesystems and returns the one
 which has the given UUID.  An error is returned if no such
 filesystem can be found.
 
-To find the UUID of a filesystem, use C<guestfs_vfs_uuid>." };
+To find the UUID of a filesystem, use C<guestfs_vfs_uuid>.|} };
 
   { defaults with
     name = "findfs_label"; added = (1, 5, 3);
     style = RString (RDevice, "device"), [String (PlainString, "label")], [];
     impl = OCaml "Findfs.findfs_label";
     shortdesc = "find a filesystem by label";
-    longdesc = "\
-This command searches the filesystems and returns the one
+    longdesc = {|This command searches the filesystems and returns the one
 which has the given label.  An error is returned if no such
 filesystem can be found.
 
-To find the label of a filesystem, use C<guestfs_vfs_label>." };
+To find the label of a filesystem, use C<guestfs_vfs_label>.|} };
 
   { defaults with
     name = "findfs_partuuid"; added = (1, 53, 5);
     style = RString (RDevice, "device"), [String (PlainString, "uuid")], [];
     impl = OCaml "Findfs.findfs_partuuid";
     shortdesc = "find a partition by UUID";
-    longdesc = "\
-This command searches the partitions and returns the one
+    longdesc = {|This command searches the partitions and returns the one
 which has the given partition UUID.  An error is returned if no such
 partition can be found.
 
-To find the UUID of a partition, use C<guestfs_blkid> (C<PART_ENTRY_UUID>)." };
+To find the UUID of a partition, use C<guestfs_blkid> (C<PART_ENTRY_UUID>).|} };
 
   { defaults with
     name = "findfs_partlabel"; added = (1, 53, 5);
     style = RString (RDevice, "device"), [String (PlainString, "label")], [];
     impl = OCaml "Findfs.findfs_partlabel";
     shortdesc = "find a partition by label";
-    longdesc = "\
-This command searches the partitions and returns the one
+    longdesc = {|This command searches the partitions and returns the one
 which has the given label.  An error is returned if no such
 partition can be found.
 
-To find the label of a partition, use C<guestfs_blkid> (C<PART_ENTRY_NAME>)." };
+To find the label of a partition, use C<guestfs_blkid> (C<PART_ENTRY_NAME>).|} };
 
   { defaults with
     name = "is_chardev"; added = (1, 5, 10);
@@ -5787,15 +5642,14 @@ To find the label of a partition, use C<guestfs_blkid> (C<PART_ENTRY_NAME>)." };
          ["is_chardev"; "/is_chardev"; ""]]), []
     ];
     shortdesc = "test if character device";
-    longdesc = "\
-This returns C<true> if and only if there is a character device
+    longdesc = {|This returns C<true> if and only if there is a character device
 with the given C<path> name.
 
 If the optional flag C<followsymlinks> is true, then a symlink
 (or chain of symlinks) that ends with a chardev also causes the
 function to return true.
 
-See also C<guestfs_stat>." };
+See also C<guestfs_stat>.|} };
 
   { defaults with
     name = "is_blockdev"; added = (1, 5, 10);
@@ -5809,8 +5663,7 @@ See also C<guestfs_stat>." };
          ["is_blockdev"; "/is_blockdev"; ""]]), []
     ];
     shortdesc = "test if block device";
-    longdesc = "\
-This returns C<true> if and only if there is a block device
+    longdesc = {|This returns C<true> if and only if there is a block device
 with the given C<path> name.
 
 If the optional flag C<followsymlinks> is true, then a symlink
@@ -5821,7 +5674,7 @@ This call only looks at files within the guest filesystem.  Libguestfs
 partitions and block devices (eg. F</dev/sda>) cannot be used as the
 C<path> parameter of this call.
 
-See also C<guestfs_stat>." };
+See also C<guestfs_stat>.|} };
 
   { defaults with
     name = "is_fifo"; added = (1, 5, 10);
@@ -5835,15 +5688,14 @@ See also C<guestfs_stat>." };
          ["is_fifo"; "/is_fifo"; ""]]), []
     ];
     shortdesc = "test if FIFO (named pipe)";
-    longdesc = "\
-This returns C<true> if and only if there is a FIFO (named pipe)
+    longdesc = {|This returns C<true> if and only if there is a FIFO (named pipe)
 with the given C<path> name.
 
 If the optional flag C<followsymlinks> is true, then a symlink
 (or chain of symlinks) that ends with a FIFO also causes the
 function to return true.
 
-See also C<guestfs_stat>." };
+See also C<guestfs_stat>.|} };
 
   { defaults with
     name = "is_symlink"; added = (1, 5, 10);
@@ -5872,15 +5724,14 @@ See also C<guestfs_stat>." };
         [["is_socket"; "/directory"; ""]]), []
     ];
     shortdesc = "test if socket";
-    longdesc = "\
-This returns C<true> if and only if there is a Unix domain socket
+    longdesc = {|This returns C<true> if and only if there is a Unix domain socket
 with the given C<path> name.
 
 If the optional flag C<followsymlinks> is true, then a symlink
 (or chain of symlinks) that ends with a socket also causes the
 function to return true.
 
-See also C<guestfs_stat>." };
+See also C<guestfs_stat>.|} };
 
   { defaults with
     name = "part_to_dev"; added = (1, 5, 15);
@@ -5893,15 +5744,14 @@ See also C<guestfs_stat>." };
         [["part_to_dev"; "/dev/sda"]]), []
     ];
     shortdesc = "convert partition name to device name";
-    longdesc = "\
-This function takes a partition name (eg. \"/dev/sdb1\") and
+    longdesc = {|This function takes a partition name (eg. "/dev/sdb1") and
 removes the partition number, returning the device name
-(eg. \"/dev/sdb\").
+(eg. "/dev/sdb").
 
 The named partition must exist, for example as a string returned
 from C<guestfs_list_partitions>.
 
-See also C<guestfs_part_to_partnum>, C<guestfs_device_index>." };
+See also C<guestfs_part_to_partnum>, C<guestfs_device_index>.|} };
 
   { defaults with
     name = "upload_offset"; added = (1, 5, 17);
@@ -5914,14 +5764,13 @@ See also C<guestfs_part_to_partnum>, C<guestfs_device_index>." };
            ["checksum"; "md5"; "/upload_offset"]], md5), []
       ]);
     shortdesc = "upload a file from the local machine with offset";
-    longdesc = "\
-Upload local file F<filename> to F<remotefilename> on the
+    longdesc = {|Upload local file F<filename> to F<remotefilename> on the
 filesystem.
 
 F<remotefilename> is overwritten starting at the byte C<offset>
 specified.  The intention is to overwrite parts of existing
 files or devices, although if a non-existent file is specified
-then it is created with a \"hole\" before C<offset>.  The
+then it is created with a "hole" before C<offset>.  The
 size of the data written is implicit in the size of the
 source F<filename>.
 
@@ -5930,7 +5779,7 @@ can be uploaded with this call, unlike with C<guestfs_pwrite>,
 and this call always writes the full amount unless an
 error occurs.
 
-See also C<guestfs_upload>, C<guestfs_pwrite>." };
+See also C<guestfs_upload>, C<guestfs_pwrite>.|} };
 
   { defaults with
     name = "download_offset"; added = (1, 5, 17);
@@ -5950,8 +5799,7 @@ See also C<guestfs_upload>, C<guestfs_pwrite>." };
             ["checksum"; "md5"; "/download_offset/COPYING.LIB"]], md5), []
        ]);
     shortdesc = "download a file to the local machine with offset and size";
-    longdesc = "\
-Download file F<remotefilename> and save it as F<filename>
+    longdesc = {|Download file F<remotefilename> and save it as F<filename>
 on the local machine.
 
 F<remotefilename> is read for C<size> bytes starting at C<offset>
@@ -5962,7 +5810,7 @@ can be downloaded with this call, unlike with C<guestfs_pread>,
 and this call always reads the full amount unless an
 error occurs.
 
-See also C<guestfs_download>, C<guestfs_pread>." };
+See also C<guestfs_download>, C<guestfs_pread>.|} };
 
   { defaults with
     name = "pwrite_device"; added = (1, 5, 20);
@@ -5976,8 +5824,7 @@ See also C<guestfs_download>, C<guestfs_pread>." };
         "is_device_list (ret, 1, \"/dev/sdb1\")"), []
     ];
     shortdesc = "write to part of a device";
-    longdesc = "\
-This command writes to part of a device.  It writes the data
+    longdesc = {|This command writes to part of a device.  It writes the data
 buffer C<content> to C<device> starting at offset C<offset>.
 
 This command implements the L<pwrite(2)> system call, and like
@@ -5985,7 +5832,7 @@ that system call it may not write the full data requested
 (although short writes to disk devices and partitions are
 probably impossible with standard Linux kernels).
 
-See also C<guestfs_pwrite>." };
+See also C<guestfs_pwrite>.|} };
 
   { defaults with
     name = "pread_device"; added = (1, 5, 21);
@@ -5997,14 +5844,13 @@ See also C<guestfs_pwrite>." };
         "compare_buffers (ret, size, \"\\1CD001\\1\\0\", 8) == 0"), []
     ];
     shortdesc = "read part of a device";
-    longdesc = "\
-This command lets you read part of a block device.  It reads C<count>
+    longdesc = {|This command lets you read part of a block device.  It reads C<count>
 bytes of C<device>, starting at C<offset>.
 
 This may read fewer bytes than requested.  For further details
 see the L<pread(2)> system call.
 
-See also C<guestfs_pread>." };
+See also C<guestfs_pread>.|} };
 
   { defaults with
     name = "lvm_canonical_lv_name"; added = (1, 5, 24);
@@ -6016,8 +5862,7 @@ See also C<guestfs_pread>." };
         [["lvm_canonical_lv_name"; "/dev/VG/LV"]], "/dev/VG/LV"), []
     ];
     shortdesc = "get canonical name of an LV";
-    longdesc = "\
-This converts alternative naming schemes for LVs that you
+    longdesc = {|This converts alternative naming schemes for LVs that you
 might find to the canonical name.  For example, F</dev/mapper/VG-LV>
 is converted to F</dev/VG/LV>.
 
@@ -6025,7 +5870,7 @@ This command returns an error if the C<lvname> parameter does
 not refer to a logical volume.  In this case errno will be
 set to C<EINVAL>.
 
-See also C<guestfs_is_lv>, C<guestfs_canonical_device_name>." };
+See also C<guestfs_is_lv>, C<guestfs_canonical_device_name>.|} };
 
   { defaults with
     name = "mkfs"; added = (0, 0, 8);
@@ -6040,8 +5885,7 @@ See also C<guestfs_is_lv>, C<guestfs_canonical_device_name>." };
          ["cat"; "/new"]], "new file contents"), []
     ];
     shortdesc = "make a filesystem";
-    longdesc = "\
-This function creates a filesystem on C<device>.  The filesystem
+    longdesc = {|This function creates a filesystem on C<device>.  The filesystem
 type is C<fstype>, for example C<ext3>.
 
 The optional arguments are:
@@ -6080,15 +5924,14 @@ which sets the inode size (only for ext2/3/4 filesystems at present).
 This passes the I<-S> parameter to external L<mkfs.ufs(8)> program,
 which sets sector size for ufs filesystem.
 
-=back" };
+=back|} };
 
   { defaults with
     name = "getxattr"; added = (1, 7, 24);
     style = RBufferOut "xattr", [String (Pathname, "path"); String (PlainString, "name")], [];
     optional = Some "linuxxattrs";
     shortdesc = "get a single extended attribute";
-    longdesc = "\
-Get a single extended attribute from file C<path> named C<name>.
+    longdesc = {|Get a single extended attribute from file C<path> named C<name>.
 This call follows symlinks.  If you want to lookup an extended
 attribute for the symlink itself, use C<guestfs_lgetxattr>.
 
@@ -6102,15 +5945,14 @@ in advance and call this function.
 Extended attribute values are blobs of binary data.  If there
 is no extended attribute named C<name>, this returns an error.
 
-See also: C<guestfs_getxattrs>, C<guestfs_lgetxattr>, L<attr(5)>." };
+See also: C<guestfs_getxattrs>, C<guestfs_lgetxattr>, L<attr(5)>.|} };
 
   { defaults with
     name = "lgetxattr"; added = (1, 7, 24);
     style = RBufferOut "xattr", [String (Pathname, "path"); String (PlainString, "name")], [];
     optional = Some "linuxxattrs";
     shortdesc = "get a single extended attribute";
-    longdesc = "\
-Get a single extended attribute from file C<path> named C<name>.
+    longdesc = {|Get a single extended attribute from file C<path> named C<name>.
 If C<path> is a symlink, then this call returns an extended
 attribute from the symlink.
 
@@ -6124,14 +5966,13 @@ in advance and call this function.
 Extended attribute values are blobs of binary data.  If there
 is no extended attribute named C<name>, this returns an error.
 
-See also: C<guestfs_lgetxattrs>, C<guestfs_getxattr>, L<attr(5)>." };
+See also: C<guestfs_lgetxattrs>, C<guestfs_getxattr>, L<attr(5)>.|} };
 
   { defaults with
     name = "resize2fs_M"; added = (1, 9, 4);
     style = RErr, [String (Device, "device")], [];
     shortdesc = "resize an ext2, ext3 or ext4 filesystem to the minimum size";
-    longdesc = "\
-This command is the same as C<guestfs_resize2fs>, but the filesystem
+    longdesc = {|This command is the same as C<guestfs_resize2fs>, but the filesystem
 is resized to its minimum size.  This works like the I<-M> option
 to the L<resize2fs(8)> command.
 
@@ -6140,19 +5981,18 @@ C<guestfs_tune2fs_l> and read the C<Block size> and C<Block count>
 values.  These two numbers, multiplied together, give the
 resulting size of the minimal filesystem in bytes.
 
-See also L<guestfs(3)/RESIZE2FS ERRORS>." };
+See also L<guestfs(3)/RESIZE2FS ERRORS>.|} };
 
   { defaults with
     name = "internal_autosync"; added = (1, 9, 7);
     style = RErr, [], [];
     visibility = VInternal;
     shortdesc = "internal autosync operation";
-    longdesc = "\
-This command performs the autosync operation just before the
+    longdesc = {|This command performs the autosync operation just before the
 handle is closed.  You should not call this command directly.
 Instead, use the autosync flag (C<guestfs_set_autosync>) to
 control whether or not this operation is performed when the
-handle is closed." };
+handle is closed.|} };
 
   { defaults with
     name = "is_zero"; added = (1, 11, 8);
@@ -6190,15 +6030,14 @@ Note that for large devices this can take a long time to run." };
     style = RStringList (RDevice, "devices"), [], [];
     impl = OCaml "Lvm_dm.list_dm_devices";
     shortdesc = "list device mapper devices";
-    longdesc = "\
-List all device mapper devices.
+    longdesc = {|List all device mapper devices.
 
 The returned list contains F</dev/mapper/*> devices, eg. ones created
 by a previous call to C<guestfs_luks_open>.
 
 Device mapper devices which correspond to logical volumes are I<not>
 returned in this list.  Call C<guestfs_lvs> if you want to list logical
-volumes." };
+volumes.|} };
 
   { defaults with
     name = "ntfsresize"; added = (1, 3, 2);
@@ -6206,8 +6045,7 @@ volumes." };
     once_had_no_optargs = true;
     optional = Some "ntfsprogs"; camel_name = "NTFSResizeOpts";
     shortdesc = "resize an NTFS filesystem";
-    longdesc = "\
-This command resizes an NTFS filesystem, expanding or
+    longdesc = {|This command resizes an NTFS filesystem, expanding or
 shrinking it to the size of the underlying device.
 
 The optional parameters are:
@@ -6233,15 +6071,14 @@ single filesystem without booting into Windows between each resize.
 
 =back
 
-See also L<ntfsresize(8)>." };
+See also L<ntfsresize(8)>.|} };
 
   { defaults with
     name = "btrfs_filesystem_resize"; added = (1, 11, 17);
     style = RErr, [String (Pathname, "mountpoint")], [OInt64 "size"];
     optional = Some "btrfs"; camel_name = "BTRFSFilesystemResize";
     shortdesc = "resize a btrfs filesystem";
-    longdesc = "\
-This command resizes a btrfs filesystem.
+    longdesc = {|This command resizes a btrfs filesystem.
 
 Note that unlike other resize calls, the filesystem has to be
 mounted and the parameter is the mountpoint not the device
@@ -6258,7 +6095,7 @@ is resized to the maximum size.
 
 =back
 
-See also L<btrfs(8)>." };
+See also L<btrfs(8)>.|} };
 
   { defaults with
     name = "internal_write_append"; added = (1, 19, 32);
@@ -6285,31 +6122,29 @@ See also C<guestfs_write>." };
     style = RErr, [String (PlainString, "ctype"); String (Pathname, "file"); String (FileOut, "zfile")], [OInt "level"];
     cancellable = true;
     shortdesc = "output compressed file";
-    longdesc = "\
-This command compresses F<file> and writes it out to the local
+    longdesc = {|This command compresses F<file> and writes it out to the local
 file F<zfile>.
 
 The compression program used is controlled by the C<ctype> parameter.
 Currently this includes: C<compress>, C<gzip>, C<bzip2>, C<xz> or C<lzop>.
 Some compression types may not be supported by particular builds of
 libguestfs, in which case you will get an error containing the
-substring \"not supported\".
+substring "not supported".
 
 The optional C<level> parameter controls compression level.  The
 meaning and default for this parameter depends on the compression
-program being used." };
+program being used.|} };
 
   { defaults with
     name = "compress_device_out"; added = (1, 13, 15);
     style = RErr, [String (PlainString, "ctype"); String (Device, "device"); String (FileOut, "zdevice")], [OInt "level"];
     cancellable = true;
     shortdesc = "output compressed device";
-    longdesc = "\
-This command compresses C<device> and writes it out to the local
+    longdesc = {|This command compresses C<device> and writes it out to the local
 file C<zdevice>.
 
 The C<ctype> and optional C<level> parameters have the same meaning
-as in C<guestfs_compress_out>." };
+as in C<guestfs_compress_out>.|} };
 
   { defaults with
     name = "part_to_partnum"; added = (1, 13, 25);
@@ -6322,22 +6157,20 @@ as in C<guestfs_compress_out>." };
         [["part_to_partnum"; "/dev/sda"]]), []
     ];
     shortdesc = "convert partition name to partition number";
-    longdesc = "\
-This function takes a partition name (eg. \"/dev/sdb1\") and
+    longdesc = {|This function takes a partition name (eg. "/dev/sdb1") and
 returns the partition number (eg. C<1>).
 
 The named partition must exist, for example as a string returned
 from C<guestfs_list_partitions>.
 
-See also C<guestfs_part_to_dev>." };
+See also C<guestfs_part_to_dev>.|} };
 
   { defaults with
     name = "copy_device_to_device"; added = (1, 13, 25);
     style = RErr, [String (Device, "src"); String (Device, "dest")], [OInt64 "srcoffset"; OInt64 "destoffset"; OInt64 "size"; OBool "sparse"; OBool "append"];
     progress = true;
     shortdesc = "copy from source device to destination device";
-    longdesc = "\
-The four calls C<guestfs_copy_device_to_device>,
+    longdesc = {|The four calls C<guestfs_copy_device_to_device>,
 C<guestfs_copy_device_to_file>,
 C<guestfs_copy_file_to_device>, and
 C<guestfs_copy_file_to_file>
@@ -6365,7 +6198,7 @@ If the C<sparse> flag is true then the call avoids writing
 blocks that contain only zeroes, which can help in some situations
 where the backing disk is thin-provisioned.  Note that unless
 the target is already zeroed, using this option will result
-in incorrect copying." };
+in incorrect copying.|} };
 
   { defaults with
     name = "copy_device_to_file"; added = (1, 13, 25);
@@ -6414,14 +6247,13 @@ of this call." };
         "compare_buffers (ret, size, \"hello, worldhello, worldhello, world\", 12*3) == 0"), [];
     ];
     shortdesc = "copy from source file to destination file";
-    longdesc = "\
-See C<guestfs_copy_device_to_device> for a general overview
+    longdesc = {|See C<guestfs_copy_device_to_device> for a general overview
 of this call.
 
 This is B<not> the function you want for copying files.  This
 is for copying blocks within existing files.  See C<guestfs_cp>,
 C<guestfs_cp_a> and C<guestfs_mv> for general file copying and
-moving functions." };
+moving functions.|} };
 
   { defaults with
     name = "tune2fs"; added = (1, 15, 4);
@@ -6450,8 +6282,7 @@ moving functions." };
           "match_re (get_key (ret, \"Reserved blocks gid\"), \"\\\\d+ \\\\(group \\\\S+\\\\)\")"), [];
     ];
     shortdesc = "adjust ext2/ext3/ext4 filesystem parameters";
-    longdesc = "\
-This call allows you to adjust various filesystem parameters of
+    longdesc = {|This call allows you to adjust various filesystem parameters of
 an ext2/ext3/ext4 filesystem called C<device>.
 
 The optional parameters are:
@@ -6522,15 +6353,14 @@ can only be specified as a number.
 
 To get the current values of filesystem parameters, see
 C<guestfs_tune2fs_l>.  For precise details of how tune2fs
-works, see the L<tune2fs(8)> man page." };
+works, see the L<tune2fs(8)> man page.|} };
 
   { defaults with
     name = "md_create"; added = (1, 15, 6);
     style = RErr, [String (PlainString, "name"); StringList (Device, "devices")], [OInt64 "missingbitmap"; OInt "nrdevices"; OInt "spare"; OInt64 "chunk"; OString "level"];
     optional = Some "mdadm"; camel_name = "MDCreate";
     shortdesc = "create a Linux md (RAID) device";
-    longdesc = "\
-Create a Linux md (RAID) device named C<name> on the devices
+    longdesc = {|Create a Linux md (RAID) device named C<name> on the devices
 in the list C<devices>.
 
 The optional parameters are:
@@ -6545,11 +6375,11 @@ corresponds to the first device in the array.
 
 As examples:
 
-If C<devices = [\"/dev/sda\"]> and C<missingbitmap = 0x1> then
-the resulting array would be C<[E<lt>missingE<gt>, \"/dev/sda\"]>.
+If C<devices = ["/dev/sda"]> and C<missingbitmap = 0x1> then
+the resulting array would be C<[E<lt>missingE<gt>, "/dev/sda"]>.
 
-If C<devices = [\"/dev/sda\"]> and C<missingbitmap = 0x2> then
-the resulting array would be C<[\"/dev/sda\", E<lt>missingE<gt>]>.
+If C<devices = ["/dev/sda"]> and C<missingbitmap = 0x2> then
+the resulting array would be C<["/dev/sda", E<lt>missingE<gt>]>.
 
 This defaults to C<0> (no missing devices).
 
@@ -6585,7 +6415,7 @@ Some of these are synonymous, and more levels may be added in future.
 
 If not set, this defaults to C<raid1>.
 
-=back" };
+=back|} };
 
   { defaults with
     name = "list_md_devices"; added = (1, 15, 4);
@@ -6601,8 +6431,7 @@ List all Linux md devices." };
     impl = OCaml "Md.md_detail";
     optional = Some "mdadm";
     shortdesc = "obtain metadata for an MD device";
-    longdesc = "\
-This command exposes the output of C<mdadm -DY E<lt>mdE<gt>>.
+    longdesc = {|This command exposes the output of C<mdadm -DY E<lt>mdE<gt>>.
 The following fields are usually present in the returned hash.
 Other fields may also be present.
 
@@ -6628,7 +6457,7 @@ The UUID of the MD device.
 
 The name of the MD device.
 
-=back" };
+=back|} };
 
   { defaults with
     name = "md_stop"; added = (1, 15, 6);
@@ -6653,8 +6482,7 @@ device is stopped, but it is not destroyed or zeroed." };
           "check_hash (ret, \"PART_ENTRY_SIZE\", \"4194049\") == 0"), [];
     ];
     shortdesc = "print block device attributes";
-    longdesc = "\
-This command returns block device attributes for C<device>. The following fields are
+    longdesc = {|This command returns block device attributes for C<device>. The following fields are
 usually present in the returned hash. Other fields may also be present.
 
 =over
@@ -6679,14 +6507,13 @@ The filesystem type or RAID of this device.
 
 The usage of this device, for example C<filesystem> or C<raid>.
 
-=back" };
+=back|} };
 
   { defaults with
     name = "e2fsck"; added = (1, 15, 17);
     style = RErr, [String (Device, "device")], [OBool "correct"; OBool "forceall"; OBool "forceno"];
     shortdesc = "check an ext2/ext3 filesystem";
-    longdesc = "\
-This runs the ext2/ext3 filesystem checker on C<device>.
+    longdesc = {|This runs the ext2/ext3 filesystem checker on C<device>.
 It can take the following optional arguments:
 
 =over 4
@@ -6716,7 +6543,7 @@ questions; allows e2fsck to be used non-interactively.
 This option may not be specified at the same time as the C<correct>
 or C<forceall> options.
 
-=back" };
+=back|} };
 
   { defaults with
     name = "wipefs"; added = (1, 17, 6);
@@ -6728,15 +6555,14 @@ or C<forceall> options.
          ["wipefs"; "/dev/VG/LV"]]), []
     ];
     shortdesc = "wipe a filesystem signature from a device";
-    longdesc = "\
-This command erases filesystem or RAID signatures from
+    longdesc = {|This command erases filesystem or RAID signatures from
 the specified C<device> to make the filesystem invisible to libblkid.
 
 This does not erase the filesystem itself nor any other data from the
 C<device>.
 
 Compare with C<guestfs_zero> which zeroes the first few blocks of a
-device." };
+device.|} };
 
   { defaults with
     name = "ntfsfix"; added = (1, 17, 9);
@@ -6748,8 +6574,7 @@ device." };
          ["ntfsfix"; "/dev/sda1"; "false"]]), []
     ];
     shortdesc = "fix common errors and force Windows to check NTFS";
-    longdesc = "\
-This command repairs some fundamental NTFS inconsistencies,
+    longdesc = {|This command repairs some fundamental NTFS inconsistencies,
 resets the NTFS journal file, and schedules an NTFS consistency
 check for the first boot into Windows.
 
@@ -6757,7 +6582,7 @@ This is I<not> an equivalent of Windows C<chkdsk>.  It does I<not>
 scan the filesystem for inconsistencies.
 
 The optional C<clearbadsectors> flag clears the list of bad sectors.
-This is useful after cloning a disk with bad sectors to a new disk." };
+This is useful after cloning a disk with bad sectors to a new disk.|} };
 
   { defaults with
     name = "ntfsclone_out"; added = (1, 17, 9);
@@ -6765,8 +6590,7 @@ This is useful after cloning a disk with bad sectors to a new disk." };
     optional = Some "ntfs3g"; cancellable = true;
     test_excuse = "tested in tests/ntfsclone";
     shortdesc = "save NTFS to backup file";
-    longdesc = "\
-Stream the NTFS filesystem C<device> to the local file
+    longdesc = {|Stream the NTFS filesystem C<device> to the local file
 C<backupfile>.  The format used for the backup file is a
 special format used by the L<ntfsclone(8)> tool.
 
@@ -6779,7 +6603,7 @@ and C<force> flags have precise meanings detailed in the
 L<ntfsclone(8)> man page.
 
 Use C<guestfs_ntfsclone_in> to restore the file back to a
-libguestfs device." };
+libguestfs device.|} };
 
   { defaults with
     name = "ntfsclone_in"; added = (1, 17, 9);
@@ -6808,8 +6632,7 @@ any existing contents of this device." };
          ["set_label"; "/dev/sda1"; "testlabel2"]]), []
     ];
     shortdesc = "set filesystem label";
-    longdesc = "\
-Set the filesystem label on C<mountable> to C<label>.
+    longdesc = {|Set the filesystem label on C<mountable> to C<label>.
 
 Only some filesystem types support labels, and libguestfs supports
 setting labels on only a subset of these.
@@ -6850,7 +6673,7 @@ If there is no support for changing the label
 for the type of the specified filesystem,
 set_label will fail and set errno as ENOTSUP.
 
-To read the label on a filesystem, call C<guestfs_vfs_label>." };
+To read the label on a filesystem, call C<guestfs_vfs_label>.|} };
 
   { defaults with
     name = "zero_free_space"; added = (1, 17, 18);
@@ -6861,16 +6684,15 @@ To read the label on a filesystem, call C<guestfs_vfs_label>." };
         [["zero_free_space"; "/"]]), []
     ];
     shortdesc = "zero free space in a filesystem";
-    longdesc = "\
-Zero the free space in the filesystem mounted on F<directory>.
+    longdesc = {|Zero the free space in the filesystem mounted on F<directory>.
 The filesystem must be mounted read-write.
 
 The filesystem contents are not affected, but any free space
 in the filesystem is freed.
 
-Free space is not \"trimmed\".  You may want to call
+Free space is not "trimmed".  You may want to call
 C<guestfs_fstrim> either as an alternative to this,
-or after calling this, depending on your requirements." };
+or after calling this, depending on your requirements.|} };
 
   { defaults with
     name = "lvcreate_free"; added = (1, 17, 18);
@@ -6910,8 +6732,7 @@ this will create the largest possible LV." };
           "ret->iso_logical_block_size == 2048"), []
     ];
     shortdesc = "get ISO information from primary volume descriptor of device";
-    longdesc = "\
-C<device> is an ISO device.  This returns a struct of information
+    longdesc = {|C<device> is an ISO device.  This returns a struct of information
 read from the primary volume descriptor (the ISO equivalent of the
 superblock) of the device.
 
@@ -6920,39 +6741,36 @@ with the I<-d> option on the host to analyze ISO files,
 instead of going through libguestfs.
 
 For information on the primary volume descriptor fields, see
-L<https://wiki.osdev.org/ISO_9660#The_Primary_Volume_Descriptor>" };
+L<https://wiki.osdev.org/ISO_9660#The_Primary_Volume_Descriptor>|} };
 
   { defaults with
     name = "isoinfo"; added = (1, 17, 19);
     style = RStruct ("isodata", "isoinfo"), [String (Pathname, "isofile")], [];
     impl = OCaml "Isoinfo.isoinfo";
     shortdesc = "get ISO information from primary volume descriptor of ISO file";
-    longdesc = "\
-This is the same as C<guestfs_isoinfo_device> except that it
+    longdesc = {|This is the same as C<guestfs_isoinfo_device> except that it
 works for an ISO file located inside some other mounted filesystem.
 Note that in the common case where you have added an ISO file
 as a libguestfs device, you would I<not> call this.  Instead
-you would call C<guestfs_isoinfo_device>." };
+you would call C<guestfs_isoinfo_device>.|} };
 
   { defaults with
     name = "vgmeta"; added = (1, 17, 20);
     style = RBufferOut "metadata", [String (PlainString, "vgname")], [];
     optional = Some "lvm2";
     shortdesc = "get volume group metadata";
-    longdesc = "\
-C<vgname> is an LVM volume group.  This command examines the
+    longdesc = {|C<vgname> is an LVM volume group.  This command examines the
 volume group and returns its metadata.
 
 Note that the metadata is an internal structure used by LVM,
-subject to change at any time, and is provided for information only." };
+subject to change at any time, and is provided for information only.|} };
 
   { defaults with
     name = "md_stat"; added = (1, 17, 21);
     style = RStructList ("devices", "mdstat"), [String (Device, "md")], [];
     optional = Some "mdadm";
     shortdesc = "get underlying devices from an MD device";
-    longdesc = "\
-This call returns a list of the underlying devices which make
+    longdesc = {|This call returns a list of the underlying devices which make
 up the single software RAID array device C<md>.
 
 To get a list of software RAID devices, call C<guestfs_list_md_devices>.
@@ -6995,7 +6813,7 @@ replacement
 
 =back
 
-=back" };
+=back|} };
 
   { defaults with
     name = "mkfs_btrfs"; added = (1, 17, 25);
@@ -7007,14 +6825,13 @@ replacement
          ["mkfs_btrfs"; "/dev/sda1"; "0"; "268435456"; "single"; ""; "test"; "single"; "65536"; "4096"]]), []
     ];
     shortdesc = "create a btrfs filesystem";
-    longdesc = "\
-Create a btrfs filesystem, allowing all configurables to be set.
+    longdesc = {|Create a btrfs filesystem, allowing all configurables to be set.
 For more information on the optional arguments, see L<mkfs.btrfs(8)>.
 
 Since btrfs filesystems can span multiple devices, this takes a
 non-empty list of devices.
 
-To create general filesystems, use C<guestfs_mkfs>." };
+To create general filesystems, use C<guestfs_mkfs>.|} };
 
   { defaults with
     name = "get_e2attrs"; added = (1, 17, 31);
@@ -7055,8 +6872,7 @@ To create general filesystems, use C<guestfs_mkfs>." };
          ["set_e2attrs"; "/e2attrs8"; "BabcdB"; "false"]]), []
     ];
     shortdesc = "get ext2 file attributes of a file";
-    longdesc = "\
-This returns the file attributes associated with F<file>.
+    longdesc = {|This returns the file attributes associated with F<file>.
 
 The attributes are a set of bits associated with each
 inode which affect the behaviour of the file.  The attributes
@@ -7162,14 +6978,13 @@ detailed information, consult the L<chattr(1)> man page.
 See also C<guestfs_set_e2attrs>.
 
 Don't confuse these attributes with extended attributes
-(see C<guestfs_getxattr>)." };
+(see C<guestfs_getxattr>).|} };
 
   { defaults with
     name = "set_e2attrs"; added = (1, 17, 31);
     style = RErr, [String (Pathname, "file"); String (PlainString, "attrs")], [OBool "clear"];
     shortdesc = "set ext2 file attributes of a file";
-    longdesc = "\
-This sets or clears the file attributes C<attrs>
+    longdesc = {|This sets or clears the file attributes C<attrs>
 associated with the inode F<file>.
 
 C<attrs> is a string of characters representing
@@ -7187,7 +7002,7 @@ string are left unchanged.
 
 These attributes are only present when the file is located on
 an ext2/3/4 filesystem.  Using this call on other filesystem
-types will result in an error." };
+types will result in an error.|} };
 
   { defaults with
     name = "get_e2generation"; added = (1, 17, 31);
@@ -7199,16 +7014,15 @@ types will result in an error." };
          ["get_e2generation"; "/e2generation"]], "ret == 123456"), []
     ];
     shortdesc = "get ext2 file generation of a file";
-    longdesc = "\
-This returns the ext2 file generation of a file.  The generation
-(which used to be called the \"version\") is a number associated
+    longdesc = {|This returns the ext2 file generation of a file.  The generation
+(which used to be called the "version") is a number associated
 with an inode.  This is most commonly used by NFS servers.
 
 The generation is only present when the file is located on
 an ext2/3/4 filesystem.  Using this call on other filesystem
 types will result in an error.
 
-See C<guestfs_set_e2generation>." };
+See C<guestfs_set_e2generation>.|} };
 
   { defaults with
     name = "set_e2generation"; added = (1, 17, 31);
@@ -7235,14 +7049,13 @@ See C<guestfs_get_e2generation>." };
          ["btrfs_subvolume_snapshot"; "/dir/test3"; "/dir/test5"; "true"; "NOARG"]]), []
     ];
     shortdesc = "create a btrfs snapshot";
-    longdesc = "\
-Create a snapshot of the btrfs subvolume C<source>.
+    longdesc = {|Create a snapshot of the btrfs subvolume C<source>.
 The C<dest> argument is the destination directory and the name
 of the snapshot, in the form F</path/to/dest/name>. By default
 the newly created snapshot is writable, if the value of optional
 parameter C<ro> is true, then a readonly snapshot is created. The
 optional parameter C<qgroupid> represents the qgroup which the
-newly created snapshot will be added to." };
+newly created snapshot will be added to.|} };
 
   { defaults with
     name = "btrfs_subvolume_delete"; added = (1, 17, 35);
@@ -7358,8 +7171,7 @@ a btrfs filesystem." };
     name = "filesystem_available"; added = (1, 19, 5);
     style = RBool "fsavail", [String (PlainString, "filesystem")], [];
     shortdesc = "check if filesystem is available";
-    longdesc = "\
-Check whether libguestfs supports the named filesystem.
+    longdesc = {|Check whether libguestfs supports the named filesystem.
 The argument C<filesystem> is a filesystem name, such as
 C<ext3>.
 
@@ -7373,19 +7185,18 @@ or having incompatible features, or lacking the right
 mkfs.E<lt>I<fs>E<gt> tool.
 
 See also C<guestfs_available>, C<guestfs_feature_available>,
-L<guestfs(3)/AVAILABILITY>." };
+L<guestfs(3)/AVAILABILITY>.|} };
 
   { defaults with
     name = "fstrim"; added = (1, 19, 6);
     style = RErr, [String (Pathname, "mountpoint")], [OInt64 "offset"; OInt64 "length"; OInt64 "minimumfreeextent"];
     optional = Some "fstrim";
     shortdesc = "trim free space in a filesystem";
-    longdesc = "\
-Trim the free space in the filesystem mounted on C<mountpoint>.
+    longdesc = {|Trim the free space in the filesystem mounted on C<mountpoint>.
 The filesystem must be mounted read-write.
 
 The filesystem contents are not affected, but any free space
-in the filesystem is \"trimmed\", that is, given back to the host
+in the filesystem is "trimmed", that is, given back to the host
 device, thus making disk images more sparse, allowing unused space
 in qcow2 files to be reused, etc.
 
@@ -7401,7 +7212,7 @@ Currently this happens when trying to trim FAT filesystems.
 See also C<guestfs_zero_free_space>.  That is a slightly
 different operation that turns free space in the filesystem
 into zeroes.  It is valid to call C<guestfs_fstrim> either
-instead of, or after calling C<guestfs_zero_free_space>." };
+instead of, or after calling C<guestfs_zero_free_space>.|} };
 
   { defaults with
     name = "nr_devices"; added = (1, 19, 15);
@@ -7412,13 +7223,12 @@ instead of, or after calling C<guestfs_zero_free_space>." };
         [["nr_devices"]], "ret == 4"), []
     ];
     shortdesc = "return number of whole block devices (disks) added";
-    longdesc = "\
-This returns the number of whole block devices that were
+    longdesc = {|This returns the number of whole block devices that were
 added.  This is the same as the number of devices that would
 be returned if you called C<guestfs_list_devices>.
 
 To find out the maximum number of devices that could be added,
-call C<guestfs_max_disks>." };
+call C<guestfs_max_disks>.|} };
 
   { defaults with
     name = "xfs_info"; added = (1, 19, 21);
@@ -7432,13 +7242,12 @@ call C<guestfs_max_disks>." };
          ["xfs_info"; "/"]], "ret->xfs_blocksize == 4096"), []
     ];
     shortdesc = "get geometry of XFS filesystem";
-    longdesc = "\
-C<pathordevice> is a mounted XFS filesystem or a device containing
+    longdesc = {|C<pathordevice> is a mounted XFS filesystem or a device containing
 an XFS filesystem.  This command returns the geometry of the filesystem.
 
 The returned struct contains geometry information.  Missing
 fields are returned as C<-1> (for numeric fields) or empty
-string." };
+string.|} };
 
   { defaults with
     name = "pvchange_uuid"; added = (1, 19, 26);
@@ -7528,12 +7337,11 @@ in the returned structure is defined by the API." };
          ["xfs_info"; "/"]], "ret->xfs_blocksize == 4096"), [];
     ];
     shortdesc = "expand an existing XFS filesystem";
-    longdesc = "\
-Grow the XFS filesystem mounted at C<path>.
+    longdesc = {|Grow the XFS filesystem mounted at C<path>.
 
 The returned struct contains geometry information.  Missing
 fields are returned as C<-1> (for numeric fields) or empty
-string." };
+string.|} };
 
   { defaults with
     name = "rsync"; added = (1, 19, 29);
@@ -7541,8 +7349,7 @@ string." };
     optional = Some "rsync";
     test_excuse = "tests are in tests/rsync";
     shortdesc = "synchronize the contents of two directories";
-    longdesc = "\
-This call may be used to copy or synchronize two directories
+    longdesc = {|This call may be used to copy or synchronize two directories
 under the same libguestfs handle.  This uses the L<rsync(1)>
 program which uses a fast algorithm that avoids copying files
 unnecessarily.
@@ -7563,7 +7370,7 @@ I<--archive> flag to C<rsync>.
 
 Delete files at the destination that do not exist at the source.
 
-=back" };
+=back|} };
 
   { defaults with
     name = "rsync_in"; added = (1, 19, 29);
@@ -7571,8 +7378,7 @@ Delete files at the destination that do not exist at the source.
     optional = Some "rsync";
     test_excuse = "tests are in tests/rsync";
     shortdesc = "synchronize host or remote filesystem with filesystem";
-    longdesc = "\
-This call may be used to copy or synchronize the filesystem
+    longdesc = {|This call may be used to copy or synchronize the filesystem
 on the host or on a remote computer with the filesystem
 within libguestfs.  This uses the L<rsync(1)> program
 which uses a fast algorithm that avoids copying files unnecessarily.
@@ -7588,7 +7394,7 @@ The format of the remote server string is defined by L<rsync(1)>.
 Note that there is no way to supply a password or passphrase
 so the target must be set up not to require one.
 
-The optional arguments are the same as those of C<guestfs_rsync>." };
+The optional arguments are the same as those of C<guestfs_rsync>.|} };
 
   { defaults with
     name = "rsync_out"; added = (1, 19, 29);
@@ -7596,8 +7402,7 @@ The optional arguments are the same as those of C<guestfs_rsync>." };
     optional = Some "rsync";
     test_excuse = "tests are in tests/rsync";
     shortdesc = "synchronize filesystem with host or remote filesystem";
-    longdesc = "\
-This call may be used to copy or synchronize the filesystem within
+    longdesc = {|This call may be used to copy or synchronize the filesystem within
 libguestfs with a filesystem on the host or on a remote computer.
 This uses the L<rsync(1)> program which uses a fast algorithm that
 avoids copying files unnecessarily.
@@ -7620,20 +7425,19 @@ which use the API directly you have to expand wildcards yourself
 (see C<guestfs_glob_expand>).  In guestfish you can use the C<glob>
 command (see L<guestfish(1)/glob>), for example:
 
- ><fs> glob rsync-out /* rsync://remote/" };
+ ><fs> glob rsync-out /* rsync://remote/|} };
 
   { defaults with
     name = "ls0"; added = (1, 19, 32);
     style = RErr, [String (Pathname, "dir"); String (FileOut, "filenames")], [];
     shortdesc = "get list of files in a directory";
-    longdesc = "\
-This specialized command is used to get a listing of
+    longdesc = {|This specialized command is used to get a listing of
 the filenames in the directory C<dir>.  The list of filenames
 is written to the local file F<filenames> (on the host).
 
-In the output file, the filenames are separated by C<\\0> characters.
+In the output file, the filenames are separated by C<\0> characters.
 
-C<.> and C<..> are not returned.  The filenames are not sorted." };
+C<.> and C<..> are not returned.  The filenames are not sorted.|} };
 
   { defaults with
     name = "fill_dir"; added = (1, 19, 32);
@@ -7662,8 +7466,7 @@ with zeroes)." };
            ["vfs_label"; "/dev/sda1"]], "LBL-TEST"), [];
       ];
     shortdesc = "change parameters of an XFS filesystem";
-    longdesc = "\
-Change the parameters of the XFS filesystem on C<device>.
+    longdesc = {|Change the parameters of the XFS filesystem on C<device>.
 
 Devices that are mounted cannot be modified.
 Administrators must unmount filesystems before this call
@@ -7674,7 +7477,7 @@ and modified using the C<guestfs_xfs_info> and
 C<guestfs_xfs_growfs> calls.
 
 Beginning with XFS version 5, it is no longer possible to modify
-the lazy-counters setting (ie. C<lazycounter> parameter has no effect)." };
+the lazy-counters setting (ie. C<lazycounter> parameter has no effect).|} };
 
   { defaults with
     name = "xfs_repair"; added = (1, 19, 36);
@@ -7688,8 +7491,7 @@ the lazy-counters setting (ie. C<lazycounter> parameter has no effect)." };
         ]), []
     ];
     shortdesc = "repair an XFS filesystem";
-    longdesc = "\
-Repair corrupt or damaged XFS filesystem on C<device>.
+    longdesc = {|Repair corrupt or damaged XFS filesystem on C<device>.
 
 The filesystem is specified using the C<device> argument which should be
 the device name of the disk partition or volume containing the filesystem.
@@ -7701,7 +7503,7 @@ Regardless, the filesystem to be repaired must be unmounted, otherwise,
 the resulting filesystem may be inconsistent or corrupt.
 
 The returned status indicates whether filesystem corruption was
-detected (returns C<1>) or was not detected (returns C<0>)." };
+detected (returns C<1>) or was not detected (returns C<0>).|} };
 
   { defaults with
     name = "rm_f"; added = (1, 19, 42);
@@ -7719,15 +7521,14 @@ detected (returns C<1>) or was not detected (returns C<0>)." };
          ["rm_f"; "/rm_f2/foo"]], []
     ];
     shortdesc = "remove a file ignoring errors";
-    longdesc = "\
-Remove the file C<path>.
+    longdesc = {|Remove the file C<path>.
 
 If the file doesn't exist, that error is ignored.  (Other errors,
 eg. I/O errors or bad paths, are not ignored)
 
 This call cannot remove directories.
 Use C<guestfs_rmdir> to remove an empty directory,
-or C<guestfs_rm_rf> to remove directories recursively." };
+or C<guestfs_rm_rf> to remove directories recursively.|} };
 
   { defaults with
     name = "mke2fs"; added = (1, 19, 44);
@@ -7805,14 +7606,13 @@ or C<guestfs_rm_rf> to remove directories recursively." };
       ];
     shortdesc = "create an ext2/ext3/ext4 filesystem on device";
     (* XXX document optional args properly *)
-    longdesc = "\
-C<mke2fs> is used to create an ext2, ext3, or ext4 filesystem
+    longdesc = {|C<mke2fs> is used to create an ext2, ext3, or ext4 filesystem
 on C<device>.
 
 The optional C<blockscount> is the size of the filesystem in blocks.
 If omitted it defaults to the size of C<device>.  Note if the
 filesystem is too small to contain a journal, C<mke2fs> will
-silently create an ext2 filesystem instead." };
+silently create an ext2 filesystem instead.|} };
 
   { defaults with
     name = "list_disk_labels"; added = (1, 19, 49);
@@ -7830,8 +7630,7 @@ silently create an ext2 filesystem instead." };
         "is_string_list (ret, 0)"), [];
     ];
     shortdesc = "mapping of disk labels to devices";
-    longdesc = "\
-If you add drives using the optional C<label> parameter
+    longdesc = {|If you add drives using the optional C<label> parameter
 of C<guestfs_add_drive_opts>, you can use this call to
 map between disk labels, and raw block device and partition
 names (like F</dev/sda> and F</dev/sda1>).
@@ -7839,7 +7638,7 @@ names (like F</dev/sda> and F</dev/sda1>).
 This returns a hashtable, where keys are the disk labels
 (I<without> the F</dev/disk/guestfs> prefix), and the values
 are the full raw block device and partition names
-(eg. F</dev/sda> and F</dev/sda1>)." };
+(eg. F</dev/sda> and F</dev/sda1>).|} };
 
   { defaults with
     name = "mktemp"; added = (1, 19, 53);
@@ -7851,13 +7650,12 @@ are the full raw block device and partition names
          ["mktemp"; "/mktemp/tmpXXXXXX"; "suff"]]), []
     ];
     shortdesc = "create a temporary file";
-    longdesc = "\
-This command creates a temporary file.  The
+    longdesc = {|This command creates a temporary file.  The
 C<tmpl> parameter should be a full pathname for the
 temporary directory name with the final six characters being
-\"XXXXXX\".
+"XXXXXX".
 
-For example: \"/tmp/myprogXXXXXX\" or \"/Temp/myprogXXXXXX\",
+For example: "/tmp/myprogXXXXXX" or "/Temp/myprogXXXXXX",
 the second one being suitable for Windows filesystems.
 
 The name of the temporary file that was created
@@ -7872,7 +7670,7 @@ file after use.
 If the optional C<suffix> parameter is given, then the suffix
 (eg. C<.txt>) is appended to the temporary name.
 
-See also: C<guestfs_mkdtemp>." };
+See also: C<guestfs_mkdtemp>.|} };
 
   { defaults with
     name = "mklost_and_found"; added = (1, 19, 56);
@@ -7893,9 +7691,8 @@ which we try to create the C<lost+found> directory." };
     style = RString (RPlainString, "acl"), [String (Pathname, "path"); String (PlainString, "acltype")], [];
     optional = Some "acl";
     shortdesc = "get the POSIX ACL attached to a file";
-    longdesc = "\
-This function returns the POSIX Access Control List (ACL) attached
-to C<path>.  The ACL is returned in \"long text form\" (see L<acl(5)>).
+    longdesc = {|This function returns the POSIX Access Control List (ACL) attached
+to C<path>.  The ACL is returned in "long text form" (see L<acl(5)>).
 
 The C<acltype> parameter may be:
 
@@ -7911,7 +7708,7 @@ other filesystem object.
 Return the default ACL.  Normally this only makes sense if
 C<path> is a directory.
 
-=back" };
+=back|} };
 
   { defaults with
     name = "acl_set_file"; added = (1, 19, 63);
@@ -7942,8 +7739,7 @@ C<path> is a directory.
          ["acl_set_file"; "/acl_set_file_5"; "default"; "u::r-x,g::r-x,o::r-x"]]), [];
     ];
     shortdesc = "set the POSIX ACL attached to a file";
-    longdesc = "\
-This function sets the POSIX Access Control List (ACL) attached
+    longdesc = {|This function sets the POSIX Access Control List (ACL) attached
 to C<path>.
 
 The C<acltype> parameter may be:
@@ -7962,8 +7758,8 @@ C<path> is a directory.
 
 =back
 
-The C<acl> parameter is the new ACL in either \"long text form\"
-or \"short text form\" (see L<acl(5)>).  The new ACL completely
+The C<acl> parameter is the new ACL in either "long text form"
+or "short text form" (see L<acl(5)>).  The new ACL completely
 replaces any previous ACL on the file.  The ACL must contain the
 full Unix permissions (eg. C<u::rwx,g::rx,o::rx>).
 
@@ -7973,11 +7769,11 @@ C<u:I<ID>:...> and/or C<g:I<ID>:...> field(s).  A full ACL
 string might therefore look like this:
 
  u::rwx,g::rwx,o::rwx,m::rwx,u:500:rwx,g:500:rwx
- \\ Unix permissions / \\mask/ \\      ACL        /
+ \ Unix permissions / \mask/ \      ACL        /
 
 You should use numeric UIDs and GIDs.  To map usernames and
 groupnames to the correct numeric ID in the context of the
-guest, use the Augeas functions (see C<guestfs_aug_init>)." };
+guest, use the Augeas functions (see C<guestfs_aug_init>).|} };
 
   { defaults with
     name = "acl_delete_def_file"; added = (1, 19, 63);
@@ -8054,8 +7850,7 @@ device names." };
     style = RErr, [], [];
     optional = Some "ldm";
     shortdesc = "scan and create Windows dynamic disk volumes";
-    longdesc = "\
-This function scans all block devices looking for Windows
+    longdesc = {|This function scans all block devices looking for Windows
 dynamic disk volumes and partitions, and creates devices
 for any that were found.
 
@@ -8063,7 +7858,7 @@ Call C<guestfs_list_ldm_volumes> and C<guestfs_list_ldm_partitions>
 to return all devices.
 
 Note that you B<don't> normally need to call this explicitly,
-since it is done automatically at C<guestfs_launch> time." };
+since it is done automatically at C<guestfs_launch> time.|} };
 
   { defaults with
     name = "ldmtool_remove_all"; added = (1, 20, 0);
@@ -8080,26 +7875,24 @@ volumes" };
     style = RStringList (RPlainString, "guids"), [], [];
     optional = Some "ldm";
     shortdesc = "scan for Windows dynamic disks";
-    longdesc = "\
-This function scans for Windows dynamic disks.  It returns a list
+    longdesc = {|This function scans for Windows dynamic disks.  It returns a list
 of identifiers (GUIDs) for all disk groups that were found.  These
 identifiers can be passed to other C<guestfs_ldmtool_*> functions.
 
 This function scans all block devices.  To scan a subset of
-block devices, call C<guestfs_ldmtool_scan_devices> instead." };
+block devices, call C<guestfs_ldmtool_scan_devices> instead.|} };
 
   { defaults with
     name = "ldmtool_scan_devices"; added = (1, 20, 0);
     style = RStringList (RPlainString, "guids"), [StringList (Device, "devices")], [];
     optional = Some "ldm";
     shortdesc = "scan for Windows dynamic disks";
-    longdesc = "\
-This function scans for Windows dynamic disks.  It returns a list
+    longdesc = {|This function scans for Windows dynamic disks.  It returns a list
 of identifiers (GUIDs) for all disk groups that were found.  These
 identifiers can be passed to other C<guestfs_ldmtool_*> functions.
 
 The parameter C<devices> is a list of block devices which are
-scanned.  If this list is empty, all block devices are scanned." };
+scanned.  If this list is empty, all block devices are scanned.|} };
 
   { defaults with
     name = "ldmtool_diskgroup_name"; added = (1, 20, 0);
@@ -8136,13 +7929,12 @@ the list returned by C<guestfs_ldmtool_scan>." };
     style = RString (RPlainString, "voltype"), [String (PlainString, "diskgroup"); String (PlainString, "volume")], [];
     optional = Some "ldm";
     shortdesc = "return the type of a Windows dynamic disk volume";
-    longdesc = "\
-Return the type of the volume named C<volume> in the disk
+    longdesc = {|Return the type of the volume named C<volume> in the disk
 group with GUID C<diskgroup>.
 
 Possible volume types that can be returned here include:
 C<simple>, C<spanned>, C<striped>, C<mirrored>, C<raid5>.
-Other types may also be returned." };
+Other types may also be returned.|} };
 
   { defaults with
     name = "ldmtool_volume_hint"; added = (1, 20, 0);
@@ -8178,13 +7970,12 @@ group with GUID C<diskgroup>." };
         "01234567-89AB-CDEF-0123-456789ABCDEF"), [];
     ];
     shortdesc = "set the type GUID of a GPT partition";
-    longdesc = "\
-Set the type GUID of numbered GPT partition C<partnum> to C<guid>. Return an
+    longdesc = {|Set the type GUID of numbered GPT partition C<partnum> to C<guid>. Return an
 error if the partition table of C<device> isn't GPT, or if C<guid> is not a
 valid GUID.
 
 See L<https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs>
-for a useful list of type GUIDs." };
+for a useful list of type GUIDs.|} };
 
   { defaults with
     name = "part_get_gpt_type"; added = (1, 21, 1);
@@ -8213,12 +8004,11 @@ Return the type GUID of numbered GPT partition C<partnum>." };
         "ret == 4"), [];
     ];
     shortdesc = "set the attribute flags of a GPT partition";
-    longdesc = "\
-Set the attribute flags of numbered GPT partition C<partnum> to C<attributes>. Return an
+    longdesc = {|Set the attribute flags of numbered GPT partition C<partnum> to C<attributes>. Return an
 error if the partition table of C<device> isn't GPT.
 
 See L<https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_entries>
-for a useful list of partition attributes." };
+for a useful list of partition attributes.|} };
 
   { defaults with
     name = "part_get_gpt_attributes"; added = (1, 21, 1);
@@ -8292,12 +8082,11 @@ deliberately crashes guestfsd." };
     style = RErr, [String (Device, "device")], [OString "directory"];
     optional = Some "syslinux";
     shortdesc = "install the SYSLINUX bootloader";
-    longdesc = "\
-Install the SYSLINUX bootloader on C<device>.
+    longdesc = {|Install the SYSLINUX bootloader on C<device>.
 
 The device parameter must be either a whole disk formatted
 as a FAT filesystem, or a partition formatted as a FAT filesystem.
-In the latter case, the partition should be marked as \"active\"
+In the latter case, the partition should be marked as "active"
 (C<guestfs_part_set_bootable>) and a Master Boot Record must be
 installed (eg. using C<guestfs_pwrite_device>) on the first
 sector of the whole disk.
@@ -8321,22 +8110,21 @@ either in the root directory, or under F<directory> if that
 optional argument is being used.  For further information
 about the contents of this file, see L<syslinux(1)>.
 
-See also C<guestfs_extlinux>." };
+See also C<guestfs_extlinux>.|} };
 
   { defaults with
     name = "extlinux"; added = (1, 21, 27);
     style = RErr, [String (Pathname, "directory")], [];
     optional = Some "extlinux";
     shortdesc = "install the SYSLINUX bootloader on an ext2/3/4 or btrfs filesystem";
-    longdesc = "\
-Install the SYSLINUX bootloader on the device mounted at F<directory>.
+    longdesc = {|Install the SYSLINUX bootloader on the device mounted at F<directory>.
 Unlike C<guestfs_syslinux> which requires a FAT filesystem, this can
 be used on an ext2/3/4 or btrfs filesystem.
 
 The F<directory> parameter can be either a mountpoint, or a
 directory within the mountpoint.
 
-You also have to mark the partition as \"active\"
+You also have to mark the partition as "active"
 (C<guestfs_part_set_bootable>) and a Master Boot Record must
 be installed (eg. using C<guestfs_pwrite_device>) on the first
 sector of the whole disk.
@@ -8348,7 +8136,7 @@ placing a file called F<extlinux.conf> on the filesystem
 under F<directory>.  For further information
 about the contents of this file, see L<extlinux(1)>.
 
-See also C<guestfs_syslinux>." };
+See also C<guestfs_syslinux>.|} };
 
   { defaults with
     name = "cp_r"; added = (1, 21, 38);
@@ -8362,14 +8150,13 @@ See also C<guestfs_syslinux>." };
          ["cat"; "/cp_r2/cp_r1/file"]], "file content"), []
     ];
     shortdesc = "copy a file or directory recursively";
-    longdesc = "\
-This copies a file or directory from C<src> to C<dest>
+    longdesc = {|This copies a file or directory from C<src> to C<dest>
 recursively using the C<cp -rP> command.
 
 Most users should use C<guestfs_cp_a> instead.  This command
 is useful when you don't want to preserve permissions, because
 the target filesystem does not support it (primarily when
-writing to DOS FAT filesystems)." };
+writing to DOS FAT filesystems).|} };
 
   { defaults with
     name = "remount"; added = (1, 23, 2);
@@ -8384,13 +8171,12 @@ writing to DOS FAT filesystems)." };
          ["write"; "/remount2"; "data"]]), []
     ];
     shortdesc = "remount a filesystem with different options";
-    longdesc = "\
-This call allows you to change the C<rw> (readonly/read-write)
+    longdesc = {|This call allows you to change the C<rw> (readonly/read-write)
 flag on an already mounted filesystem at C<mountpoint>,
 converting a readonly filesystem to be read-write, or vice-versa.
 
-Note that at the moment you must supply the \"optional\" C<rw>
-parameter.  In future we may allow other flags to be adjusted." };
+Note that at the moment you must supply the "optional" C<rw>
+parameter.  In future we may allow other flags to be adjusted.|} };
 
   { defaults with
     name = "set_uuid"; added = (1, 23, 10);
@@ -8401,15 +8187,14 @@ parameter.  In future we may allow other flags to be adjusted." };
            ["vfs_uuid"; "/dev/sda1"]], stable_uuid), [];
       ];
     shortdesc = "set the filesystem UUID";
-    longdesc = "\
-Set the filesystem UUID on C<device> to C<uuid>.
+    longdesc = {|Set the filesystem UUID on C<device> to C<uuid>.
 If this fails and the errno is ENOTSUP,
 means that there is no support for changing the UUID
 for the type of the specified filesystem.
 
 Only some filesystem types support setting UUIDs.
 
-To read the UUID on a filesystem, call C<guestfs_vfs_uuid>." };
+To read the UUID on a filesystem, call C<guestfs_vfs_uuid>.|} };
 
   { defaults with
     name = "journal_open"; added = (1, 23, 11);
@@ -8417,15 +8202,14 @@ To read the UUID on a filesystem, call C<guestfs_vfs_uuid>." };
     optional = Some "journal";
     test_excuse = "tests in tests/journal subdirectory";
     shortdesc = "open the systemd journal";
-    longdesc = "\
-Open the systemd journal located in F<directory>.  Any previously
+    longdesc = {|Open the systemd journal located in F<directory>.  Any previously
 opened journal handle is closed.
 
 The contents of the journal can be read using C<guestfs_journal_next>
 and C<guestfs_journal_get>.
 
 After you have finished using the journal, you should close the
-handle by calling C<guestfs_journal_close>." };
+handle by calling C<guestfs_journal_close>.|} };
 
   { defaults with
     name = "journal_close"; added = (1, 23, 11);
@@ -8442,15 +8226,14 @@ Close the journal handle." };
     optional = Some "journal";
     test_excuse = "tests in tests/journal subdirectory";
     shortdesc = "move to the next journal entry";
-    longdesc = "\
-Move to the next journal entry.  You have to call this
+    longdesc = {|Move to the next journal entry.  You have to call this
 at least once after opening the handle before you are able
 to read data.
 
 The returned boolean tells you if there are any more journal
 records to read.  C<true> means you can read the next record
 (eg. using C<guestfs_journal_get>), and C<false> means you
-have reached the end of the journal." };
+have reached the end of the journal.|} };
 
   { defaults with
     name = "journal_skip"; added = (1, 23, 11);
@@ -8458,14 +8241,13 @@ have reached the end of the journal." };
     optional = Some "journal";
     test_excuse = "tests in tests/journal subdirectory";
     shortdesc = "skip forwards or backwards in the journal";
-    longdesc = "\
-Skip forwards (C<skip E<ge> 0>) or backwards (C<skip E<lt> 0>) in the
+    longdesc = {|Skip forwards (C<skip E<ge> 0>) or backwards (C<skip E<lt> 0>) in the
 journal.
 
 The number of entries actually skipped is returned (note S<C<rskip E<ge> 0>>).
 If this is not the same as the absolute value of the skip parameter
 (C<|skip|>) you passed in then it means you have reached the end or
-the start of the journal." };
+the start of the journal.|} };
 
   { defaults with
     name = "internal_journal_get"; added = (1, 23, 11);
@@ -8483,13 +8265,12 @@ This function is used internally when reading the journal." };
     optional = Some "journal";
     test_excuse = "tests in tests/journal subdirectory";
     shortdesc = "get the data threshold for reading journal entries";
-    longdesc = "\
-Get the current data threshold for reading journal entries.
+    longdesc = {|Get the current data threshold for reading journal entries.
 This is a hint to the journal that it may truncate data fields to
 this size when reading them (note also that it may not truncate them).
 If this returns C<0>, then the threshold is unlimited.
 
-See also C<guestfs_journal_set_data_threshold>." };
+See also C<guestfs_journal_set_data_threshold>.|} };
 
   { defaults with
     name = "journal_set_data_threshold"; added = (1, 23, 11);
@@ -8497,13 +8278,12 @@ See also C<guestfs_journal_set_data_threshold>." };
     optional = Some "journal";
     test_excuse = "tests in tests/journal subdirectory";
     shortdesc = "set the data threshold for reading journal entries";
-    longdesc = "\
-Set the data threshold for reading journal entries.
+    longdesc = {|Set the data threshold for reading journal entries.
 This is a hint to the journal that it may truncate data fields to
 this size when reading them (note also that it may not truncate them).
 If you set this to C<0>, then the threshold is unlimited.
 
-See also C<guestfs_journal_get_data_threshold>." };
+See also C<guestfs_journal_get_data_threshold>.|} };
 
   { defaults with
     name = "aug_setm"; added = (1, 23, 14);
@@ -8518,14 +8298,13 @@ See also C<guestfs_journal_get_data_threshold>." };
          ["cat"; "/etc/passwd"]], "root:x:0:0:root:/root:/sbin/nologin\nbin:x:1:1:bin:/bin:/sbin/nologin\ndaemon:x:2:2:daemon:/sbin:/sbin/nologin\n"), [["aug_close"]]
     ];
     shortdesc = "set multiple Augeas nodes";
-    longdesc = "\
-Change multiple Augeas nodes in a single operation.  C<base> is
+    longdesc = {|Change multiple Augeas nodes in a single operation.  C<base> is
 an expression matching multiple nodes.  C<sub> is a path expression
 relative to C<base>.  All nodes matching C<base> are found, and then
 for each node, C<sub> is changed to C<val>.  C<sub> may also be C<NULL>
 in which case the C<base> nodes are modified.
 
-This returns the number of nodes modified." };
+This returns the number of nodes modified.|} };
 
   { defaults with
     name = "aug_label"; added = (1, 23, 14);
@@ -8566,8 +8345,7 @@ This function is used internally when testing the appliance." };
     name = "copy_attributes"; added = (1, 25, 21);
     style = RErr, [String (Pathname, "src"); String (Pathname, "dest")], [OBool "all"; OBool "mode"; OBool "xattributes"; OBool "ownership"];
     shortdesc = "copy the attributes of a path (file/directory) to another";
-    longdesc = "\
-Copy the attributes of a path (which can be a file or a directory)
+    longdesc = {|Copy the attributes of a path (which can be a file or a directory)
 to another path.
 
 By default B<no> attribute is copied, so make sure to specify any
@@ -8597,54 +8375,50 @@ Copy the owner uid and the group gid of C<source> to C<destination>.
 Copy B<all> the attributes from C<source> to C<destination>. Enabling it
 enables all the other flags, if they are not specified already.
 
-=back" };
+=back|} };
 
   { defaults with
     name = "part_get_name"; added = (1, 25, 33);
     style = RString (RPlainString, "name"), [String (Device, "device"); Int "partnum"], [];
     shortdesc = "get partition name";
-    longdesc = "\
-This gets the partition name on partition numbered C<partnum> on
+    longdesc = {|This gets the partition name on partition numbered C<partnum> on
 device C<device>.  Note that partitions are numbered from 1.
 
 The partition name can only be read on certain types of partition
-table.  This works on C<gpt> but not on C<mbr> partitions." };
+table.  This works on C<gpt> but not on C<mbr> partitions.|} };
 
   { defaults with
     name = "blkdiscard"; added = (1, 25, 44);
     style = RErr, [String (Device, "device")], [];
     optional = Some "blkdiscard";
     shortdesc = "discard all blocks on a device";
-    longdesc = "\
-This discards all blocks on the block device C<device>, giving
+    longdesc = {|This discards all blocks on the block device C<device>, giving
 the free space back to the host.
 
 This operation requires support in libguestfs, the host filesystem,
 qemu and the host kernel.  If this support isn't present it may give
 an error or even appear to run but do nothing.  You must also
 set the C<discard> attribute on the underlying drive (see
-C<guestfs_add_drive_opts>)." };
+C<guestfs_add_drive_opts>).|} };
 
   { defaults with
     name = "blkdiscardzeroes"; added = (1, 25, 44);
     style = RBool "zeroes", [String (Device, "device")], [];
     optional = Some "blkdiscardzeroes";
     shortdesc = "return true if discarded blocks are read as zeroes";
-    longdesc = "\
-This call returns true if blocks on C<device> that have been
+    longdesc = {|This call returns true if blocks on C<device> that have been
 discarded by a call to C<guestfs_blkdiscard> are returned as
 blocks of zero bytes when read the next time.
 
 If it returns false, then it may be that discarded blocks are
-read as stale or random data." };
+read as stale or random data.|} };
 
   { defaults with
     name = "cpio_out"; added = (1, 27, 9);
     style = RErr, [String (PlainString, "directory"); String (FileOut, "cpiofile")], [OString "format"];
     cancellable = true;
     shortdesc = "pack directory into cpio file";
-    longdesc = "\
-This command packs the contents of F<directory> and downloads
+    longdesc = {|This command packs the contents of F<directory> and downloads
 it to local file C<cpiofile>.
 
 The optional C<format> parameter can be used to select the format.
@@ -8663,7 +8437,7 @@ This is the default format.
 
 New (SVR4) portable format with a checksum.
 
-=back" };
+=back|} };
 
   { defaults with
     name = "journal_get_realtime_usec"; added = (1, 27, 18);
@@ -8695,14 +8469,13 @@ This is the same as the L<stat(2)> system call." };
         [["lstatns"; "/empty"]], "ret->st_size == 0"), []
     ];
     shortdesc = "get file information for a symbolic link";
-    longdesc = "\
-Returns file information for the given C<path>.
+    longdesc = {|Returns file information for the given C<path>.
 
 This is the same as C<guestfs_statns> except that if C<path>
 is a symbolic link, then the link is stat-ed, not the file it
 refers to.
 
-This is the same as the L<lstat(2)> system call." };
+This is the same as the L<lstat(2)> system call.|} };
 
   { defaults with
     name = "internal_lstatnslist"; added = (1, 27, 53);
@@ -9190,14 +8963,13 @@ It returns C<primary>, C<logical>, or C<extended>." };
     optional = Some "btrfs"; camel_name = "BTRFSReplace";
     test_excuse = "put the test in 'tests/btrfs' directory";
     shortdesc = "replace a btrfs managed device with another device";
-    longdesc = "\
-Replace device of a btrfs filesystem. On a live filesystem, duplicate the data
+    longdesc = {|Replace device of a btrfs filesystem. On a live filesystem, duplicate the data
 to the target device which is currently stored on the source device.
 After completion of the operation, the source device is wiped out and
 removed from the filesystem.
 
 The C<targetdev> needs to be same size or larger than the C<srcdev>. Devices
-which are currently mounted are never allowed to be used as the C<targetdev>." };
+which are currently mounted are never allowed to be used as the C<targetdev>.|} };
 
   { defaults with
     name = "set_uuid_random"; added = (1, 29, 50);
@@ -9207,15 +8979,14 @@ which are currently mounted are never allowed to be used as the C<targetdev>." }
             [["set_uuid_random"; "/dev/sda1"]]), [];
       ];
     shortdesc = "set a random UUID for the filesystem";
-    longdesc = "\
-Set the filesystem UUID on C<device> to a random UUID.
+    longdesc = {|Set the filesystem UUID on C<device> to a random UUID.
 If this fails and the errno is ENOTSUP,
 means that there is no support for changing the UUID
 for the type of the specified filesystem.
 
 Only some filesystem types support setting UUIDs.
 
-To read the UUID on a filesystem, call C<guestfs_vfs_uuid>." };
+To read the UUID on a filesystem, call C<guestfs_vfs_uuid>.|} };
 
   { defaults with
     name = "vfs_minimum_size"; added = (1, 31, 18);
@@ -9236,14 +9007,13 @@ To read the UUID on a filesystem, call C<guestfs_vfs_uuid>." };
          ["vfs_minimum_size"; "/dev/sda1"]]), [];
     ];
     shortdesc = "get minimum filesystem size";
-    longdesc = "\
-Get the minimum size of filesystem in bytes.
+    longdesc = {|Get the minimum size of filesystem in bytes.
 This is the minimum possible size for filesystem shrinking.
 
 If getting minimum size of specified filesystem is not supported,
 this will fail and set errno as ENOTSUP.
 
-See also L<ntfsresize(8)>, L<resize2fs(8)>, L<btrfs(8)>, L<xfs_info(8)>." };
+See also L<ntfsresize(8)>, L<resize2fs(8)>, L<btrfs(8)>, L<xfs_info(8)>.|} };
 
   { defaults with
     name = "internal_feature_available"; added = (1, 31, 25);
@@ -9307,28 +9077,26 @@ Return an error if the partition table of C<device> isn't GPT." };
     style = RErr, [String (Device, "device")], [];
     optional = Some "gdisk";
     shortdesc = "move backup GPT header to the end of the disk";
-    longdesc = "\
-Move backup GPT data structures to the end of the disk.
+    longdesc = {|Move backup GPT data structures to the end of the disk.
 This is useful in case of in-place image expand
 since disk space after backup GPT header is not usable.
 This is equivalent to C<sgdisk -e>.
 
-See also L<sgdisk(8)>." };
+See also L<sgdisk(8)>.|} };
 
   { defaults with
     name = "ntfscat_i"; added = (1, 33, 14);
     style = RErr, [String (Mountable, "device"); Int64 "inode"; String (FileOut, "filename")], [];
     progress = true; cancellable = true;
     shortdesc = "download a file to the local machine given its inode";
-    longdesc = "\
-Download a file given its inode from a NTFS filesystem and save it as
+    longdesc = {|Download a file given its inode from a NTFS filesystem and save it as
 F<filename> on the local machine.
 
 This allows to download some otherwise inaccessible files such as the ones
 within the C<$Extend> folder.
 
 The filesystem from which to extract the file must be unmounted,
-otherwise the call will fail." };
+otherwise the call will fail.|} };
 
   { defaults with
     name = "btrfs_filesystem_show"; added = (1, 33, 29);
@@ -9362,8 +9130,7 @@ fails and the C<errno> is set to C<ENODEV>." };
     optional = Some "squashfs";
     cancellable = true;
     shortdesc = "create a squashfs filesystem";
-    longdesc = "\
-Create a squashfs filesystem for the specified C<path>.
+    longdesc = {|Create a squashfs filesystem for the specified C<path>.
 
 The optional C<compress> flag controls compression.  If not given,
 then the output compressed using C<gzip>.  Otherwise one
@@ -9382,7 +9149,7 @@ wildcards.
 =back
 
 Please note that this API may fail when used to compress directories
-with large files, such as the resulting squashfs will be over 3GB big." };
+with large files, such as the resulting squashfs will be over 3GB big.|} };
 
   { defaults with
     name = "file_architecture"; added = (1, 5, 3);
@@ -9449,72 +9216,71 @@ with large files, such as the resulting squashfs will be over 3GB big." };
         [["file_architecture"; "/lib-i586.so.zst"]], "i386"), [];
     ];
     shortdesc = "detect the architecture of a binary file";
-    longdesc = "\
-This detects the architecture of the binary F<filename>,
+    longdesc = {|This detects the architecture of the binary F<filename>,
 and returns it if known.
 
 Currently defined architectures are:
 
 =over 4
 
-=item \"aarch64\"
+=item "aarch64"
 
 64 bit ARM.
 
-=item \"arm\"
+=item "arm"
 
 32 bit ARM.
 
-=item \"i386\"
+=item "i386"
 
 This string is returned for all 32 bit i386, i486, i586, i686 binaries
 irrespective of the precise processor requirements of the binary.
 
-=item \"ia64\"
+=item "ia64"
 
 Intel Itanium.
 
-=item \"ppc\"
+=item "ppc"
 
 32 bit Power PC.
 
-=item \"ppc64\"
+=item "ppc64"
 
 64 bit Power PC (big endian).
 
-=item \"ppc64le\"
+=item "ppc64le"
 
 64 bit Power PC (little endian).
 
-=item \"loongarch64\"
+=item "loongarch64"
 
 64 bit LoongArch64 (little endian).
 
-=item \"riscv32\"
+=item "riscv32"
 
-=item \"riscv64\"
+=item "riscv64"
 
-=item \"riscv128\"
+=item "riscv128"
 
 RISC-V 32-, 64- or 128-bit variants.
 
-=item \"s390\"
+=item "s390"
 
 31 bit IBM S/390.
 
-=item \"s390x\"
+=item "s390x"
 
 64 bit IBM S/390.
 
-=item \"sparc\"
+=item "sparc"
 
 32 bit SPARC.
 
-=item \"sparc64\"
+=item "sparc64"
 
 64 bit SPARC V9 and above.
 
-=item \"x86_64\"
+=item "x86_64"
 
 64 bit x86-64.
 
@@ -9581,15 +9347,14 @@ compressed code, and are horribly hard to unpack.  If you want to find
 the architecture of a kernel, use the architecture of the associated
 initrd or kernel module(s) instead.
 
-=back" };
+=back|} };
 
   { defaults with
     name = "list_filesystems"; added = (1, 5, 15);
     style = RHashtable (RMountable, RPlainString, "fses"), [], [];
     impl = OCaml "Listfs.list_filesystems";
     shortdesc = "list filesystems";
-    longdesc = "\
-This inspection command looks for filesystems on partitions,
+    longdesc = {|This inspection command looks for filesystems on partitions,
 block devices and logical volumes, returning a list of C<mountables>
 containing filesystems and their type.
 
@@ -9597,17 +9362,17 @@ The return value is a hash, where the keys are the devices
 containing filesystems, and the values are the filesystem types.
 For example:
 
- \"/dev/sda1\" => \"ntfs\"
- \"/dev/sda2\" => \"ext2\"
- \"/dev/vg_guest/lv_root\" => \"ext4\"
- \"/dev/vg_guest/lv_swap\" => \"swap\"
+ "/dev/sda1" => "ntfs"
+ "/dev/sda2" => "ext2"
+ "/dev/vg_guest/lv_root" => "ext4"
+ "/dev/vg_guest/lv_swap" => "swap"
 
 The key is not necessarily a block device. It may also be an opaque
 ‘mountable’ string which can be passed to C<guestfs_mount>.
 
-The value can have the special value \"unknown\", meaning the
+The value can have the special value "unknown", meaning the
 content of the device is undetermined or empty.
-\"swap\" means a Linux swap partition.
+"swap" means a Linux swap partition.
 
 In libguestfs E<le> 1.36 this command ran other libguestfs commands,
 which might have included C<guestfs_mount> and C<guestfs_umount>, and
@@ -9621,7 +9386,7 @@ this command does not check that each filesystem
 found is valid and mountable, and some filesystems might
 be mountable but require special options.  Filesystems may
 not all belong to a single logical operating system
-(use C<guestfs_inspect_os> to look for OSes)." };
+(use C<guestfs_inspect_os> to look for OSes).|} };
 
   { defaults with
     name = "part_resize"; added = (1, 37, 20);
@@ -9633,8 +9398,7 @@ not all belong to a single logical operating system
          ["part_resize"; "/dev/sda"; "1"; "-1"]]), []
     ];
     shortdesc = "resize a partition";
-    longdesc = "\
-This command resizes the partition numbered C<partnum> on C<device>
+    longdesc = {|This command resizes the partition numbered C<partnum> on C<device>
 by moving the end position.
 
 Note that this does not modify any filesystem present in the partition.
@@ -9643,7 +9407,7 @@ commands like C<guestfs_resize2fs>.
 
 When growing a partition you will want to grow the filesystem
 afterwards, but when shrinking, you need to shrink the filesystem
-before the partition." };
+before the partition.|} };
 
   { defaults with
     name = "f2fs_expand"; added = (1, 39, 3);
@@ -9662,8 +9426,7 @@ device." };
         [["lvm_scan"; "true"]]), []
     ];
     shortdesc = "scan for LVM physical volumes, volume groups and logical volumes";
-    longdesc = "\
-This scans all block devices and rebuilds the list of LVM
+    longdesc = {|This scans all block devices and rebuilds the list of LVM
 physical volumes, volume groups and logical volumes.
 
 If the C<activate> parameter is C<true> then newly found
@@ -9674,7 +9437,7 @@ When a libguestfs handle is launched it scans for existing
 devices, so you do not normally need to use this API.  However
 it is useful when you have added a new device or deleted an
 existing device (such as when the C<guestfs_luks_open> API
-is used)." };
+is used).|} };
 
   { defaults with
     name = "luks_uuid"; added = (1, 41, 9);
@@ -9691,8 +9454,7 @@ This returns the UUID of the LUKS device C<device>." };
     optional = Some "luks";
     test_excuse = "no way to format BitLocker, and smallest device is huge";
     shortdesc = "open an encrypted block device";
-    longdesc = "\
-This command opens a block device which has been encrypted
+    longdesc = {|This command opens a block device which has been encrypted
 according to the Linux Unified Key Setup (LUKS) standard,
 Windows BitLocker, or some other types.
 
@@ -9705,7 +9467,7 @@ This creates a new block device called F</dev/mapper/mapname>.
 Reads and writes to this block device are decrypted from and
 encrypted to the underlying C<device> respectively.
 
-C<mapname> cannot be C<\"control\"> because that name is reserved
+C<mapname> cannot be C<"control"> because that name is reserved
 by device-mapper.
 
 If the optional C<crypttype> parameter is not present then
@@ -9736,7 +9498,7 @@ calling C<guestfs_lvm_scan> with the C<activate>
 parameter C<true> will make them visible.
 
 Use C<guestfs_list_dm_devices> to list all device mapper
-devices." };
+devices.|} };
 
   { defaults with
     name = "cryptsetup_close"; added = (1, 43, 2);
@@ -9765,8 +9527,7 @@ and I<not> the name of the underlying block device." };
     optional = Some "clevisluks";
     test_excuse = "needs networking and a configured Tang server";
     shortdesc = "open an encrypted LUKS block device with Clevis and Tang";
-    longdesc = "\
-This command opens a block device that has been encrypted according to
+    longdesc = {|This command opens a block device that has been encrypted according to
 the Linux Unified Key Setup (LUKS) standard, using network-bound disk
 encryption (NBDE).
 
@@ -9788,14 +9549,14 @@ Reads and writes to this block device are decrypted from and encrypted
 to the underlying C<device> respectively.  Close the decrypted block
 device with C<guestfs_cryptsetup_close>.
 
-C<mapname> cannot be C<\"control\"> because that name is reserved by
+C<mapname> cannot be C<"control"> because that name is reserved by
 device-mapper.
 
 If this block device contains LVM volume groups, then calling
 C<guestfs_lvm_scan> with the C<activate> parameter C<true> will make
 them visible.
 
-Use C<guestfs_list_dm_devices> to list all device mapper devices." };
+Use C<guestfs_list_dm_devices> to list all device mapper devices.|} };
 
   { defaults with
     name = "setfiles"; added = (1, 57, 1);
@@ -9804,8 +9565,7 @@ Use C<guestfs_list_dm_devices> to list all device mapper devices." };
     optional = Some "selinuxrelabel";
     test_excuse = "tests are in the tests/relabel directory";
     shortdesc = "low level relabel parts of the filesystem";
-    longdesc = "\
-This invokes the SELinux C<setfiles> command which is a low
+    longdesc = {|This invokes the SELinux C<setfiles> command which is a low
 level tool used to relabel parts of the filesystem.
 
 The C<specfile> parameter controls the policy spec file used.
@@ -9815,12 +9575,12 @@ C</etc/selinux/> + I<selinuxtype> + C</contexts/files/file_contexts>.
 
 The required C<paths> parameter is the list of top level directories
 where relabelling starts.  C<setfiles> will only relabel up to
-filesystem boundaries so, for example, passing just C<\"/\"> will
+filesystem boundaries so, for example, passing just C<"/"> will
 relabel the whole root filesystem, but no other mounted filesystems.
 If the list is empty, setfiles is not called.
 
 The optional C<force> boolean controls whether the context
 is reset for customizable files, and also whether the
-user, role and range parts of the file context is changed." };
+user, role and range parts of the file context is changed.|} };
 
 ]
diff --git a/generator/actions_core_deprecated.ml b/generator/actions_core_deprecated.ml
index 2b1f5cdb4..aa98bd5fe 100644
--- a/generator/actions_core_deprecated.ml
+++ b/generator/actions_core_deprecated.ml
@@ -31,8 +31,7 @@ let non_daemon_functions = [
     deprecated_by = Deprecated_no_replacement;
     blocking = false;
     shortdesc = "wait until the hypervisor launches (no op)";
-    longdesc = "\
-This function is a no op.
+    longdesc = {|This function is a no op.
 
 In versions of the API E<lt> 1.0.71 you had to call this function
 just after calling C<guestfs_launch> to wait for the launch
@@ -41,7 +40,7 @@ C<guestfs_launch> now does the waiting.
 
 If you see any calls to this function in code then you can just
 remove them, unless you want to retain compatibility with older
-versions of the API." };
+versions of the API.|} };
 
   { defaults with
     name = "kill_subprocess"; added = (0, 0, 3);
@@ -92,8 +91,7 @@ Both the direct and the libvirt backends ignore C<iface>." };
     style = RStructList ("statbufs", "stat"), [String (Pathname, "path"); StringList (Filename, "names")], [];
     deprecated_by = Replaced_by "lstatnslist";
     shortdesc = "lstat on multiple files";
-    longdesc = "\
-This call allows you to perform the C<guestfs_lstat> operation
+    longdesc = {|This call allows you to perform the C<guestfs_lstat> operation
 on multiple files, where all files are in the directory C<path>.
 C<names> is the list of files from this directory.
 
@@ -105,7 +103,7 @@ is set to C<-1>.
 This call is intended for programs that want to efficiently
 list a directory contents without making many round-trips.
 See also C<guestfs_lxattrlist> for a similarly efficient call
-for getting extended attributes." };
+for getting extended attributes.|} };
 
   { defaults with
     name = "stat"; added = (1, 9, 2);
@@ -130,14 +128,13 @@ This is the same as the L<stat(2)> system call." };
         [["lstat"; "/empty"]], "ret->size == 0"), []
     ];
     shortdesc = "get file information for a symbolic link";
-    longdesc = "\
-Returns file information for the given C<path>.
+    longdesc = {|Returns file information for the given C<path>.
 
 This is the same as C<guestfs_stat> except that if C<path>
 is a symbolic link, then the link is stat-ed, not the file it
 refers to.
 
-This is the same as the L<lstat(2)> system call." };
+This is the same as the L<lstat(2)> system call.|} };
 
   { defaults with
     name = "remove_drive"; added = (1, 19, 49);
@@ -158,8 +155,7 @@ let daemon_functions = [
                    StringList (PlainString, "lines")], [];
     deprecated_by = Replaced_by "part_add";
     shortdesc = "create partitions on a block device";
-    longdesc = "\
-This is a direct interface to the L<sfdisk(8)> program for creating
+    longdesc = {|This is a direct interface to the L<sfdisk(8)> program for creating
 partitions on block devices.
 
 C<device> should be a block device, for example F</dev/sda>.
@@ -180,19 +176,18 @@ pass C<lines> as a single element list, when the single element being
 the string C<,> (comma).
 
 See also: C<guestfs_sfdisk_l>, C<guestfs_sfdisk_N>,
-C<guestfs_part_init>" };
+C<guestfs_part_init>|} };
 
   { defaults with
     name = "blockdev_setbsz"; added = (1, 9, 3);
     style = RErr, [String (Device, "device"); Int "blocksize"], [];
     deprecated_by = Deprecated_no_replacement;
     shortdesc = "set blocksize of block device";
-    longdesc = "\
-This call does nothing and has never done anything
+    longdesc = {|This call does nothing and has never done anything
 because of a bug in blockdev.  B<Do not use it.>
 
 If you need to set the filesystem block size, use the
-C<blocksize> option of C<guestfs_mkfs>." };
+C<blocksize> option of C<guestfs_mkfs>.|} };
 
   { defaults with
     name = "tgz_in"; added = (1, 0, 3);
@@ -230,13 +225,12 @@ it to local file C<tarball>." };
          ["get_e2label"; "/dev/sda1"]], "testlabel"), []
     ];
     shortdesc = "set the ext2/3/4 filesystem label";
-    longdesc = "\
-This sets the ext2/3/4 filesystem label of the filesystem on
+    longdesc = {|This sets the ext2/3/4 filesystem label of the filesystem on
 C<device> to C<label>.  Filesystem labels are limited to
 16 characters.
 
 You can use either C<guestfs_tune2fs_l> or C<guestfs_get_e2label>
-to return the existing label on a filesystem." };
+to return the existing label on a filesystem.|} };
 
   { defaults with
     name = "get_e2label"; added = (1, 0, 15);
@@ -266,14 +260,13 @@ C<device>." };
           [["set_e2uuid"; "/dev/sda1"; "time"]]), []
       ];
     shortdesc = "set the ext2/3/4 filesystem UUID";
-    longdesc = "\
-This sets the ext2/3/4 filesystem UUID of the filesystem on
+    longdesc = {|This sets the ext2/3/4 filesystem UUID of the filesystem on
 C<device> to C<uuid>.  The format of the UUID and alternatives
 such as C<clear>, C<random> and C<time> are described in the
 L<tune2fs(8)> manpage.
 
 You can use C<guestfs_vfs_uuid> to return the existing UUID
-of a filesystem." };
+of a filesystem.|} };
 
   { defaults with
     name = "get_e2uuid"; added = (1, 0, 15);
@@ -298,26 +291,24 @@ C<device>." };
                    String (PlainString, "line")], [];
     deprecated_by = Replaced_by "part_add";
     shortdesc = "modify a single partition on a block device";
-    longdesc = "\
-This runs L<sfdisk(8)> option to modify just the single
+    longdesc = {|This runs L<sfdisk(8)> option to modify just the single
 partition C<n> (note: C<n> counts from 1).
 
 For other parameters, see C<guestfs_sfdisk>.  You should usually
 pass C<0> for the cyls/heads/sectors parameters.
 
-See also: C<guestfs_part_add>" };
+See also: C<guestfs_part_add>|} };
 
   { defaults with
     name = "sfdisk_l"; added = (1, 0, 26);
     style = RString (RDevice, "partitions"), [String (Device, "device")], [];
     deprecated_by = Replaced_by "part_list";
     shortdesc = "display the partition table";
-    longdesc = "\
-This displays the partition table on C<device>, in the
+    longdesc = {|This displays the partition table on C<device>, in the
 human-readable output of the L<sfdisk(8)> command.  It is
 not intended to be parsed.
 
-See also: C<guestfs_part_list>" };
+See also: C<guestfs_part_list>|} };
 
   { defaults with
     name = "e2fsck_f"; added = (1, 0, 29);
@@ -339,12 +330,11 @@ even if the filesystem appears to be clean (I<-f>)." };
          ["mkswap_L"; "hello"; "/dev/sda1"]]), []
     ];
     shortdesc = "create a swap partition with a label";
-    longdesc = "\
-Create a swap partition on C<device> with label C<label>.
+    longdesc = {|Create a swap partition on C<device> with label C<label>.
 
 Note that you cannot attach a swap label to a block device
 (eg. F</dev/sda>), just to a partition.  This appears to be
-a limitation of the kernel or swap tools." };
+a limitation of the kernel or swap tools.|} };
 
   { defaults with
     name = "mkswap_U"; added = (1, 0, 55);
@@ -365,29 +355,27 @@ Create a swap partition on C<device> with UUID C<uuid>." };
     style = RErr, [String (Device, "device"); StringList (PlainString, "lines")], [];
     deprecated_by = Replaced_by "part_add";
     shortdesc = "create partitions on a block device";
-    longdesc = "\
-This is a simplified interface to the C<guestfs_sfdisk>
+    longdesc = {|This is a simplified interface to the C<guestfs_sfdisk>
 command, where partition sizes are specified in megabytes
 only (rounded to the nearest cylinder) and you don't need
 to specify the cyls, heads and sectors parameters which
 were rarely if ever used anyway.
 
 See also: C<guestfs_sfdisk>, the L<sfdisk(8)> manpage
-and C<guestfs_part_disk>" };
+and C<guestfs_part_disk>|} };
 
   { defaults with
     name = "zfile"; added = (1, 0, 59);
     style = RString (RPlainString, "description"), [String (PlainString, "meth"); String (Pathname, "path")], [];
     deprecated_by = Replaced_by "file";
     shortdesc = "determine file type inside a compressed file";
-    longdesc = "\
-This command runs L<file(1)> after first decompressing C<path>
+    longdesc = {|This command runs L<file(1)> after first decompressing C<path>
 using C<meth>.
 
 C<meth> must be one of C<gzip>, C<compress> or C<bzip2>.
 
 Since 1.0.63, use C<guestfs_file> instead which can now
-process compressed files." };
+process compressed files.|} };
 
   { defaults with
     name = "egrep"; added = (1, 0, 66);
@@ -565,14 +553,13 @@ matching lines." };
          ["stat"; "/fallocate"]], "ret->size == 1000000"), []
     ];
     shortdesc = "preallocate a file in the guest filesystem";
-    longdesc = "\
-This command preallocates a file (containing zero bytes) named
+    longdesc = {|This command preallocates a file (containing zero bytes) named
 C<path> of size C<len> bytes.  If the file exists already, it
 is overwritten.
 
 Do not confuse this with the guestfish-specific
 C<alloc> command which allocates a file in the host and
-attaches it as a device." };
+attaches it as a device.|} };
 
   { defaults with
     name = "setcon"; added = (1, 0, 67);
@@ -626,14 +613,13 @@ and C<guestfs_setcon>" };
          ["mkfs_b"; "ntfs"; "32768"; "/dev/sda1"]]), []
     ];
     shortdesc = "make a filesystem with block size";
-    longdesc = "\
-This call is similar to C<guestfs_mkfs>, but it allows you to
+    longdesc = {|This call is similar to C<guestfs_mkfs>, but it allows you to
 control the block size of the resulting filesystem.  Supported
 block sizes depend on the filesystem type, but typically they
 are C<1024>, C<2048> or C<4096> only.
 
 For VFAT and NTFS the C<blocksize> parameter is treated as
-the requested cluster size." };
+the requested cluster size.|} };
 
   { defaults with
     name = "mke2journal"; added = (1, 0, 68);
@@ -701,14 +687,13 @@ This creates an ext2 external journal on C<device> with UUID C<uuid>." };
     style = RErr, [String (PlainString, "fstype"); Int "blocksize"; String (Device, "device"); String (Device, "journal")], [];
     deprecated_by = Replaced_by "mke2fs";
     shortdesc = "make ext2/3/4 filesystem with external journal";
-    longdesc = "\
-This creates an ext2/3/4 filesystem on C<device> with
+    longdesc = {|This creates an ext2/3/4 filesystem on C<device> with
 an external journal on C<journal>.  It is equivalent
 to the command:
 
  mke2fs -t fstype -b blocksize -J device=<journal> <device>
 
-See also C<guestfs_mke2journal>." };
+See also C<guestfs_mke2journal>.|} };
 
   { defaults with
     name = "mke2fs_JL"; added = (1, 0, 68);
@@ -746,8 +731,7 @@ See also C<guestfs_mke2journal_U>." };
         "compare_buffers (ret, size, \"hello, world\", 12) == 0"), []
     ];
     shortdesc = "copy from source to destination using dd";
-    longdesc = "\
-This command copies from one source device or file C<src>
+    longdesc = {|This command copies from one source device or file C<src>
 to another destination device or file C<dest>.  Normally you
 would use this to copy to or from a device or partition, for
 example to duplicate a filesystem.
@@ -755,7 +739,7 @@ example to duplicate a filesystem.
 If the destination is a device, it must be as large or larger
 than the source file or device, otherwise the copy will fail.
 This command cannot do partial copies
-(see C<guestfs_copy_device_to_device>)." };
+(see C<guestfs_copy_device_to_device>).|} };
 
   { defaults with
     name = "txz_in"; added = (1, 3, 2);
@@ -804,8 +788,7 @@ is I<not> intended that you try to parse the output string." };
         [["write_file"; "/write_file"; "abc"; "10000"]], []
     ];
     shortdesc = "create a file";
-    longdesc = "\
-This call creates a file called C<path>.  The contents of the
+    longdesc = {|This call creates a file called C<path>.  The contents of the
 file is the string C<content> (which can contain any 8 bit data),
 with length C<size>.
 
@@ -814,7 +797,7 @@ then the length is calculated using C<strlen> (so in this case
 the content cannot contain embedded ASCII NULs).
 
 I<NB.> Owing to a bug, writing content containing ASCII NUL
-characters does I<not> work, even if the length is specified." };
+characters does I<not> work, even if the length is specified.|} };
 
   { defaults with
     name = "copy_size"; added = (1, 0, 87);
@@ -829,12 +812,11 @@ characters does I<not> work, even if the length is specified." };
         "compare_buffers (ret, size, \"hello\", 5) == 0"), []
     ];
     shortdesc = "copy size bytes from source to destination using dd";
-    longdesc = "\
-This command copies exactly C<size> bytes from one source device
+    longdesc = {|This command copies exactly C<size> bytes from one source device
 or file C<src> to another destination device or file C<dest>.
 
 Note this will fail if the source is too short or if the destination
-is not large enough." };
+is not large enough.|} };
 
   { defaults with
     name = "ntfsresize_size"; added = (1, 3, 14);
@@ -865,8 +847,7 @@ physical volumes, volume groups and logical volumes." };
     optional = Some "luks";
     deprecated_by = Replaced_by "cryptsetup_open";
     shortdesc = "open a LUKS-encrypted block device";
-    longdesc = "\
-This command opens a block device which has been encrypted
+    longdesc = {|This command opens a block device which has been encrypted
 according to the Linux Unified Key Setup (LUKS) standard.
 
 C<device> is the encrypted block device or partition.
@@ -883,7 +864,7 @@ calling C<guestfs_lvm_scan> with the C<activate>
 parameter C<true> will make them visible.
 
 Use C<guestfs_list_dm_devices> to list all device mapper
-devices." };
+devices.|} };
 
   { defaults with
     name = "luks_open_ro"; added = (1, 5, 1);
@@ -903,12 +884,11 @@ mapping is created." };
     optional = Some "luks";
     deprecated_by = Replaced_by "cryptsetup_close";
     shortdesc = "close a LUKS device";
-    longdesc = "\
-This closes a LUKS device that was created earlier by
+    longdesc = {|This closes a LUKS device that was created earlier by
 C<guestfs_luks_open> or C<guestfs_luks_open_ro>.  The
 C<device> parameter must be the name of the LUKS mapping
 device (ie. F</dev/mapper/mapname>) and I<not> the name
-of the underlying block device." };
+of the underlying block device.|} };
 
   { defaults with
     name = "list_9p"; added = (1, 11, 12);
@@ -950,8 +930,7 @@ filesystem is stored." };
     deprecated_by = Replaced_by "setfiles";
     test_excuse = "tests are in the tests/relabel directory";
     shortdesc = "relabel parts of the filesystem";
-    longdesc = "\
-SELinux relabel parts of the filesystem.
+    longdesc = {|SELinux relabel parts of the filesystem.
 
 The C<specfile> parameter controls the policy spec file used.
 You have to parse C</etc/selinux/config> to find the correct
@@ -964,6 +943,6 @@ to relabel the whole guest filesystem.
 
 The optional C<force> boolean controls whether the context
 is reset for customizable files, and also whether the
-user, role and range parts of the file context is changed." };
+user, role and range parts of the file context is changed.|} };
 
 ]
diff --git a/generator/actions_debug.ml b/generator/actions_debug.ml
index 958af12e5..51c530534 100644
--- a/generator/actions_debug.ml
+++ b/generator/actions_debug.ml
@@ -41,14 +41,13 @@ let daemon_functions = [
     style = RString (RPlainString, "result"), [String (PlainString, "subcmd"); StringList (PlainString, "extraargs")], [];
     visibility = VDebug;
     shortdesc = "debugging and internals";
-    longdesc = "\
-The C<guestfs_debug> command exposes some internals of
+    longdesc = {|The C<guestfs_debug> command exposes some internals of
 C<guestfsd> (the guestfs daemon) that runs inside the
 hypervisor.
 
 There is no comprehensive help for this command.  You have
 to look at the file F<daemon/debug.c> in the libguestfs source
-to find out what you can do." };
+to find out what you can do.|} };
 
   { defaults with
     name = "debug_upload"; added = (1, 3, 5);
@@ -56,12 +55,11 @@ to find out what you can do." };
     visibility = VDebug;
     cancellable = true;
     shortdesc = "upload a file to the appliance (internal use only)";
-    longdesc = "\
-The C<guestfs_debug_upload> command uploads a file to
+    longdesc = {|The C<guestfs_debug_upload> command uploads a file to
 the libguestfs appliance.
 
 There is no comprehensive help for this command.  You have
 to look at the file F<daemon/debug.c> in the libguestfs source
-to find out what it is for." };
+to find out what it is for.|} };
 
 ]
diff --git a/generator/actions_hivex.ml b/generator/actions_hivex.ml
index 681127143..bf9f96827 100644
--- a/generator/actions_hivex.ml
+++ b/generator/actions_hivex.ml
@@ -37,12 +37,11 @@ let daemon_functions = [
          ["hivex_node_values"; "0x1020"]]), [["hivex_close"]]
     ];
     shortdesc = "open a Windows Registry hive file";
-    longdesc = "\
-Open the Windows Registry hive file named F<filename>.
+    longdesc = {|Open the Windows Registry hive file named F<filename>.
 If there was any previous hivex handle associated with this
 guestfs session, then it is closed.
 
-This is a wrapper around the L<hivex(3)> call of the same name." };
+This is a wrapper around the L<hivex(3)> call of the same name.|} };
 
   { defaults with
     name = "hivex_close"; added = (1, 19, 35);
@@ -120,12 +119,11 @@ This is a wrapper around the L<hivex(3)> call of the same name." };
     style = RInt64 "valueh", [Int64 "nodeh"; String (PlainString, "key")], [];
     optional = Some "hivex";
     shortdesc = "return the named value";
-    longdesc = "\
-Return the value attached to C<nodeh> which has the
+    longdesc = {|Return the value attached to C<nodeh> which has the
 name C<key>, if it exists.  This can return C<0> meaning
 the key was not found.
 
-This is a wrapper around the L<hivex(3)> call of the same name." };
+This is a wrapper around the L<hivex(3)> call of the same name.|} };
 
   { defaults with
     name = "hivex_value_key"; added = (1, 19, 35);
@@ -152,20 +150,18 @@ This is a wrapper around the L<hivex(3)> call of the same name." };
     style = RBufferOut "databuf", [Int64 "valueh"], [];
     optional = Some "hivex";
     shortdesc = "return the data field from the (key, datatype, data) tuple";
-    longdesc = "\
-Return the data field of a (key, datatype, data) tuple.
+    longdesc = {|Return the data field of a (key, datatype, data) tuple.
 
 This is a wrapper around the L<hivex(3)> call of the same name.
 
-See also: C<guestfs_hivex_value_utf8>." };
+See also: C<guestfs_hivex_value_utf8>.|} };
 
   { defaults with
     name = "hivex_value_string"; added = (1, 37, 22);
     style = RString (RPlainString, "databuf"), [Int64 "valueh"], [];
     optional = Some "hivex";
     shortdesc = "return the data field as a UTF-8 string";
-    longdesc = "\
-This calls C<guestfs_hivex_value_value> (which returns the
+    longdesc = {|This calls C<guestfs_hivex_value_value> (which returns the
 data field from a hivex value tuple).  It then assumes that
 the field is a UTF-16LE string and converts the result to
 UTF-8 (or if this is not possible, it returns an error).
@@ -173,7 +169,7 @@ UTF-8 (or if this is not possible, it returns an error).
 This is useful for reading strings out of the Windows registry.
 However it is not foolproof because the registry is not
 strongly-typed and fields can contain arbitrary or unexpected
-data." };
+data.|} };
 
   { defaults with
     name = "hivex_commit"; added = (1, 19, 35);
@@ -191,15 +187,14 @@ data." };
          ["is_file"; "/hivex_commit2_copy"; "false"]]), [["hivex_close"]]
     ];
     shortdesc = "commit (write) changes back to the hive";
-    longdesc = "\
-Commit (write) changes to the hive.
+    longdesc = {|Commit (write) changes to the hive.
 
 If the optional F<filename> parameter is null, then the changes
 are written back to the same hive that was opened.  If this is
 not null then they are written to the alternate filename given
 and the original hive is left untouched.
 
-This is a wrapper around the L<hivex(3)> call of the same name." };
+This is a wrapper around the L<hivex(3)> call of the same name.|} };
 
   { defaults with
     name = "hivex_node_add_child"; added = (1, 19, 35);
diff --git a/generator/actions_hivex_deprecated.ml b/generator/actions_hivex_deprecated.ml
index 5b5a1f2d5..b274fcbd0 100644
--- a/generator/actions_hivex_deprecated.ml
+++ b/generator/actions_hivex_deprecated.ml
@@ -29,8 +29,7 @@ let daemon_functions = [
     optional = Some "hivex";
     deprecated_by = Replaced_by "hivex_value_string";
     shortdesc = "return the data field as a UTF-8 string";
-    longdesc = "\
-This calls C<guestfs_hivex_value_value> (which returns the
+    longdesc = {|This calls C<guestfs_hivex_value_value> (which returns the
 data field from a hivex value tuple).  It then assumes that
 the field is a UTF-16LE string and converts the result to
 UTF-8 (or if this is not possible, it returns an error).
@@ -38,6 +37,6 @@ UTF-8 (or if this is not possible, it returns an error).
 This is useful for reading strings out of the Windows registry.
 However it is not foolproof because the registry is not
 strongly-typed and fields can contain arbitrary or unexpected
-data." };
+data.|} };
 
 ]
diff --git a/generator/actions_inspection.ml b/generator/actions_inspection.ml
index 72b13df75..71634ad93 100644
--- a/generator/actions_inspection.ml
+++ b/generator/actions_inspection.ml
@@ -28,8 +28,7 @@ let daemon_functions = [
     style = RStringList (RMountable, "roots"), [], [];
     impl = OCaml "Inspect.inspect_os";
     shortdesc = "inspect disk and return list of operating systems found";
-    longdesc = "\
-This function uses other libguestfs functions and certain
+    longdesc = {|This function uses other libguestfs functions and certain
 heuristics to inspect the disk(s) (usually disks belonging to
 a virtual machine), looking for operating systems.
 
@@ -59,67 +58,65 @@ disk is encrypted.
 
 Please read L<guestfs(3)/INSPECTION> for more details.
 
-See also C<guestfs_list_filesystems>." };
+See also C<guestfs_list_filesystems>.|} };
 
   { defaults with
     name = "inspect_get_roots"; added = (1, 7, 3);
     style = RStringList (RMountable, "roots"), [], [];
     impl = OCaml "Inspect.inspect_get_roots";
     shortdesc = "return list of operating systems found by last inspection";
-    longdesc = "\
-This function is a convenient way to get the list of root
+    longdesc = {|This function is a convenient way to get the list of root
 devices, as returned from a previous call to C<guestfs_inspect_os>,
 but without redoing the whole inspection process.
 
 This returns an empty list if either no root devices were
 found or the caller has not called C<guestfs_inspect_os>.
 
-Please read L<guestfs(3)/INSPECTION> for more details." };
+Please read L<guestfs(3)/INSPECTION> for more details.|} };
 
   { defaults with
     name = "inspect_get_type"; added = (1, 5, 3);
     style = RString (RPlainString, "name"), [String (Mountable, "root")], [];
     impl = OCaml "Inspect.inspect_get_type";
     shortdesc = "get type of inspected operating system";
-    longdesc = "\
-This returns the type of the inspected operating system.
+    longdesc = {|This returns the type of the inspected operating system.
 Currently defined types are:
 
 =over 4
 
-=item \"linux\"
+=item "linux"
 
 Any Linux-based operating system.
 
-=item \"windows\"
+=item "windows"
 
 Any Microsoft Windows operating system.
 
-=item \"freebsd\"
+=item "freebsd"
 
 FreeBSD.
 
-=item \"netbsd\"
+=item "netbsd"
 
 NetBSD.
 
-=item \"openbsd\"
+=item "openbsd"
 
 OpenBSD.
 
-=item \"hurd\"
+=item "hurd"
 
 GNU/Hurd.
 
-=item \"dos\"
+=item "dos"
 
 MS-DOS, FreeDOS and others.
 
-=item \"minix\"
+=item "minix"
 
 MINIX.
 
-=item \"unknown\"
+=item "unknown"
 
 The operating system type could not be determined.
 
@@ -128,201 +125,199 @@ The operating system type could not be determined.
 Future versions of libguestfs may return other strings here.
 The caller should be prepared to handle any string.
 
-Please read L<guestfs(3)/INSPECTION> for more details." };
+Please read L<guestfs(3)/INSPECTION> for more details.|} };
 
   { defaults with
     name = "inspect_get_arch"; added = (1, 5, 3);
     style = RString (RPlainString, "arch"), [String (Mountable, "root")], [];
     impl = OCaml "Inspect.inspect_get_arch";
     shortdesc = "get architecture of inspected operating system";
-    longdesc = "\
-This returns the architecture of the inspected operating system.
+    longdesc = {|This returns the architecture of the inspected operating system.
 The possible return values are listed under
 C<guestfs_file_architecture>.
 
 If the architecture could not be determined, then the
 string C<unknown> is returned.
 
-Please read L<guestfs(3)/INSPECTION> for more details." };
+Please read L<guestfs(3)/INSPECTION> for more details.|} };
 
   { defaults with
     name = "inspect_get_distro"; added = (1, 5, 3);
     style = RString (RPlainString, "distro"), [String (Mountable, "root")], [];
     impl = OCaml "Inspect.inspect_get_distro";
     shortdesc = "get distro of inspected operating system";
-    longdesc = "\
-This returns the distro (distribution) of the inspected operating
+    longdesc = {|This returns the distro (distribution) of the inspected operating
 system.
 
 Currently defined distros are:
 
 =over 4
 
-=item \"alpinelinux\"
+=item "alpinelinux"
 
 Alpine Linux.
 
-=item \"altlinux\"
+=item "altlinux"
 
 ALT Linux.
 
-=item \"archlinux\"
+=item "archlinux"
 
 Arch Linux.
 
-=item \"buildroot\"
+=item "buildroot"
 
 Buildroot-derived distro, but not one we specifically recognize.
 
-=item \"centos\"
+=item "centos"
 
 CentOS.
 
-=item \"circle\"
+=item "circle"
 
 Circle Linux.
 
-=item \"cirros\"
+=item "cirros"
 
 Cirros.
 
-=item \"coreos\"
+=item "coreos"
 
 CoreOS.
 
-=item \"debian\"
+=item "debian"
 
 Debian.
 
-=item \"fedora\"
+=item "fedora"
 
 Fedora.
 
-=item \"freebsd\"
+=item "freebsd"
 
 FreeBSD.
 
-=item \"freedos\"
+=item "freedos"
 
 FreeDOS.
 
-=item \"frugalware\"
+=item "frugalware"
 
 Frugalware.
 
-=item \"gentoo\"
+=item "gentoo"
 
 Gentoo.
 
-=item \"kalilinux\"
+=item "kalilinux"
 
 Kali Linux.
 
-=item \"kylin\"
+=item "kylin"
 
 Kylin.
 
-=item \"linuxmint\"
+=item "linuxmint"
 
 Linux Mint.
 
-=item \"mageia\"
+=item "mageia"
 
 Mageia.
 
-=item \"mandriva\"
+=item "mandriva"
 
 Mandriva.
 
-=item \"meego\"
+=item "meego"
 
 MeeGo.
 
-=item \"msdos\"
+=item "msdos"
 
 Microsoft DOS.
 
-=item \"neokylin\"
+=item "neokylin"
 
 NeoKylin.
 
-=item \"netbsd\"
+=item "netbsd"
 
 NetBSD.
 
-=item \"openbsd\"
+=item "openbsd"
 
 OpenBSD.
 
-=item \"openeuler\"
+=item "openeuler"
 
 openEuler.
 
-=item \"openmandriva\"
+=item "openmandriva"
 
 OpenMandriva Lx.
 
-=item \"opensuse\"
+=item "opensuse"
 
 OpenSUSE.
 
-=item \"oraclelinux\"
+=item "oraclelinux"
 
 Oracle Linux.
 
-=item \"pardus\"
+=item "pardus"
 
 Pardus.
 
-=item \"pldlinux\"
+=item "pldlinux"
 
 PLD Linux.
 
-=item \"redhat-based\"
+=item "redhat-based"
 
 Some Red Hat-derived distro.
 
-=item \"rhel\"
+=item "rhel"
 
 Red Hat Enterprise Linux.
 
-=item \"rocky\"
+=item "rocky"
 
 Rocky Linux.
 
-=item \"scientificlinux\"
+=item "scientificlinux"
 
 Scientific Linux.
 
-=item \"slackware\"
+=item "slackware"
 
 Slackware.
 
-=item \"sles\"
+=item "sles"
 
 SuSE Linux Enterprise Server or Desktop.
 
-=item \"suse-based\"
+=item "suse-based"
 
 Some openSuSE-derived distro.
 
-=item \"ttylinux\"
+=item "ttylinux"
 
 ttylinux.
 
-=item \"ubuntu\"
+=item "ubuntu"
 
 Ubuntu.
 
-=item \"unknown\"
+=item "unknown"
 
 The distro could not be determined.
 
-=item \"voidlinux\"
+=item "voidlinux"
 
 Void Linux.
 
-=item \"windows\"
+=item "windows"
 
 Windows does not have distributions.  This string is
 returned if the OS type is Windows.
@@ -332,49 +327,46 @@ returned if the OS type is Windows.
 Future versions of libguestfs may return other strings here.
 The caller should be prepared to handle any string.
 
-Please read L<guestfs(3)/INSPECTION> for more details." };
+Please read L<guestfs(3)/INSPECTION> for more details.|} };
 
   { defaults with
     name = "inspect_get_major_version"; added = (1, 5, 3);
     style = RInt "major", [String (Mountable, "root")], [];
     impl = OCaml "Inspect.inspect_get_major_version";
     shortdesc = "get major version of inspected operating system";
-    longdesc = "\
-This returns the major version number of the inspected operating
+    longdesc = {|This returns the major version number of the inspected operating
 system.
 
 Windows uses a consistent versioning scheme which is I<not>
 reflected in the popular public names used by the operating system.
-Notably the operating system known as \"Windows 7\" is really
+Notably the operating system known as "Windows 7" is really
 version 6.1 (ie. major = 6, minor = 1).  You can find out the
 real versions corresponding to releases of Windows by consulting
 Wikipedia or MSDN.
 
 If the version could not be determined, then C<0> is returned.
 
-Please read L<guestfs(3)/INSPECTION> for more details." };
+Please read L<guestfs(3)/INSPECTION> for more details.|} };
 
   { defaults with
     name = "inspect_get_minor_version"; added = (1, 5, 3);
     style = RInt "minor", [String (Mountable, "root")], [];
     impl = OCaml "Inspect.inspect_get_minor_version";
     shortdesc = "get minor version of inspected operating system";
-    longdesc = "\
-This returns the minor version number of the inspected operating
+    longdesc = {|This returns the minor version number of the inspected operating
 system.
 
 If the version could not be determined, then C<0> is returned.
 
 Please read L<guestfs(3)/INSPECTION> for more details.
-See also C<guestfs_inspect_get_major_version>." };
+See also C<guestfs_inspect_get_major_version>.|} };
 
   { defaults with
     name = "inspect_get_product_name"; added = (1, 5, 3);
     style = RString (RPlainString, "product"), [String (Mountable, "root")], [];
     impl = OCaml "Inspect.inspect_get_product_name";
     shortdesc = "get product name of inspected operating system";
-    longdesc = "\
-This returns the product name of the inspected operating
+    longdesc = {|This returns the product name of the inspected operating
 system.  The product name is generally some freeform string
 which can be displayed to the user, but should not be
 parsed by programs.
@@ -382,30 +374,28 @@ parsed by programs.
 If the product name could not be determined, then the
 string C<unknown> is returned.
 
-Please read L<guestfs(3)/INSPECTION> for more details." };
+Please read L<guestfs(3)/INSPECTION> for more details.|} };
 
   { defaults with
     name = "inspect_get_windows_systemroot"; added = (1, 5, 25);
     style = RString (RPlainString, "systemroot"), [String (Mountable, "root")], [];
     impl = OCaml "Inspect.inspect_get_windows_systemroot";
     shortdesc = "get Windows systemroot of inspected operating system";
-    longdesc = "\
-This returns the Windows systemroot of the inspected guest.
+    longdesc = {|This returns the Windows systemroot of the inspected guest.
 The systemroot is a directory path such as F</WINDOWS>.
 
 This call assumes that the guest is Windows and that the
 systemroot could be determined by inspection.  If this is not
 the case then an error is returned.
 
-Please read L<guestfs(3)/INSPECTION> for more details." };
+Please read L<guestfs(3)/INSPECTION> for more details.|} };
 
   { defaults with
     name = "inspect_get_package_format"; added = (1, 7, 5);
     style = RString (RPlainString, "packageformat"), [String (Mountable, "root")], [];
     impl = OCaml "Inspect.inspect_get_package_format";
     shortdesc = "get package format used by the operating system";
-    longdesc = "\
-This function and C<guestfs_inspect_get_package_management> return
+    longdesc = {|This function and C<guestfs_inspect_get_package_management> return
 the package format and package management tool used by the
 inspected operating system.  For example for Fedora these
 functions would return C<rpm> (package format), and
@@ -420,15 +410,14 @@ C<rpm>, C<deb>, C<ebuild>, C<pisi>, C<pacman>, C<pkgsrc>, C<apk>,
 C<xbps>.
 Future versions of libguestfs may return other strings.
 
-Please read L<guestfs(3)/INSPECTION> for more details." };
+Please read L<guestfs(3)/INSPECTION> for more details.|} };
 
   { defaults with
     name = "inspect_get_package_management"; added = (1, 7, 5);
     style = RString (RPlainString, "packagemanagement"), [String (Mountable, "root")], [];
     impl = OCaml "Inspect.inspect_get_package_management";
     shortdesc = "get package management tool used by the operating system";
-    longdesc = "\
-C<guestfs_inspect_get_package_format> and this function return
+    longdesc = {|C<guestfs_inspect_get_package_format> and this function return
 the package format and package management tool used by the
 inspected operating system.  For example for Fedora these
 functions would return C<rpm> (package format), and
@@ -443,33 +432,31 @@ C<apt> (for all Debian derivatives),
 C<portage>, C<pisi>, C<pacman>, C<urpmi>, C<zypper>, C<apk>, C<xbps>.
 Future versions of libguestfs may return other strings.
 
-Please read L<guestfs(3)/INSPECTION> for more details." };
+Please read L<guestfs(3)/INSPECTION> for more details.|} };
 
   { defaults with
     name = "inspect_get_hostname"; added = (1, 7, 9);
     style = RString (RPlainString, "hostname"), [String (Mountable, "root")], [];
     impl = OCaml "Inspect.inspect_get_hostname";
     shortdesc = "get hostname of the operating system";
-    longdesc = "\
-This function returns the hostname of the operating system
+    longdesc = {|This function returns the hostname of the operating system
 as found by inspection of the guest’s configuration files.
 
 If the hostname could not be determined, then the
 string C<unknown> is returned.
 
-Please read L<guestfs(3)/INSPECTION> for more details." };
+Please read L<guestfs(3)/INSPECTION> for more details.|} };
 
   { defaults with
     name = "inspect_get_product_variant"; added = (1, 9, 13);
     style = RString (RPlainString, "variant"), [String (Mountable, "root")], [];
     impl = OCaml "Inspect.inspect_get_product_variant";
     shortdesc = "get product variant of inspected operating system";
-    longdesc = "\
-This returns the product variant of the inspected operating
+    longdesc = {|This returns the product variant of the inspected operating
 system.
 
 For Windows guests, this returns the contents of the Registry key
-C<HKLM\\Software\\Microsoft\\Windows NT\\CurrentVersion>
+C<HKLM\Software\Microsoft\Windows NT\CurrentVersion>
 C<InstallationType> which is usually a string such as
 C<Client> or C<Server> (other values are possible).  This
 can be used to distinguish consumer and enterprise versions
@@ -486,31 +473,29 @@ string C<unknown> is returned.
 
 Please read L<guestfs(3)/INSPECTION> for more details.
 See also C<guestfs_inspect_get_product_name>,
-C<guestfs_inspect_get_major_version>." };
+C<guestfs_inspect_get_major_version>.|} };
 
   { defaults with
     name = "inspect_get_windows_current_control_set"; added = (1, 9, 17);
     style = RString (RPlainString, "controlset"), [String (Mountable, "root")], [];
     impl = OCaml "Inspect.inspect_get_windows_current_control_set";
     shortdesc = "get Windows CurrentControlSet of inspected operating system";
-    longdesc = "\
-This returns the Windows CurrentControlSet of the inspected guest.
+    longdesc = {|This returns the Windows CurrentControlSet of the inspected guest.
 The CurrentControlSet is a registry key name such as C<ControlSet001>.
 
 This call assumes that the guest is Windows and that the
 Registry could be examined by inspection.  If this is not
 the case then an error is returned.
 
-Please read L<guestfs(3)/INSPECTION> for more details." };
+Please read L<guestfs(3)/INSPECTION> for more details.|} };
 
   { defaults with
     name = "inspect_get_windows_software_hive"; added = (1, 35, 26);
     style = RString (RPlainString, "path"), [String (Mountable, "root")], [];
     impl = OCaml "Inspect.inspect_get_windows_software_hive";
     shortdesc = "get the path of the Windows software hive";
-    longdesc = "\
-This returns the path to the hive (binary Windows Registry file)
-corresponding to HKLM\\SOFTWARE.
+    longdesc = {|This returns the path to the hive (binary Windows Registry file)
+corresponding to HKLM\SOFTWARE.
 
 This call assumes that the guest is Windows and that the guest
 has a software hive file with the right name.  If this is not the
@@ -519,16 +504,15 @@ hive is a valid Windows Registry hive.
 
 You can use C<guestfs_hivex_open> to read or write to the hive.
 
-Please read L<guestfs(3)/INSPECTION> for more details." };
+Please read L<guestfs(3)/INSPECTION> for more details.|} };
 
   { defaults with
     name = "inspect_get_windows_system_hive"; added = (1, 35, 26);
     style = RString (RPlainString, "path"), [String (Mountable, "root")], [];
     impl = OCaml "Inspect.inspect_get_windows_system_hive";
     shortdesc = "get the path of the Windows system hive";
-    longdesc = "\
-This returns the path to the hive (binary Windows Registry file)
-corresponding to HKLM\\SYSTEM.
+    longdesc = {|This returns the path to the hive (binary Windows Registry file)
+corresponding to HKLM\SYSTEM.
 
 This call assumes that the guest is Windows and that the guest
 has a system hive file with the right name.  If this is not the
@@ -537,16 +521,15 @@ hive is a valid Windows Registry hive.
 
 You can use C<guestfs_hivex_open> to read or write to the hive.
 
-Please read L<guestfs(3)/INSPECTION> for more details." };
+Please read L<guestfs(3)/INSPECTION> for more details.|} };
 
   { defaults with
     name = "inspect_get_build_id"; added = (1, 49, 8);
     style = RString (RPlainString, "buildid"), [String (Mountable, "root")], [];
     impl = OCaml "Inspect.inspect_get_build_id";
     shortdesc = "get the system build ID";
-    longdesc = "\
-This returns the build ID of the system, or the string
-C<\"unknown\"> if the system does not have a build ID.
+    longdesc = {|This returns the build ID of the system, or the string
+C<"unknown"> if the system does not have a build ID.
 
 For Windows, this gets the build number.  Although it is
 returned as a string, it is (so far) always a number.  See
@@ -556,15 +539,14 @@ for some possible values.
 For Linux, this returns the C<BUILD_ID> string from
 F</etc/os-release>, although this is not often used.
 
-Please read L<guestfs(3)/INSPECTION> for more details." };
+Please read L<guestfs(3)/INSPECTION> for more details.|} };
 
   { defaults with
     name = "inspect_get_mountpoints"; added = (1, 5, 3);
     style = RHashtable (RPlainString, RMountable, "mountpoints"), [String (Mountable, "root")], [];
     impl = OCaml "Inspect.inspect_get_mountpoints";
     shortdesc = "get mountpoints of inspected operating system";
-    longdesc = "\
-This returns a hash of where we think the filesystems
+    longdesc = {|This returns a hash of where we think the filesystems
 associated with this operating system should be mounted.
 Callers should note that this is at best an educated guess
 made by reading configuration files such as F</etc/fstab>.
@@ -583,20 +565,19 @@ returned in this list.
 
 For operating systems like Windows which still use drive
 letters, this call will only return an entry for the first
-drive \"mounted on\" F</>.  For information about the
+drive "mounted on" F</>.  For information about the
 mapping of drive letters to partitions, see
 C<guestfs_inspect_get_drive_mappings>.
 
 Please read L<guestfs(3)/INSPECTION> for more details.
-See also C<guestfs_inspect_get_filesystems>." };
+See also C<guestfs_inspect_get_filesystems>.|} };
 
   { defaults with
     name = "inspect_get_filesystems"; added = (1, 5, 3);
     style = RStringList (RMountable, "filesystems"), [String (Mountable, "root")], [];
     impl = OCaml "Inspect.inspect_get_filesystems";
     shortdesc = "get filesystems associated with inspected operating system";
-    longdesc = "\
-This returns a list of all the filesystems that we think
+    longdesc = {|This returns a list of all the filesystems that we think
 are associated with this operating system.  This includes
 the root filesystem, other ordinary filesystems, and
 non-mounted devices like swap partitions.
@@ -605,16 +586,15 @@ In the case of a multi-boot virtual machine, it is possible
 for a filesystem to be shared between operating systems.
 
 Please read L<guestfs(3)/INSPECTION> for more details.
-See also C<guestfs_inspect_get_mountpoints>." };
+See also C<guestfs_inspect_get_mountpoints>.|} };
 
   { defaults with
     name = "inspect_get_drive_mappings"; added = (1, 9, 17);
     style = RHashtable (RPlainString, RDevice, "drives"), [String (Mountable, "root")], [];
     impl = OCaml "Inspect.inspect_get_drive_mappings";
     shortdesc = "get drive letter mappings";
-    longdesc = "\
-This call is useful for Windows which uses a primitive system
-of assigning drive letters (like F<C:\\>) to partitions.
+    longdesc = {|This call is useful for Windows which uses a primitive system
+of assigning drive letters (like F<C:\>) to partitions.
 This inspection API examines the Windows Registry to find out
 how disks/partitions are mapped to drive letters, and returns
 a hash table as in the example below:
@@ -640,7 +620,7 @@ could not be determined, this returns an empty hash table.
 
 Please read L<guestfs(3)/INSPECTION> for more details.
 See also C<guestfs_inspect_get_mountpoints>,
-C<guestfs_inspect_get_filesystems>." };
+C<guestfs_inspect_get_filesystems>.|} };
 
   { defaults with
     name = "internal_list_rpm_applications"; added = (1, 45, 3);
@@ -659,8 +639,7 @@ let non_daemon_functions = [
     name = "inspect_list_applications2"; added = (1, 19, 56);
     style = RStructList ("applications2", "application2"), [String (Mountable, "root")], [];
     shortdesc = "get list of applications installed in the operating system";
-    longdesc = "\
-Return the list of applications installed in the operating system.
+    longdesc = {|Return the list of applications installed in the operating system.
 
 I<Note:> This call works differently from other parts of the
 inspection API.  You have to call C<guestfs_inspect_os>, then
@@ -689,7 +668,7 @@ name.
 The display name of the application, sometimes localized to the
 install language of the guest operating system.
 
-If unavailable this is returned as an empty string C<\"\">.
+If unavailable this is returned as an empty string C<"">.
 Callers needing to display something can use C<app2_name> instead.
 
 =item C<app2_epoch>
@@ -700,19 +679,19 @@ the package (an integer).  If unavailable, this is returned as C<0>.
 =item C<app2_version>
 
 The version string of the application or package.  If unavailable
-this is returned as an empty string C<\"\">.
+this is returned as an empty string C<"">.
 
 =item C<app2_release>
 
 The release string of the application or package, for package
 managers that use this.  If unavailable this is returned as an
-empty string C<\"\">.
+empty string C<"">.
 
 =item C<app2_arch>
 
 The architecture string of the application or package, for package
 managers that use this.  If unavailable this is returned as an empty
-string C<\"\">.
+string C<"">.
 
 =item C<app2_install_path>
 
@@ -721,49 +700,48 @@ such as Windows which use installation paths).  This path is
 in the format used by the guest operating system, it is not
 a libguestfs path.
 
-If unavailable this is returned as an empty string C<\"\">.
+If unavailable this is returned as an empty string C<"">.
 
 =item C<app2_trans_path>
 
 The install path translated into a libguestfs path.
-If unavailable this is returned as an empty string C<\"\">.
+If unavailable this is returned as an empty string C<"">.
 
 =item C<app2_publisher>
 
 The name of the publisher of the application, for package
 managers that use this.  If unavailable this is returned
-as an empty string C<\"\">.
+as an empty string C<"">.
 
 =item C<app2_url>
 
 The URL (eg. upstream URL) of the application.
-If unavailable this is returned as an empty string C<\"\">.
+If unavailable this is returned as an empty string C<"">.
 
 =item C<app2_source_package>
 
 For packaging systems which support this, the name of the source
-package.  If unavailable this is returned as an empty string C<\"\">.
+package.  If unavailable this is returned as an empty string C<"">.
 
 =item C<app2_summary>
 
 A short (usually one line) description of the application or package.
-If unavailable this is returned as an empty string C<\"\">.
+If unavailable this is returned as an empty string C<"">.
 
 =item C<app2_description>
 
 A longer description of the application or package.
-If unavailable this is returned as an empty string C<\"\">.
+If unavailable this is returned as an empty string C<"">.
 
 =back
 
-Please read L<guestfs(3)/INSPECTION> for more details." };
+Please read L<guestfs(3)/INSPECTION> for more details.|} };
 
   { defaults with
     name = "inspect_get_icon"; added = (1, 11, 12);
     style = RBufferOut "icon", [String (Mountable, "root")],  [OBool "favicon"; OBool "highquality"];
     shortdesc = "get the icon corresponding to this operating system";
-    longdesc = "\
-This function returns an icon corresponding to the inspected
+    longdesc = {|This function returns an icon corresponding to the inspected
 operating system.  The icon is returned as a buffer containing a
 PNG image (re-encoded to PNG if necessary).
 
@@ -771,7 +749,7 @@ If it was not possible to get an icon this function returns a
 zero-length (non-NULL) buffer.  I<Callers must check for this case>.
 
 Libguestfs will start by looking for a file called
-F</etc/favicon.png> or F<C:\\etc\\favicon.png>
+F</etc/favicon.png> or F<C:\etc\favicon.png>
 and if it has the correct format, the contents of this file will
 be returned.  You can disable favicons by passing the
 optional C<favicon> boolean as false (default is true).
@@ -821,20 +799,19 @@ from the C<netpbm> package.  These must be installed separately.
 Operating system icons are usually trademarks.  Seek legal
 advice before using trademarks in applications.
 
-=back" };
+=back|} };
 
   { defaults with
     name = "inspect_get_osinfo"; added = (1, 39, 1);
     style = RString (RPlainString, "id"), [String (Mountable, "root")], [];
     shortdesc = "get a possible osinfo short ID corresponding to this operating system";
-    longdesc = "\
-This function returns a possible short ID for libosinfo corresponding
+    longdesc = {|This function returns a possible short ID for libosinfo corresponding
 to the guest.
 
 I<Note:> The returned ID is only a guess by libguestfs, and nothing
 ensures that it actually exists in osinfo-db.
 
 If no ID could not be determined, then the string C<unknown> is
-returned." };
+returned.|} };
 
 ]
diff --git a/generator/actions_inspection_deprecated.ml b/generator/actions_inspection_deprecated.ml
index 8e5909ffd..7963e222e 100644
--- a/generator/actions_inspection_deprecated.ml
+++ b/generator/actions_inspection_deprecated.ml
@@ -28,8 +28,7 @@ let non_daemon_functions = [
     style = RStructList ("applications", "application"), [String (Mountable, "root")], [];
     deprecated_by = Replaced_by "inspect_list_applications2";
     shortdesc = "get list of applications installed in the operating system";
-    longdesc = "\
-Return the list of applications installed in the operating system.
+    longdesc = {|Return the list of applications installed in the operating system.
 
 I<Note:> This call works differently from other parts of the
 inspection API.  You have to call C<guestfs_inspect_os>, then
@@ -58,7 +57,7 @@ name.
 The display name of the application, sometimes localized to the
 install language of the guest operating system.
 
-If unavailable this is returned as an empty string C<\"\">.
+If unavailable this is returned as an empty string C<"">.
 Callers needing to display something can use C<app_name> instead.
 
 =item C<app_epoch>
@@ -69,13 +68,13 @@ the package (an integer).  If unavailable, this is returned as C<0>.
 =item C<app_version>
 
 The version string of the application or package.  If unavailable
-this is returned as an empty string C<\"\">.
+this is returned as an empty string C<"">.
 
 =item C<app_release>
 
 The release string of the application or package, for package
 managers that use this.  If unavailable this is returned as an
-empty string C<\"\">.
+empty string C<"">.
 
 =item C<app_install_path>
 
@@ -84,42 +83,42 @@ such as Windows which use installation paths).  This path is
 in the format used by the guest operating system, it is not
 a libguestfs path.
 
-If unavailable this is returned as an empty string C<\"\">.
+If unavailable this is returned as an empty string C<"">.
 
 =item C<app_trans_path>
 
 The install path translated into a libguestfs path.
-If unavailable this is returned as an empty string C<\"\">.
+If unavailable this is returned as an empty string C<"">.
 
 =item C<app_publisher>
 
 The name of the publisher of the application, for package
 managers that use this.  If unavailable this is returned
-as an empty string C<\"\">.
+as an empty string C<"">.
 
 =item C<app_url>
 
 The URL (eg. upstream URL) of the application.
-If unavailable this is returned as an empty string C<\"\">.
+If unavailable this is returned as an empty string C<"">.
 
 =item C<app_source_package>
 
 For packaging systems which support this, the name of the source
-package.  If unavailable this is returned as an empty string C<\"\">.
+package.  If unavailable this is returned as an empty string C<"">.
 
 =item C<app_summary>
 
 A short (usually one line) description of the application or package.
-If unavailable this is returned as an empty string C<\"\">.
+If unavailable this is returned as an empty string C<"">.
 
 =item C<app_description>
 
 A longer description of the application or package.
-If unavailable this is returned as an empty string C<\"\">.
+If unavailable this is returned as an empty string C<"">.
 
 =back
 
-Please read L<guestfs(3)/INSPECTION> for more details." };
+Please read L<guestfs(3)/INSPECTION> for more details.|} };
 
 ]
 
@@ -130,8 +129,7 @@ let daemon_functions = [
     impl = OCaml "Inspect.inspect_get_format";
     deprecated_by = Deprecated_no_replacement;
     shortdesc = "get format of inspected operating system";
-    longdesc = "\
-Before libguestfs 1.38, there was some unreliable support for detecting
+    longdesc = {|Before libguestfs 1.38, there was some unreliable support for detecting
 installer CDs.  This API would return:
 
 =over 4
@@ -154,7 +152,7 @@ The format of this disk image is not known.
 In libguestfs E<ge> 1.38, this only returns C<installed>.
 Use libosinfo directly to detect installer CDs.
 
-Please read L<guestfs(3)/INSPECTION> for more details." };
+Please read L<guestfs(3)/INSPECTION> for more details.|} };
 
   { defaults with
     name = "inspect_is_live"; added = (1, 9, 4);
diff --git a/generator/actions_internal_tests.ml b/generator/actions_internal_tests.ml
index c912e05c4..6762abca5 100644
--- a/generator/actions_internal_tests.ml
+++ b/generator/actions_internal_tests.ml
@@ -64,15 +64,14 @@ let test_functions = [
     visibility = VBindTest; cancellable = true;
     blocking = false;
     shortdesc = "internal test function - do not use";
-    longdesc = "\
-This is an internal test function which is used to test whether
+    longdesc = {|This is an internal test function which is used to test whether
 the automatically generated bindings can handle every possible
 parameter type correctly.
 
 It echos the contents of each parameter to stdout (by default)
 or to a file (if C<guestfs_internal_test_set_output> was called).
 
-You probably don't want to call this function." };
+You probably don't want to call this function.|} };
 
   { defaults with
     name = "internal_test_only_optargs";
@@ -80,15 +79,14 @@ You probably don't want to call this function." };
     visibility = VBindTest; cancellable = true;
     blocking = false;
     shortdesc = "internal test function - do not use";
-    longdesc = "\
-This is an internal test function which is used to test whether
+    longdesc = {|This is an internal test function which is used to test whether
 the automatically generated bindings can handle no args, some
 optargs correctly.
 
 It echos the contents of each parameter to stdout (by default)
 or to a file (if C<guestfs_internal_test_set_output> was called).
 
-You probably don't want to call this function." };
+You probably don't want to call this function.|} };
 
   { defaults with
     name = "internal_test_63_optargs";
@@ -96,8 +94,7 @@ You probably don't want to call this function." };
     visibility = VBindTest; cancellable = true;
     blocking = false;
     shortdesc = "internal test function - do not use";
-    longdesc = "\
-This is an internal test function which is used to test whether
+    longdesc = {|This is an internal test function which is used to test whether
 the automatically generated bindings can handle the full range
 of 63 optargs correctly.  (Note that 63 is not an absolute limit
 and it could be raised by changing the XDR protocol).
@@ -105,7 +102,7 @@ and it could be raised by changing the XDR protocol).
 It echos the contents of each parameter to stdout (by default)
 or to a file (if C<guestfs_internal_test_set_output> was called).
 
-You probably don't want to call this function." }
+You probably don't want to call this function.|} }
 
 ] @ List.flatten (
   List.map (
@@ -116,28 +113,26 @@ You probably don't want to call this function." }
         visibility = VBindTest;
         blocking = false;
         shortdesc = "internal test function - do not use";
-        longdesc = "\
-This is an internal test function which is used to test whether
+        longdesc = {|This is an internal test function which is used to test whether
 the automatically generated bindings can handle every possible
 return type correctly.
 
 It converts string C<val> to the return type.
 
-You probably don't want to call this function." };
+You probably don't want to call this function.|} };
       { defaults with
         name = name ^ "err";
         style = ret, [], [];
         visibility = VBindTest;
         blocking = false;
         shortdesc = "internal test function - do not use";
-        longdesc = "\
-This is an internal test function which is used to test whether
+        longdesc = {|This is an internal test function which is used to test whether
 the automatically generated bindings can handle every possible
 return type correctly.
 
 This function always returns an error.
 
-You probably don't want to call this function." }
+You probably don't want to call this function.|} }
     ]
   ) test_all_rets
 )
@@ -149,14 +144,13 @@ let test_support_functions = [
     visibility = VBindTest;
     blocking = false;
     shortdesc = "internal test function - do not use";
-    longdesc = "\
-This is an internal test function which is used to test whether
+    longdesc = {|This is an internal test function which is used to test whether
 the automatically generated bindings can handle every possible
 parameter type correctly.
 
 It sets the output file used by C<guestfs_internal_test>.
 
-You probably don't want to call this function." };
+You probably don't want to call this function.|} };
 
   { defaults with
     name = "internal_test_close_output";
@@ -164,13 +158,12 @@ You probably don't want to call this function." };
     visibility = VBindTest;
     blocking = false;
     shortdesc = "internal test function - do not use";
-    longdesc = "\
-This is an internal test function which is used to test whether
+    longdesc = {|This is an internal test function which is used to test whether
 the automatically generated bindings can handle every possible
 parameter type correctly.
 
 It closes the output file previously opened by
 C<guestfs_internal_test_set_output>.
 
-You probably don't want to call this function." };
+You probably don't want to call this function.|} };
 ]
diff --git a/generator/actions_properties.ml b/generator/actions_properties.ml
index 4a6ad225c..61fca197a 100644
--- a/generator/actions_properties.ml
+++ b/generator/actions_properties.ml
@@ -29,8 +29,7 @@ let non_daemon_functions = [
     fish_alias = ["hv"]; config_only = true;
     blocking = false;
     shortdesc = "set the hypervisor binary";
-    longdesc = "\
-Set the hypervisor binary that we will use.  The hypervisor
+    longdesc = {|Set the hypervisor binary that we will use.  The hypervisor
 depends on the backend, but is usually the location of the
 qemu/KVM hypervisor.
 
@@ -46,7 +45,7 @@ operations depend on testing qemu features (by running C<qemu -help>).
 If the qemu binary changes, we don't retest features, and
 so you might see inconsistent results.  Using the environment
 variable C<LIBGUESTFS_HV> is safest of all since that picks
-the qemu binary at the same time as the handle is created." };
+the qemu binary at the same time as the handle is created.|} };
 
   { defaults with
     name = "get_hv"; added = (1, 23, 17);
@@ -69,13 +68,12 @@ return the default qemu binary name." };
     fish_alias = ["path"]; config_only = true;
     blocking = false;
     shortdesc = "set the search path";
-    longdesc = "\
-Set the path that libguestfs searches for kernel and initrd.img.
+    longdesc = {|Set the path that libguestfs searches for kernel and initrd.img.
 
 The default is C<$libdir/guestfs> unless overridden by setting
 C<LIBGUESTFS_PATH> environment variable.
 
-Setting C<path> to C<NULL> restores the default path." };
+Setting C<path> to C<NULL> restores the default path.|} };
 
   { defaults with
     name = "get_path"; added = (0, 0, 3);
@@ -98,15 +96,14 @@ return the default path." };
     fish_alias = ["append"]; config_only = true;
     blocking = false;
     shortdesc = "add options to kernel command line";
-    longdesc = "\
-This function is used to add additional options to the
+    longdesc = {|This function is used to add additional options to the
 libguestfs appliance kernel command line.
 
 The default is C<NULL> unless overridden by setting
 C<LIBGUESTFS_APPEND> environment variable.
 
 Setting C<append> to C<NULL> means I<no> additional options
-are passed (libguestfs always adds a few of its own)." };
+are passed (libguestfs always adds a few of its own).|} };
 
   { defaults with
     name = "get_append"; added = (1, 0, 26);
@@ -129,14 +126,13 @@ If C<NULL> then no options are added." };
     fish_alias = ["autosync"];
     blocking = false;
     shortdesc = "set autosync mode";
-    longdesc = "\
-If C<autosync> is true, this enables autosync.  Libguestfs will make a
+    longdesc = {|If C<autosync> is true, this enables autosync.  Libguestfs will make a
 best effort attempt to make filesystems consistent and synchronized
 when the handle is closed
 (also if the program exits without closing handles).
 
 This is enabled by default (since libguestfs 1.5.24, previously it was
-disabled by default)." };
+disabled by default).|} };
 
   { defaults with
     name = "get_autosync"; added = (0, 0, 3);
@@ -156,15 +152,14 @@ Get the autosync flag." };
     fish_alias = ["verbose"];
     blocking = false;
     shortdesc = "set verbose mode";
-    longdesc = "\
-If C<verbose> is true, this turns on verbose messages.
+    longdesc = {|If C<verbose> is true, this turns on verbose messages.
 
 Verbose messages are disabled unless the environment variable
 C<LIBGUESTFS_DEBUG> is defined and set to C<1>.
 
 Verbose messages are normally sent to C<stderr>, unless you
 register a callback to send them somewhere else (see
-C<guestfs_set_event_callback>)." };
+C<guestfs_set_event_callback>).|} };
 
   { defaults with
     name = "get_verbose"; added = (0, 0, 3);
@@ -180,8 +175,7 @@ This returns the verbose messages flag." };
     fish_alias = ["memsize"]; config_only = true;
     blocking = false;
     shortdesc = "set memory allocated to the hypervisor";
-    longdesc = "\
-This sets the memory size in megabytes allocated to the
+    longdesc = {|This sets the memory size in megabytes allocated to the
 hypervisor.  This only has any effect if called before
 C<guestfs_launch>.
 
@@ -190,7 +184,7 @@ variable C<LIBGUESTFS_MEMSIZE> before the handle is
 created.
 
 For more information on the architecture of libguestfs,
-see L<guestfs(3)>." };
+see L<guestfs(3)>.|} };
 
   { defaults with
     name = "get_memsize"; added = (1, 0, 55);
@@ -201,8 +195,7 @@ see L<guestfs(3)>." };
       [["get_memsize"]], "ret >= 256"), []
     ];
     shortdesc = "get memory allocated to the hypervisor";
-    longdesc = "\
-This gets the memory size in megabytes allocated to the
+    longdesc = {|This gets the memory size in megabytes allocated to the
 hypervisor.
 
 If C<guestfs_set_memsize> was not called
@@ -210,7 +203,7 @@ on this handle, and if C<LIBGUESTFS_MEMSIZE> was not set,
 then this returns the compiled-in default value for memsize.
 
 For more information on the architecture of libguestfs,
-see L<guestfs(3)>." };
+see L<guestfs(3)>.|} };
 
   { defaults with
     name = "get_pid"; added = (1, 0, 56);
@@ -235,8 +228,7 @@ This is an internal call used for debugging and testing." };
          ["get_trace"]]), []
     ];
     shortdesc = "enable or disable command traces";
-    longdesc = "\
-If the command trace flag is set to 1, then libguestfs
+    longdesc = {|If the command trace flag is set to 1, then libguestfs
 calls, parameters and return values are traced.
 
 If you want to trace C API calls into libguestfs (and
@@ -248,7 +240,7 @@ C<LIBGUESTFS_TRACE> is defined and set to C<1>.
 
 Trace messages are normally sent to C<stderr>, unless you
 register a callback to send them somewhere else (see
-C<guestfs_set_event_callback>)." };
+C<guestfs_set_event_callback>).|} };
 
   { defaults with
     name = "get_trace"; added = (1, 0, 69);
@@ -264,8 +256,7 @@ Return the command trace flag." };
     fish_alias = ["recovery-proc"]; config_only = true;
     blocking = false;
     shortdesc = "enable or disable the recovery process";
-    longdesc = "\
-If this is called with the parameter C<false> then
+    longdesc = {|If this is called with the parameter C<false> then
 C<guestfs_launch> does not create a recovery process.  The
 purpose of the recovery process is to stop runaway hypervisor
 processes in the case where the main program aborts abruptly.
@@ -275,9 +266,9 @@ and the default is true.
 
 About the only time when you would want to disable this is
 if the main process will fork itself into the background
-(\"daemonize\" itself).  In this case the recovery process
+("daemonize" itself).  In this case the recovery process
 thinks that the main program has disappeared and so kills
-the hypervisor, which is not very helpful." };
+the hypervisor, which is not very helpful.|} };
 
   { defaults with
     name = "get_recovery_proc"; added = (1, 0, 77);
@@ -293,15 +284,14 @@ Return the recovery process enabled flag." };
     fish_alias = ["network"]; config_only = true;
     blocking = false;
     shortdesc = "set enable network flag";
-    longdesc = "\
-If C<network> is true, then the network is enabled in the
+    longdesc = {|If C<network> is true, then the network is enabled in the
 libguestfs appliance.  The default is false.
 
 This affects whether commands are able to access the network
 (see L<guestfs(3)/RUNNING COMMANDS>).
 
 You must call this before calling C<guestfs_launch>, otherwise
-it has no effect." };
+it has no effect.|} };
 
   { defaults with
     name = "get_network"; added = (1, 5, 4);
@@ -317,13 +307,12 @@ This returns the enable network flag." };
     fish_alias = ["backend"]; config_only = true;
     blocking = false;
     shortdesc = "set the backend";
-    longdesc = "\
-Set the method that libguestfs uses to connect to the backend
+    longdesc = {|Set the method that libguestfs uses to connect to the backend
 guestfsd daemon.
 
-This handle property was previously called the \"attach method\".
+This handle property was previously called the "attach method".
 
-See L<guestfs(3)/BACKEND>." };
+See L<guestfs(3)/BACKEND>.|} };
 
   { defaults with
     name = "get_backend"; added = (1, 21, 26);
@@ -334,12 +323,11 @@ See L<guestfs(3)/BACKEND>." };
         [["get_backend"]]), []
     ];
     shortdesc = "get the backend";
-    longdesc = "\
-Return the current backend.
+    longdesc = {|Return the current backend.
 
-This handle property was previously called the \"attach method\".
+This handle property was previously called the "attach method".
 
-See C<guestfs_set_backend> and L<guestfs(3)/BACKEND>." };
+See C<guestfs_set_backend> and L<guestfs(3)/BACKEND>.|} };
 
   { defaults with
     name = "set_pgroup"; added = (1, 11, 18);
@@ -347,8 +335,7 @@ See C<guestfs_set_backend> and L<guestfs(3)/BACKEND>." };
     fish_alias = ["pgroup"]; config_only = true;
     blocking = false;
     shortdesc = "set process group flag";
-    longdesc = "\
-If C<pgroup> is true, child processes are placed into
+    longdesc = {|If C<pgroup> is true, child processes are placed into
 their own process group.
 
 The practical upshot of this is that signals like C<SIGINT> (from
@@ -357,7 +344,7 @@ users pressing C<^C>) won't be received by the child process.
 The default for this flag is false, because usually you want
 C<^C> to kill the subprocess.  Guestfish sets this flag to
 true when used interactively, so that C<^C> can cancel
-long-running commands gracefully (see C<guestfs_user_cancel>)." };
+long-running commands gracefully (see C<guestfs_user_cancel>).|} };
 
   { defaults with
     name = "get_pgroup"; added = (1, 11, 18);
@@ -373,12 +360,11 @@ This returns the process group flag." };
     fish_alias = ["smp"]; config_only = true;
     blocking = false;
     shortdesc = "set number of virtual CPUs in appliance";
-    longdesc = "\
-Change the number of virtual CPUs assigned to the appliance.  The
+    longdesc = {|Change the number of virtual CPUs assigned to the appliance.  The
 default is C<1>.  Increasing this may improve performance, though
 often it has no effect.
 
-This function must be called before C<guestfs_launch>." };
+This function must be called before C<guestfs_launch>.|} };
 
   { defaults with
     name = "get_smp"; added = (1, 13, 15);
@@ -394,13 +380,12 @@ This returns the number of virtual CPUs assigned to the appliance." };
     fish_alias = ["tmpdir"]; config_only = true;
     blocking = false;
     shortdesc = "set the temporary directory";
-    longdesc = "\
-Set the directory used by the handle to store temporary files.
+    longdesc = {|Set the directory used by the handle to store temporary files.
 
 The environment variables C<LIBGUESTFS_TMPDIR> and C<TMPDIR>
 control the default value: If C<LIBGUESTFS_TMPDIR> is set, then
 that is the default.  Else if C<TMPDIR> is set, then that is
-the default.  Else F</tmp> is the default." };
+the default.  Else F</tmp> is the default.|} };
 
   { defaults with
     name = "get_tmpdir"; added = (1, 19, 58);
@@ -416,8 +401,7 @@ Get the directory used by the handle to store temporary files." };
     fish_alias = ["cachedir"]; config_only = true;
     blocking = false;
     shortdesc = "set the appliance cache directory";
-    longdesc = "\
-Set the directory used by the handle to store the appliance
+    longdesc = {|Set the directory used by the handle to store the appliance
 cache, when using a supermin appliance.  The appliance is
 cached and shared between all handles which have the same
 effective user ID.
@@ -425,7 +409,7 @@ effective user ID.
 The environment variables C<LIBGUESTFS_CACHEDIR> and C<TMPDIR>
 control the default value: If C<LIBGUESTFS_CACHEDIR> is set, then
 that is the default.  Else if C<TMPDIR> is set, then that is
-the default.  Else F</var/tmp> is the default." };
+the default.  Else F</var/tmp> is the default.|} };
 
   { defaults with
     name = "get_cachedir"; added = (1, 19, 58);
@@ -441,13 +425,12 @@ Get the directory used by the handle to store the appliance cache." };
     fish_alias = ["program"];
     blocking = false;
     shortdesc = "set the program name";
-    longdesc = "\
-Set the program name.  This is an informative string which the
+    longdesc = {|Set the program name.  This is an informative string which the
 main program may optionally set in the handle.
 
 When the handle is created, the program name in the handle is
 set to the basename from C<argv[0]>.  The program name can never
-be C<NULL>." };
+be C<NULL>.|} };
 
   { defaults with
     name = "get_program"; added = (1, 21, 29);
@@ -470,13 +453,12 @@ Get the program name.  See C<guestfs_set_program>." };
         [["get_backend_settings"]]), []
     ];
     shortdesc = "get per-backend settings";
-    longdesc = "\
-Return the current backend settings.
+    longdesc = {|Return the current backend settings.
 
 This call returns all backend settings strings.  If you want to
 find a single backend setting, see C<guestfs_get_backend_setting>.
 
-See L<guestfs(3)/BACKEND>, L<guestfs(3)/BACKEND SETTINGS>." };
+See L<guestfs(3)/BACKEND>, L<guestfs(3)/BACKEND SETTINGS>.|} };
 
   { defaults with
     name = "set_backend_settings"; added = (1, 25, 24);
@@ -484,8 +466,7 @@ See L<guestfs(3)/BACKEND>, L<guestfs(3)/BACKEND SETTINGS>." };
     config_only = true;
     blocking = false;
     shortdesc = "replace per-backend settings strings";
-    longdesc = "\
-Set a list of zero or more settings which are passed through to
+    longdesc = {|Set a list of zero or more settings which are passed through to
 the current backend.  Each setting is a string which is interpreted
 in a backend-specific way, or ignored if not understood by the
 backend.
@@ -500,24 +481,23 @@ a single backend setting, see C<guestfs_set_backend_setting>.
 If you want to clear a single backend setting, see
 C<guestfs_clear_backend_setting>.
 
-See L<guestfs(3)/BACKEND>, L<guestfs(3)/BACKEND SETTINGS>." };
+See L<guestfs(3)/BACKEND>, L<guestfs(3)/BACKEND SETTINGS>.|} };
 
   { defaults with
     name = "get_backend_setting"; added = (1, 27, 2);
     style = RString (RPlainString, "val"), [String (PlainString, "name")], [];
     blocking = false;
     shortdesc = "get a single per-backend settings string";
-    longdesc = "\
-Find a backend setting string which is either C<\"name\"> or
-begins with C<\"name=\">.  If C<\"name\">, this returns the
-string C<\"1\">.  If C<\"name=\">, this returns the part
+    longdesc = {|Find a backend setting string which is either C<"name"> or
+begins with C<"name=">.  If C<"name">, this returns the
+string C<"1">.  If C<"name=">, this returns the part
 after the equals sign (which may be an empty string).
 
 If no such setting is found, this function throws an error.
 The errno (see C<guestfs_last_errno>) will be C<ESRCH> in this
 case.
 
-See L<guestfs(3)/BACKEND>, L<guestfs(3)/BACKEND SETTINGS>." };
+See L<guestfs(3)/BACKEND>, L<guestfs(3)/BACKEND SETTINGS>.|} };
 
   { defaults with
     name = "set_backend_setting"; added = (1, 27, 2);
@@ -525,12 +505,11 @@ See L<guestfs(3)/BACKEND>, L<guestfs(3)/BACKEND SETTINGS>." };
     config_only = true;
     blocking = false;
     shortdesc = "set a single per-backend settings string";
-    longdesc = "\
-Append C<\"name=value\"> to the backend settings string list.
-However if a string already exists matching C<\"name\">
-or beginning with C<\"name=\">, then that setting is replaced.
+    longdesc = {|Append C<"name=value"> to the backend settings string list.
+However if a string already exists matching C<"name">
+or beginning with C<"name=">, then that setting is replaced.
 
-See L<guestfs(3)/BACKEND>, L<guestfs(3)/BACKEND SETTINGS>." };
+See L<guestfs(3)/BACKEND>, L<guestfs(3)/BACKEND SETTINGS>.|} };
 
   { defaults with
     name = "clear_backend_setting"; added = (1, 27, 2);
@@ -538,15 +517,14 @@ See L<guestfs(3)/BACKEND>, L<guestfs(3)/BACKEND SETTINGS>." };
     config_only = true;
     blocking = false;
     shortdesc = "remove a single per-backend settings string";
-    longdesc = "\
-If there is a backend setting string matching C<\"name\"> or
-beginning with C<\"name=\">, then that string is removed
+    longdesc = {|If there is a backend setting string matching C<"name"> or
+beginning with C<"name=">, then that string is removed
 from the backend settings.
 
 This call returns the number of strings which were removed
 (which may be 0, 1 or greater than 1).
 
-See L<guestfs(3)/BACKEND>, L<guestfs(3)/BACKEND SETTINGS>." };
+See L<guestfs(3)/BACKEND>, L<guestfs(3)/BACKEND SETTINGS>.|} };
 
   { defaults with
     name = "set_identifier"; added = (1, 31, 14);
@@ -554,8 +532,7 @@ See L<guestfs(3)/BACKEND>, L<guestfs(3)/BACKEND SETTINGS>." };
     fish_alias = ["identifier"];
     blocking = false;
     shortdesc = "set the handle identifier";
-    longdesc = "\
-This is an informative string which the caller may optionally
+    longdesc = {|This is an informative string which the caller may optionally
 set in the handle.  It is printed in various places, allowing
 the current handle to be identified in debugging output.
 
@@ -564,12 +541,12 @@ identifier string is not an empty string, then trace messages
 change from this:
 
  libguestfs: trace: get_tmpdir
- libguestfs: trace: get_tmpdir = \"/tmp\"
+ libguestfs: trace: get_tmpdir = "/tmp"
 
 to this:
 
  libguestfs: trace: ID: get_tmpdir
- libguestfs: trace: ID: get_tmpdir = \"/tmp\"
+ libguestfs: trace: ID: get_tmpdir = "/tmp"
 
 where C<ID> is the identifier string set by this call.
 
@@ -577,7 +554,7 @@ The identifier must only contain alphanumeric ASCII characters,
 underscore and minus sign.  The default is the empty string.
 
 See also C<guestfs_set_program>, C<guestfs_set_trace>,
-C<guestfs_get_identifier>." };
+C<guestfs_get_identifier>.|} };
 
   { defaults with
     name = "get_identifier"; added = (1, 31, 14);
@@ -596,8 +573,7 @@ Get the handle identifier.  See C<guestfs_set_identifier>." };
     style = RString (RPlainString, "sockdir"), [], [];
     blocking = false;
     shortdesc = "get the temporary directory for sockets and PID files";
-    longdesc = "\
-Get the directory used by the handle to store temporary socket and PID
+    longdesc = {|Get the directory used by the handle to store temporary socket and PID
 files.
 
 This is different from C<guestfs_get_tmpdir>, as we need shorter
@@ -609,7 +585,7 @@ the temporary directory returned by C<guestfs_get_tmpdir>.
 
 The environment variable C<XDG_RUNTIME_DIR> controls the default
 value: If C<XDG_RUNTIME_DIR> is set, then that is the default.
-Else F</tmp> is the default." };
+Else F</tmp> is the default.|} };
 
 ]
 
diff --git a/generator/actions_properties_deprecated.ml b/generator/actions_properties_deprecated.ml
index a0814485a..9e9369ce9 100644
--- a/generator/actions_properties_deprecated.ml
+++ b/generator/actions_properties_deprecated.ml
@@ -32,8 +32,7 @@ let non_daemon_functions = [
     blocking = false;
     deprecated_by = Replaced_by "set_hv";
     shortdesc = "set the hypervisor binary (usually qemu)";
-    longdesc = "\
-Set the hypervisor binary (usually qemu) that we will use.
+    longdesc = {|Set the hypervisor binary (usually qemu) that we will use.
 
 The default is chosen when the library was compiled by the
 configure script.
@@ -49,7 +48,7 @@ operations depend on testing qemu features (by running C<qemu -help>).
 If the qemu binary changes, we don't retest features, and
 so you might see inconsistent results.  Using the environment
 variable C<LIBGUESTFS_HV> is safest of all since that picks
-the qemu binary at the same time as the handle is created." };
+the qemu binary at the same time as the handle is created.|} };
 
   { defaults with
     name = "get_qemu"; added = (1, 0, 6);
@@ -74,15 +73,14 @@ return the default qemu binary name." };
     blocking = false;
     deprecated_by = Replaced_by "selinux_relabel";
     shortdesc = "set SELinux enabled or disabled at appliance boot";
-    longdesc = "\
-This sets the selinux flag that is passed to the appliance
+    longdesc = {|This sets the selinux flag that is passed to the appliance
 at boot time.  The default is C<selinux=0> (disabled).
 
 Note that if SELinux is enabled, it is always in
 Permissive mode (C<enforcing=0>).
 
 For more information on the architecture of libguestfs,
-see L<guestfs(3)>." };
+see L<guestfs(3)>.|} };
 
   { defaults with
     name = "get_selinux"; added = (1, 0, 67);
@@ -90,12 +88,11 @@ see L<guestfs(3)>." };
     blocking = false;
     deprecated_by = Replaced_by "selinux_relabel";
     shortdesc = "get SELinux enabled flag";
-    longdesc = "\
-This returns the current setting of the selinux flag which
+    longdesc = {|This returns the current setting of the selinux flag which
 is passed to the appliance at boot time.  See C<guestfs_set_selinux>.
 
 For more information on the architecture of libguestfs,
-see L<guestfs(3)>." };
+see L<guestfs(3)>.|} };
 
   { defaults with
     name = "set_attach_method"; added = (1, 9, 8);
@@ -132,8 +129,7 @@ See C<guestfs_set_backend> and L<guestfs(3)/BACKEND>." };
     fish_alias = ["direct"]; config_only = true;
     blocking = false;
     shortdesc = "enable or disable direct appliance mode";
-    longdesc = "\
-If the direct appliance mode flag is enabled, then stdin and
+    longdesc = {|If the direct appliance mode flag is enabled, then stdin and
 stdout are passed directly through to the appliance once it
 is launched.
 
@@ -144,7 +140,7 @@ but go straight to stdout.
 You probably don't want to use this unless you know what you
 are doing.
 
-The default is disabled." };
+The default is disabled.|} };
 
   { defaults with
     name = "get_direct"; added = (1, 0, 72);
diff --git a/generator/actions_tsk.ml b/generator/actions_tsk.ml
index 093e8424f..88299af20 100644
--- a/generator/actions_tsk.ml
+++ b/generator/actions_tsk.ml
@@ -29,8 +29,7 @@ let non_daemon_functions = [
     optional = Some "libtsk";
     progress = true; cancellable = true;
     shortdesc = "walk through the filesystem content";
-    longdesc = "\
-Walk through the internal structures of a disk partition
+    longdesc = {|Walk through the internal structures of a disk partition
 (eg. F</dev/sda1>) in order to return a list of all the files
 and directories stored within.
 
@@ -169,7 +168,7 @@ Whiteout inode (BSD)
 
 Unknown file type
 
-=back" };
+=back|} };
 
   { defaults with
     name = "find_inode"; added = (1, 35, 6);
@@ -192,13 +191,12 @@ let daemon_functions = [
     optional = Some "sleuthkit";
     progress = true; cancellable = true;
     shortdesc = "download a file to the local machine given its inode";
-    longdesc = "\
-Download a file given its inode from the disk partition
+    longdesc = {|Download a file given its inode from the disk partition
 (eg. F</dev/sda1>) and save it as F<filename> on the local machine.
 
 It is not required to mount the disk to run this command.
 
-The command is capable of downloading deleted or inaccessible files." };
+The command is capable of downloading deleted or inaccessible files.|} };
 
   { defaults with
     name = "internal_filesystem_walk"; added = (1, 33, 39);
@@ -214,8 +212,7 @@ The command is capable of downloading deleted or inaccessible files." };
     optional = Some "sleuthkit";
     progress = true; cancellable = true;
     shortdesc = "download the given data units from the disk";
-    longdesc = "\
-Download the data units from F<start> address
+    longdesc = {|Download the data units from F<start> address
 to F<stop> from the disk partition (eg. F</dev/sda1>)
 and save them as F<filename> on the local machine.
 
@@ -229,7 +226,7 @@ while on ExtX ones they are referred as fragments.
 If the optional C<unallocated> flag is true (default is false),
 only the unallocated blocks will be extracted.
 This is useful to detect hidden data or to retrieve deleted files
-which data units have not been overwritten yet." };
+which data units have not been overwritten yet.|} };
 
   { defaults with
     name = "internal_find_inode"; added = (1, 35, 6);
diff --git a/generator/actions_yara.ml b/generator/actions_yara.ml
index dd3f4b896..bc65ad967 100644
--- a/generator/actions_yara.ml
+++ b/generator/actions_yara.ml
@@ -29,8 +29,7 @@ let non_daemon_functions = [
     optional = Some "libyara";
     progress = true; cancellable = true;
     shortdesc = "scan a file with the loaded yara rules";
-    longdesc = "\
-Scan a file with the previously loaded Yara rules.
+    longdesc = {|Scan a file with the previously loaded Yara rules.
 
 For each matching rule, a C<yara_detection> structure is returned.
 
@@ -46,7 +45,7 @@ Path of the file matching a Yara rule.
 
 Identifier of the Yara rule which matched against the given file.
 
-=back" };
+=back|} };
 
 ]
 
@@ -57,8 +56,7 @@ let daemon_functions = [
       progress = true; cancellable = true;
       optional = Some "libyara";
       shortdesc = "load yara rules within libguestfs";
-      longdesc = "\
-Upload a set of Yara rules from local file F<filename>.
+      longdesc = {|Upload a set of Yara rules from local file F<filename>.
 
 Yara rules allow to categorize files based on textual or binary patterns
 within their content.
@@ -71,7 +69,7 @@ compiled and then loaded.
 Rules in source code format cannot include external files. In such cases,
 it is recommended to compile them first.
 
-Previously loaded rules will be destroyed." };
+Previously loaded rules will be destroyed.|} };
 
   { defaults with
     name = "yara_destroy"; added = (1, 37, 13);
diff --git a/generator/bindtests.ml b/generator/bindtests.ml
index ed89a9191..082f27169 100644
--- a/generator/bindtests.ml
+++ b/generator/bindtests.ml
@@ -35,27 +35,26 @@ let generate_header = generate_header ~inputs:["generator/bindtests.ml"]
 let rec generate_bindtests () =
   generate_header CStyle LGPLv2plus;
 
-  pr "\
-#include <config.h>
+  pr {|#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <inttypes.h>
 #include <string.h>
 
-#include \"guestfs.h\"
-#include \"guestfs-internal.h\"
-#include \"guestfs-internal-actions.h\"
-#include \"guestfs_protocol.h\"
+#include "guestfs.h"
+#include "guestfs-internal.h"
+#include "guestfs-internal-actions.h"
+#include "guestfs_protocol.h"
 
 int
 guestfs_impl_internal_test_set_output (guestfs_h *g, const char *filename)
 {
   FILE *fp;
 
-  fp = fopen (filename, \"w\");
+  fp = fopen (filename, "w");
   if (fp == NULL) {
-    perrorf (g, \"cannot open output file %%s\\n\", filename);
+    perrorf (g, "cannot open output file %%s\n", filename);
     return -1;
   }
 
@@ -74,7 +73,7 @@ guestfs_impl_internal_test_close_output (guestfs_h *g)
 {
   if (g->test_fp != NULL) {
     if (fclose (g->test_fp) == EOF) {
-      perrorf (g, \"fclose\");
+      perrorf (g, "fclose");
       g->test_fp = NULL;
       return -1;
     }
@@ -99,12 +98,12 @@ print_strings (guestfs_h *g, char *const *argv)
   FILE *fp = get_fp (g);
   size_t argc;
 
-  fprintf (fp, \"[\");
+  fprintf (fp, "[");
   for (argc = 0; argv[argc] != NULL; ++argc) {
-    if (argc > 0) fprintf (fp, \", \");
-    fprintf (fp, \"\\\"%%s\\\"\", argv[argc]);
+    if (argc > 0) fprintf (fp, ", ");
+    fprintf (fp, "\"%%s\"", argv[argc]);
   }
-  fprintf (fp, \"]\\n\");
+  fprintf (fp, "]\n");
 }
 
 /* Fill an lvm_pv struct with known data.  Used by
@@ -113,23 +112,23 @@ print_strings (guestfs_h *g, char *const *argv)
 static void
 fill_lvm_pv (guestfs_h *g, struct guestfs_lvm_pv *pv, size_t i)
 {
-  pv->pv_name = safe_asprintf (g, \"pv%%zu\", i);
-  memcpy (pv->pv_uuid, \"12345678901234567890123456789012\", 32);
-  pv->pv_fmt = safe_strdup (g, \"unknown\");
+  pv->pv_name = safe_asprintf (g, "pv%%zu", i);
+  memcpy (pv->pv_uuid, "12345678901234567890123456789012", 32);
+  pv->pv_fmt = safe_strdup (g, "unknown");
   pv->pv_size = i;
   pv->dev_size = i;
   pv->pv_free = i;
   pv->pv_used = i;
-  pv->pv_attr = safe_asprintf (g, \"attr%%zu\", i);
+  pv->pv_attr = safe_asprintf (g, "attr%%zu", i);
   pv->pv_pe_count = i;
   pv->pv_pe_alloc_count = i;
-  pv->pv_tags = safe_asprintf (g, \"tag%%zu\", i);
+  pv->pv_tags = safe_asprintf (g, "tag%%zu", i);
   pv->pe_start = i;
   pv->pv_mda_count = i;
   pv->pv_mda_free = i;
 }
 
-";
+|};
 
   let ptests, rtests =
     match test_functions with
@@ -372,14 +371,13 @@ and generate_perl_bindtests () =
   pr "#!/usr/bin/env perl\n";
   generate_header HashStyle GPLv2plus;
 
-  pr "\
-use strict;
+  pr {|use strict;
 use warnings;
 
 use Sys::Guestfs;
 
 my $g = Sys::Guestfs->new ();
-";
+|};
 
   let mkargs args optargs =
     let optargs =
@@ -524,12 +522,11 @@ g = Guestfs::Guestfs.new()
 and generate_java_bindtests () =
   generate_header CStyle GPLv2plus;
 
-  pr "\
-import java.util.Map;
+  pr {|import java.util.Map;
 import java.util.HashMap;
 import com.redhat.et.libguestfs.*;
 
-@SuppressWarnings(\"serial\")
+@SuppressWarnings("serial")
 public class Bindtests {
     public static void main (String[] argv)
     {
@@ -537,7 +534,7 @@ public class Bindtests {
             GuestFS g = new GuestFS ();
             Map<String, Object> o;
 
-";
+|};
 
   let mkoptargs =
     function
@@ -595,8 +592,8 @@ public class Bindtests {
       pr "            g.%s (%s, o);\n" f (mkargs args)
   );
 
-  pr "
-            System.out.println (\"EOF\");
+  pr {|
+            System.out.println ("EOF");
         }
         catch (Exception exn) {
             System.err.println (exn);
@@ -604,18 +601,17 @@ public class Bindtests {
         }
     }
 }
-"
+|}
 
 and generate_haskell_bindtests () =
   generate_header HaskellStyle GPLv2plus;
 
-  pr "\
-module Bindtests where
+  pr {|module Bindtests where
 import qualified Guestfs
 
 main = do
   g <- Guestfs.create
-";
+|};
 
   let mkargs args =
     String.concat " " (
@@ -646,13 +642,12 @@ main = do
 and generate_gobject_js_bindtests () =
   generate_header CPlusPlusStyle GPLv2plus;
 
-  pr "\
-const Guestfs = imports.gi.Guestfs;
+  pr {|const Guestfs = imports.gi.Guestfs;
 
 var g = new Guestfs.Session();
 var o;
 
-";
+|};
 
     let mkoptargs = function
     | Some optargs ->
diff --git a/generator/c.ml b/generator/c.ml
index c6e5dd994..f1217c659 100644
--- a/generator/c.ml
+++ b/generator/c.ml
@@ -253,43 +253,57 @@ and generate_actions_pod_entry ({ c_name;
     pr "This function returns a string, or NULL on error.
 The string is owned by the guest handle and must I<not> be freed.\n\n"
   | RConstOptString _ ->
-    pr "This function returns a string which may be NULL.
+    pr {|This function returns a string which may be NULL.
 There is no way to return an error from this function.
-The string is owned by the guest handle and must I<not> be freed.\n\n"
+The string is owned by the guest handle and must I<not> be freed.
+
+|}
   | RString _ ->
     pr "This function returns a string, or NULL on error.
 I<The caller must free the returned string after use>.\n\n"
   | RStringList _ ->
-    pr "This function returns a NULL-terminated array of strings
+    pr {|This function returns a NULL-terminated array of strings
 (like L<environ(3)>), or NULL if there was an error.
-I<The caller must free the strings and the array after use>.\n\n"
+I<The caller must free the strings and the array after use>.
+
+|}
   | RStruct (_, typ) ->
-    pr "This function returns a C<struct guestfs_%s *>,
+    pr {|This function returns a C<struct guestfs_%s *>,
 or NULL if there was an error.
-I<The caller must call C<guestfs_free_%s> after use>.\n\n" typ typ
+I<The caller must call C<guestfs_free_%s> after use>.
+
+|} typ typ
   | RStructList (_, typ) ->
-    pr "This function returns a C<struct guestfs_%s_list *>,
+    pr {|This function returns a C<struct guestfs_%s_list *>,
 or NULL if there was an error.
-I<The caller must call C<guestfs_free_%s_list> after use>.\n\n" typ typ
+I<The caller must call C<guestfs_free_%s_list> after use>.
+
+|} typ typ
   | RHashtable _ ->
-    pr "This function returns a NULL-terminated array of
+    pr {|This function returns a NULL-terminated array of
 strings, or NULL if there was an error.
 The array of strings will always have length C<2n+1>, where
 C<n> keys and values alternate, followed by the trailing NULL entry.
-I<The caller must free the strings and the array after use>.\n\n"
+I<The caller must free the strings and the array after use>.
+
+|}
   | RBufferOut _ ->
-    pr "This function returns a buffer, or NULL on error.
+    pr {|This function returns a buffer, or NULL on error.
 The size of the returned buffer is written to C<*size_r>.
-I<The caller must free the returned buffer after use>.\n\n"
+I<The caller must free the returned buffer after use>.
+
+|}
   );
   if f.progress then
     pr "%s\n\n" progress_message;
   if f.protocol_limit_warning then
     pr "%s\n\n" protocol_limit_warning;
   if List.exists (function String (Key, _) -> true | _ -> false) args then
-    pr "This function takes a key or passphrase parameter which
+    pr {|This function takes a key or passphrase parameter which
 could contain sensitive material.  Read the section
-L</KEYS AND PASSPHRASES> for more information.\n\n";
+L</KEYS AND PASSPHRASES> for more information.
+
+|};
   (match f.optional with
   | None -> ()
   | Some opt ->
@@ -408,8 +422,7 @@ and generate_availability_pod () =
 and generate_guestfs_h () =
   generate_header CStyle LGPLv2plus;
 
-  pr "\
-/* ---------- IMPORTANT NOTE ----------
+  pr {|/* ---------- IMPORTANT NOTE ----------
  *
  * All API documentation is in the manpage, 'guestfs(3)'.
  * To read it, type:           man 3 guestfs
@@ -427,7 +440,7 @@ and generate_guestfs_h () =
 #define GUESTFS_H_
 
 #ifdef __cplusplus
-extern \"C\" {
+extern "C" {
 #endif
 
 #include <stddef.h>
@@ -435,7 +448,7 @@ extern \"C\" {
 #include <stdarg.h>
 
 #if defined(__GNUC__) && !defined(GUESTFS_GCC_VERSION)
-# define GUESTFS_GCC_VERSION \\
+# define GUESTFS_GCC_VERSION \
     (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
 #endif
 
@@ -447,12 +460,12 @@ extern \"C\" {
 #    undef GUESTFS_DEPRECATED_NO_REPLACEMENT
 #    undef GUESTFS_DEPRECATED_REPLACED_BY
 #    define GUESTFS_DEPRECATED_NO_REPLACEMENT __attribute__((__deprecated__))
-#    define GUESTFS_DEPRECATED_REPLACED_BY(s) __attribute__((__deprecated__(\"change the program to use guestfs_\" s \" instead of this deprecated function\")))
+#    define GUESTFS_DEPRECATED_REPLACED_BY(s) __attribute__((__deprecated__("change the program to use guestfs_" s " instead of this deprecated function")))
 #  endif
 #endif /* !GUESTFS_NO_WARN_DEPRECATED */
 
 #if defined(__GNUC__) && GUESTFS_GCC_VERSION >= 40000 /* gcc >= 4.0 */
-# define GUESTFS_DLL_PUBLIC __attribute__((visibility (\"default\")))
+# define GUESTFS_DLL_PUBLIC __attribute__((visibility ("default")))
 #else
 # define GUESTFS_DLL_PUBLIC
 #endif
@@ -503,7 +516,7 @@ extern GUESTFS_DLL_PUBLIC void guestfs_set_out_of_memory_handler (guestfs_h *g,
 extern GUESTFS_DLL_PUBLIC guestfs_abort_cb guestfs_get_out_of_memory_handler (guestfs_h *g);
 
 /* Events. */
-";
+|};
 
   List.iter (
     fun (name, bitmask) ->
@@ -513,8 +526,7 @@ extern GUESTFS_DLL_PUBLIC guestfs_abort_cb guestfs_get_out_of_memory_handler (gu
   pr "#define GUESTFS_EVENT_%-16s 0x%04x\n" "ALL" all_events_bitmask;
   pr "\n";
 
-  pr "\
-#ifndef GUESTFS_TYPEDEF_EVENT_CALLBACK
+  pr {|#ifndef GUESTFS_TYPEDEF_EVENT_CALLBACK
 #define GUESTFS_TYPEDEF_EVENT_CALLBACK 1
 typedef void (*guestfs_event_callback) (
                         guestfs_h *g,
@@ -561,17 +573,17 @@ typedef void (*guestfs_progress_cb) (guestfs_h *g, void *opaque, int proc_nr, in
 
 #ifndef GUESTFS_NO_DEPRECATED
 extern GUESTFS_DLL_PUBLIC void guestfs_set_log_message_callback (guestfs_h *g, guestfs_log_message_cb cb, void *opaque)
-  GUESTFS_DEPRECATED_REPLACED_BY(\"set_event_callback\");
+  GUESTFS_DEPRECATED_REPLACED_BY("set_event_callback");
 extern GUESTFS_DLL_PUBLIC void guestfs_set_subprocess_quit_callback (guestfs_h *g, guestfs_subprocess_quit_cb cb, void *opaque)
-  GUESTFS_DEPRECATED_REPLACED_BY(\"set_event_callback\");
+  GUESTFS_DEPRECATED_REPLACED_BY("set_event_callback");
 extern GUESTFS_DLL_PUBLIC void guestfs_set_launch_done_callback (guestfs_h *g, guestfs_launch_done_cb cb, void *opaque)
-  GUESTFS_DEPRECATED_REPLACED_BY(\"set_event_callback\");
+  GUESTFS_DEPRECATED_REPLACED_BY("set_event_callback");
 #define GUESTFS_HAVE_SET_CLOSE_CALLBACK 1
 extern GUESTFS_DLL_PUBLIC void guestfs_set_close_callback (guestfs_h *g, guestfs_close_cb cb, void *opaque)
-  GUESTFS_DEPRECATED_REPLACED_BY(\"set_event_callback\");
+  GUESTFS_DEPRECATED_REPLACED_BY("set_event_callback");
 #define GUESTFS_HAVE_SET_PROGRESS_CALLBACK 1
 extern GUESTFS_DLL_PUBLIC void guestfs_set_progress_callback (guestfs_h *g, guestfs_progress_cb cb, void *opaque)
-  GUESTFS_DEPRECATED_REPLACED_BY(\"set_event_callback\");
+  GUESTFS_DEPRECATED_REPLACED_BY("set_event_callback");
 #endif /* !GUESTFS_NO_DEPRECATED */
 
 /* Private data area. */
@@ -585,7 +597,7 @@ extern GUESTFS_DLL_PUBLIC void *guestfs_first_private (guestfs_h *g, const char
 extern GUESTFS_DLL_PUBLIC void *guestfs_next_private (guestfs_h *g, const char **key_rtn);
 
 /* Structures. */
-";
+|};
 
   (* The structures are carefully written to have exactly the same
    * in-memory format as the XDR structures that we use on the wire to
@@ -731,8 +743,7 @@ extern GUESTFS_DLL_PUBLIC void *guestfs_next_private (guestfs_h *g, const char *
 
   generate_all_headers public_functions_sorted;
 
-  pr "\
-#if GUESTFS_PRIVATE
+  pr {|#if GUESTFS_PRIVATE
 /* Symbols protected by GUESTFS_PRIVATE are NOT part of the public,
  * stable API, and can change at any time!  We export them because
  * they are used by some of the language bindings.
@@ -740,7 +751,7 @@ extern GUESTFS_DLL_PUBLIC void *guestfs_next_private (guestfs_h *g, const char *
 
 /* Private functions. */
 
-";
+|};
 
   generate_all_headers private_functions_sorted;
 
@@ -751,8 +762,7 @@ extern GUESTFS_DLL_PUBLIC void *guestfs_next_private (guestfs_h *g, const char *
 
   generate_all_structs internal_structs;
 
-pr "\
-
+pr {|
 #endif /* End of GUESTFS_PRIVATE. */
 
 /* Deprecated macros.  Use GUESTFS_HAVE_* instead. */
@@ -770,14 +780,14 @@ pr "\
 #define LIBGUESTFS_HAVE_FIRST_PRIVATE 1
 #define LIBGUESTFS_HAVE_NEXT_PRIVATE 1
 
-";
+|};
 
   List.iter (
     fun { name = shortname } ->
       pr "#define LIBGUESTFS_HAVE_%s 1\n" (String.uppercase_ascii shortname);
   ) public_functions_sorted;
 
-  pr "
+  pr {|
 /* End of deprecated macros. */
 
 #ifdef __cplusplus
@@ -785,7 +795,7 @@ pr "\
 #endif
 
 #endif /* GUESTFS_H_ */
-"
+|}
 
 (* Generate the guestfs-internal-actions.h file. *)
 and generate_internal_actions_h () =
@@ -809,15 +819,14 @@ and generate_internal_actions_h () =
 and generate_client_structs_cleanups_h () =
   generate_header CStyle LGPLv2plus;
 
-  pr "\
-/* These CLEANUP_* macros automatically free the struct or struct list
+  pr {|/* These CLEANUP_* macros automatically free the struct or struct list
  * pointed to by the local variable at the end of the current scope.
  */
 
 #ifndef GUESTFS_STRUCTS_CLEANUPS_H_
 #define GUESTFS_STRUCTS_CLEANUPS_H_
 
-";
+|};
 
   List.iter (
     fun { s_name = name } ->
@@ -827,13 +836,12 @@ and generate_client_structs_cleanups_h () =
       pr "  __attribute__((cleanup(guestfs_int_cleanup_free_%s_list)))\n" name
   ) structs;
 
-  pr "\
-
+  pr {|
 /* These functions are used internally by the CLEANUP_* macros.
  * Don't call them directly.
  */
 
-";
+|};
 
   List.iter (
     fun { s_name = name } ->
@@ -850,17 +858,16 @@ and generate_client_structs_cleanups_h () =
 and generate_client_structs_free () =
   generate_header CStyle LGPLv2plus;
 
-  pr "\
-#include <config.h>
+  pr {|#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 
-#include \"guestfs.h\"
-#include \"guestfs-internal.h\"
-#include \"guestfs_protocol.h\"
+#include "guestfs.h"
+#include "guestfs-internal.h"
+#include "guestfs_protocol.h"
 
-";
+|};
 
   pr "/* Structure-freeing functions.  These rely on the fact that the\n";
   pr " * structure format is identical to the XDR format.  See note in\n";
@@ -897,18 +904,17 @@ and generate_client_structs_free () =
 and generate_client_structs_compare () =
   generate_header CStyle LGPLv2plus;
 
-  pr "\
-#include <config.h>
+  pr {|#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 
-#include \"guestfs.h\"
-#include \"guestfs-internal.h\"
+#include "guestfs.h"
+#include "guestfs-internal.h"
 
-";
+|};
 
   pr "/* Structure-comparison functions. */\n";
 
@@ -982,18 +988,17 @@ and generate_client_structs_compare () =
 and generate_client_structs_copy () =
   generate_header CStyle LGPLv2plus;
 
-  pr "\
-#include <config.h>
+  pr {|#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 
-#include \"guestfs.h\"
-#include \"guestfs-internal.h\"
+#include "guestfs.h"
+#include "guestfs-internal.h"
 
-";
+|};
 
   pr "/* Structure-copying functions. */\n";
 
@@ -1165,16 +1170,15 @@ and generate_client_structs_copy () =
 and generate_client_structs_cleanups_c () =
   generate_header CStyle LGPLv2plus;
 
-  pr "\
-#include <config.h>
+  pr {|#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 
-#include \"guestfs.h\"
-#include \"structs-cleanups.h\"
+#include "guestfs.h"
+#include "structs-cleanups.h"
 
-";
+|};
 
   pr "/* Cleanup functions used by CLEANUP_* macros.  Do not call\n";
   pr " * these functions directly.\n";
@@ -1204,17 +1208,16 @@ and generate_client_structs_cleanups_c () =
 and generate_client_structs_print_c () =
   generate_header CStyle LGPLv2plus;
 
-  pr "\
-#include <config.h>
+  pr {|#include <config.h>
 
 #include <inttypes.h>
 
-#include \"c-ctype.h\"
+#include "c-ctype.h"
 
-#include \"guestfs.h\"
-#include \"structs-print.h\"
+#include "guestfs.h"
+#include "structs-print.h"
 
-";
+|};
 
   let write_structs =
     List.iter (
@@ -1292,13 +1295,12 @@ and generate_client_structs_print_c () =
 and generate_client_structs_print_h () =
   generate_header CStyle LGPLv2plus;
 
-  pr "\
-#ifndef GUESTFS_INTERNAL_STRUCTS_PRINT_H_
+  pr {|#ifndef GUESTFS_INTERNAL_STRUCTS_PRINT_H_
 #define GUESTFS_INTERNAL_STRUCTS_PRINT_H_
 
 #include <stdio.h>
 
-";
+|};
 
   let write_structs =
     List.iter (
@@ -1317,19 +1319,17 @@ and generate_client_structs_print_h () =
 
   write_structs internal_structs;
 
-  pr "\
-
+  pr {|
 #endif /* End of GUESTFS_PRIVATE. */
 
 #endif /* GUESTFS_INTERNAL_STRUCTS_PRINT_H_ */
-"
+|}
 
 (* Generate the client-side dispatch stubs. *)
 and generate_client_actions actions () =
   generate_header CStyle LGPLv2plus;
 
-  pr "\
-#include <config.h>
+  pr {|#include <config.h>
 
 /* It is safe to call deprecated functions from this file. */
 #undef GUESTFS_NO_DEPRECATED
@@ -1342,14 +1342,14 @@ and generate_client_actions actions () =
 #include <sys/stat.h>
 #include <string.h>
 
-#include \"guestfs.h\"
-#include \"guestfs-internal.h\"
-#include \"guestfs-internal-actions.h\"
-#include \"guestfs_protocol.h\"
-#include \"errnostring.h\"
-#include \"structs-print.h\"
+#include "guestfs.h"
+#include "guestfs-internal.h"
+#include "guestfs-internal-actions.h"
+#include "guestfs_protocol.h"
+#include "errnostring.h"
+#include "structs-print.h"
 
-";
+|};
 
   (* Generate code for enter events. *)
   let enter_event shortname =
@@ -2060,19 +2060,18 @@ and generate_client_actions actions () =
 and generate_client_actions_variants () =
   generate_header CStyle LGPLv2plus;
 
-  pr "\
-#include <config.h>
+  pr {|#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <inttypes.h>
 
-#include \"guestfs.h\"
-#include \"guestfs-internal.h\"
-#include \"guestfs-internal-actions.h\"
+#include "guestfs.h"
+#include "guestfs-internal.h"
+#include "guestfs-internal-actions.h"
 
-";
+|};
 
   let generate_va_variants { name; c_name;
                              style = ret, args, optargs as style } =
@@ -2215,16 +2214,15 @@ and generate_event_string_c () =
       if len > longest then len else longest
   ) 0 events in
 
-  pr "\
-#include <config.h>
+  pr {|#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <libintl.h>
 
-#include \"guestfs.h\"
-#include \"guestfs-internal.h\"
+#include "guestfs.h"
+#include "guestfs-internal.h"
 
 GUESTFS_DLL_PUBLIC char *
 guestfs_event_to_string (uint64_t event)
@@ -2247,7 +2245,7 @@ guestfs_event_to_string (uint64_t event)
 
   len = 0;
 
-" (List.length events) (longest + 1);
+|} (List.length events) (longest + 1);
 
   (* Sort the events alphabetically so the events are returned sorted. *)
   let sorted_event_names = List.sort compare (List.map fst events) in
@@ -2261,15 +2259,15 @@ guestfs_event_to_string (uint64_t event)
       pr "  }\n";
   ) sorted_event_names;
 
-  pr "
+  pr {|
   if (len > 0)
-    ret[len-1] = '\\0'; /* truncates the final trailing comma */
+    ret[len-1] = '\0'; /* truncates the final trailing comma */
   else
-    ret[0] = '\\0';
+    ret[0] = '\0';
 
   return ret;
 }
-"
+|}
 
 (* Generate the linker script which controls the visibility of
  * symbols in the public ABI and ensures no other symbols get
diff --git a/generator/csharp.ml b/generator/csharp.ml
index 5c77a46b4..e7064d825 100644
--- a/generator/csharp.ml
+++ b/generator/csharp.ml
@@ -37,8 +37,7 @@ let rec generate_csharp () =
   (* XXX Make this configurable by the C# assembly users. *)
   let library = "libguestfs.so.0" in
 
-  pr "\
-// These C# bindings are highly experimental at present.
+  pr {|// These C# bindings are highly experimental at present.
 //
 // Firstly they only work on Linux (ie. Mono).  In order to get them
 // to work on Windows (ie. .Net) you would need to port the library
@@ -85,17 +84,17 @@ namespace Guestfs
   {
     IntPtr _handle;
 
-    [DllImport (\"%s\")]
+    [DllImport ("%s")]
     static extern IntPtr guestfs_create ();
 
     public Guestfs ()
     {
       _handle = guestfs_create ();
       if (_handle == IntPtr.Zero)
-        throw new Error (\"could not create guestfs handle\");
+        throw new Error ("could not create guestfs handle");
     }
 
-    [DllImport (\"%s\")]
+    [DllImport ("%s")]
     static extern void guestfs_close (IntPtr h);
 
     ~Guestfs ()
@@ -103,10 +102,10 @@ namespace Guestfs
       guestfs_close (_handle);
     }
 
-    [DllImport (\"%s\")]
+    [DllImport ("%s")]
     static extern string guestfs_last_error (IntPtr h);
 
-" library library library;
+|} library library library;
 
   (* Generate C# structure bindings.  We prefix struct names with
    * underscore because C# cannot have conflicting struct names and
diff --git a/generator/customize.ml b/generator/customize.ml
index fd6ebf588..ae640571b 100644
--- a/generator/customize.ml
+++ b/generator/customize.ml
@@ -57,8 +57,7 @@ let ops = [
     op_discrim = "`AppendLine";
     op_exclude_v2v = false;
     op_shortdesc = "Append line(s) to the file";
-    op_pod_longdesc = "\
-Append a single line of text to the C<FILE>.  If the file does not already
+    op_pod_longdesc = {|Append a single line of text to the C<FILE>.  If the file does not already
 end with a newline, then one is added before the appended
 line.  Also a newline is added to the end of the C<LINE> string
 automatically.
@@ -84,7 +83,7 @@ To insert several lines, use the same option several times:
 To insert a blank line before the appended line, do:
 
  --append-line '/etc/hosts:'
- --append-line '/etc/hosts:10.0.0.1 foo'";
+ --append-line '/etc/hosts:10.0.0.1 foo'|};
   };
 
   { op_name = "chmod";
@@ -104,8 +103,7 @@ it with C<0> to get octal, ie. use C<0700> not C<700>.";
     op_discrim = "`Chown";
     op_exclude_v2v = false;
     op_shortdesc = "Change the owner user and group ID of a file or directory";
-    op_pod_longdesc = "\
-Change the owner user and group ID of a file or directory in the guest.
+    op_pod_longdesc = {|Change the owner user and group ID of a file or directory in the guest.
 Note:
 
 =over 4
@@ -125,7 +123,7 @@ For example:
 
  virt-customize --chown '0:0:/var/log/audit.log'
 
-See also: I<--upload>.";
+See also: I<--upload>.|};
   };
 
   { op_name = "commands-from-file";
@@ -133,8 +131,7 @@ See also: I<--upload>.";
     op_discrim = "`CommandsFromFile";
     op_exclude_v2v = false;
     op_shortdesc = "Read customize commands from file";
-    op_pod_longdesc = "\
-Read the customize commands from a file, one (and its arguments)
+    op_pod_longdesc = {|Read the customize commands from a file, one (and its arguments)
 each line.
 
 Each line contains a single customization command and its arguments,
@@ -146,15 +143,15 @@ for example:
 
 Empty lines are ignored, and lines starting with C<#> are comments
 and are ignored as well.  Furthermore, arguments can be spread across
-multiple lines, by adding a C<\\> (continuation character) at the of
+multiple lines, by adding a C<\> (continuation character) at the of
 a line, for example
 
- edit /some/file:\\
+ edit /some/file:\
    s/^OPT=.*/OPT=ok/
 
 The commands are handled in the same order as they are in the file,
 as if they were specified as I<--delete /some/file> on the command
-line.";
+line.|};
   };
 
   { op_name = "copy";
@@ -185,8 +182,7 @@ Wildcards cannot be used.";
     op_discrim = "`Delete";
     op_exclude_v2v = false;
     op_shortdesc = "Delete a file or directory";
-    op_pod_longdesc = "\
-Delete a file from the guest.  Or delete a directory (and all its
+    op_pod_longdesc = {|Delete a file from the guest.  Or delete a directory (and all its
 contents, recursively).
 
 You can use shell glob characters in the specified path.  Be careful
@@ -195,7 +191,7 @@ For example:
 
  virt-customize --delete '/var/log/*.log'.
 
-See also: I<--upload>, I<--scrub>.";
+See also: I<--upload>, I<--scrub>.|};
   };
 
   { op_name = "edit";
@@ -203,15 +199,14 @@ See also: I<--upload>, I<--scrub>.";
     op_discrim = "`Edit";
     op_exclude_v2v = false;
     op_shortdesc = "Edit file using Perl expression";
-    op_pod_longdesc = "\
-Edit C<FILE> using the Perl expression C<EXPR>.
+    op_pod_longdesc = {|Edit C<FILE> using the Perl expression C<EXPR>.
 
 Be careful to properly quote the expression to prevent it from
 being altered by the shell.
 
 Note that this option is only available when Perl 5 is installed.
 
-See L<virt-edit(1)/NON-INTERACTIVE EDITING>.";
+See L<virt-edit(1)/NON-INTERACTIVE EDITING>.|};
   };
 
   { op_name = "firstboot";
@@ -219,8 +214,7 @@ See L<virt-edit(1)/NON-INTERACTIVE EDITING>.";
     op_discrim = "`FirstbootScript";
     op_exclude_v2v = false;
     op_shortdesc = "Run script at first guest boot";
-    op_pod_longdesc = "\
-Install C<SCRIPT> inside the guest, so that when the guest first boots
+    op_pod_longdesc = {|Install C<SCRIPT> inside the guest, so that when the guest first boots
 up, the script runs (as root, late in the boot process).
 
 The script is automatically chmod +x after installation in the guest.
@@ -234,7 +228,7 @@ order that they appear on the command line.
 Please take a look at L<virt-builder(1)/FIRST BOOT SCRIPTS> for more
 information and caveats about the first boot scripts.
 
-See also I<--run>.";
+See also I<--run>.|};
   };
 
   { op_name = "firstboot-command";
@@ -242,8 +236,7 @@ See also I<--run>.";
     op_discrim = "`FirstbootCommand";
     op_exclude_v2v = false;
     op_shortdesc = "Run command at first guest boot";
-    op_pod_longdesc = "\
-Run command (and arguments) inside the guest when the guest first
+    op_pod_longdesc = {|Run command (and arguments) inside the guest when the guest first
 boots up (as root, late in the boot process).
 
 You can have multiple I<--firstboot> options.  They run in the same
@@ -252,7 +245,7 @@ order that they appear on the command line.
 Please take a look at L<virt-builder(1)/FIRST BOOT SCRIPTS> for more
 information and caveats about the first boot scripts.
 
-See also I<--run>.";
+See also I<--run>.|};
   };
 
   { op_name = "firstboot-install";
@@ -260,13 +253,12 @@ See also I<--run>.";
     op_discrim = "`FirstbootPackages";
     op_exclude_v2v = false;
     op_shortdesc = "Add package(s) to install at first boot";
-    op_pod_longdesc = "\
-Install the named packages (a comma-separated list).  These are
+    op_pod_longdesc = {|Install the named packages (a comma-separated list).  These are
 installed when the guest first boots using the guest’s package manager
 (eg. apt, yum, etc.) and the guest’s network connection.
 
 For an overview on the different ways to install packages, see
-L<virt-builder(1)/INSTALLING PACKAGES>.";
+L<virt-builder(1)/INSTALLING PACKAGES>.|};
   };
 
   { op_name = "hostname";
@@ -284,8 +276,7 @@ dotted hostname.domainname (FQDN) if you want.";
     op_discrim = "`InjectBalloonServer";
     op_exclude_v2v = true;
     op_shortdesc = "Inject the Balloon Server into a Windows guest";
-    op_pod_longdesc = "\
-Inject the Balloon Server (F<blnsvr.exe>) into a Windows guest.
+    op_pod_longdesc = {|Inject the Balloon Server (F<blnsvr.exe>) into a Windows guest.
 This operation also injects a firstboot script so that the Balloon
 Server is installed when the guest boots.
 
@@ -293,7 +284,7 @@ The parameter is the same as used by the I<--inject-virtio-win> operation.
 
 Note that to do a full conversion of a Windows guest from a
 foreign hypervisor like VMware (which involves many other operations)
-you should use the L<virt-v2v(1)> tool instead of this.";
+you should use the L<virt-v2v(1)> tool instead of this.|};
   };
 
   { op_name = "inject-qemu-ga";
@@ -301,8 +292,7 @@ you should use the L<virt-v2v(1)> tool instead of this.";
     op_discrim = "`InjectQemuGA";
     op_exclude_v2v = true;
     op_shortdesc = "Inject the QEMU Guest Agent into a Windows guest";
-    op_pod_longdesc = "\
-Inject the QEMU Guest Agent into a Windows guest.  The guest
+    op_pod_longdesc = {|Inject the QEMU Guest Agent into a Windows guest.  The guest
 agent communicates with qemu through a socket in order to
 provide enhanced features (see L<qemu-ga(8)>).  This operation
 also injects a firstboot script so that the Guest Agent is
@@ -312,7 +302,7 @@ The parameter is the same as used by the I<--inject-virtio-win> operation.
 
 Note that to do a full conversion of a Windows guest from a
 foreign hypervisor like VMware (which involves many other operations)
-you should use the L<virt-v2v(1)> tool instead of this.";
+you should use the L<virt-v2v(1)> tool instead of this.|};
   };
 
   { op_name = "inject-virtio-win";
@@ -320,8 +310,7 @@ you should use the L<virt-v2v(1)> tool instead of this.";
     op_discrim = "`InjectVirtioWin";
     op_exclude_v2v = true;
     op_shortdesc = "Inject virtio-win drivers into a Windows guest";
-    op_pod_longdesc = "\
-Inject virtio-win drivers into a Windows guest.  These drivers
+    op_pod_longdesc = {|Inject virtio-win drivers into a Windows guest.  These drivers
 add virtio accelerated drivers suitable when running on top of
 a hypervisor that supports virtio (such as qemu/KVM).  The
 operation also adjusts the Windows Registry so that the drivers
@@ -345,7 +334,7 @@ The directory containing the unpacked virtio-win drivers
 
 Note that to do a full conversion of a Windows guest from a
 foreign hypervisor like VMware (which involves many other operations)
-you should use the L<virt-v2v(1)> tool instead of this.";
+you should use the L<virt-v2v(1)> tool instead of this.|};
   };
 
   { op_name = "install";
@@ -353,15 +342,14 @@ you should use the L<virt-v2v(1)> tool instead of this.";
     op_discrim = "`InstallPackages";
     op_exclude_v2v = false;
     op_shortdesc = "Add package(s) to install";
-    op_pod_longdesc = "\
-Install the named packages (a comma-separated list).  These are
+    op_pod_longdesc = {|Install the named packages (a comma-separated list).  These are
 installed during the image build using the guest’s package manager
 (eg. apt, yum, etc.) and the host’s network connection.
 
 For an overview on the different ways to install packages, see
 L<virt-builder(1)/INSTALLING PACKAGES>.
 
-See also I<--update>, I<--uninstall>.";
+See also I<--update>, I<--uninstall>.|};
   };
 
   { op_name = "link";
@@ -402,12 +390,11 @@ Wildcards cannot be used.";
     op_discrim = "`Password";
     op_exclude_v2v = false;
     op_shortdesc = "Set user password";
-    op_pod_longdesc = "\
-Set the password for C<USER>.  (Note this option does I<not>
+    op_pod_longdesc = {|Set the password for C<USER>.  (Note this option does I<not>
 create the user account).
 
 See L<virt-builder(1)/USERS AND PASSWORDS> for the format of
-the C<SELECTOR> field, and also how to set up user accounts.";
+the C<SELECTOR> field, and also how to set up user accounts.|};
   };
 
   { op_name = "root-password";
@@ -415,14 +402,13 @@ the C<SELECTOR> field, and also how to set up user accounts.";
     op_discrim = "`RootPassword";
     op_exclude_v2v = false;
     op_shortdesc = "Set root password";
-    op_pod_longdesc = "\
-Set the root password.
+    op_pod_longdesc = {|Set the root password.
 
 See L<virt-builder(1)/USERS AND PASSWORDS> for the format of
 the C<SELECTOR> field, and also how to set up user accounts.
 
 Note: In virt-builder, if you I<don't> set I<--root-password>
-then the guest is given a I<random> root password.";
+then the guest is given a I<random> root password.|};
   };
 
   { op_name = "run";
@@ -430,8 +416,7 @@ then the guest is given a I<random> root password.";
     op_discrim = "`Script";
     op_exclude_v2v = false;
     op_shortdesc = "Run script in disk image";
-    op_pod_longdesc = "\
-Run the shell script (or any program) called C<SCRIPT> on the disk
+    op_pod_longdesc = {|Run the shell script (or any program) called C<SCRIPT> on the disk
 image.  The script runs virtualized inside a small appliance, chrooted
 into the guest filesystem.
 
@@ -446,7 +431,7 @@ connection (I<--attach>).  You can also upload data files (I<--upload>).
 You can have multiple I<--run> options.  They run
 in the same order that they appear on the command line.
 
-See also: I<--firstboot>, I<--attach>, I<--upload>.";
+See also: I<--firstboot>, I<--attach>, I<--upload>.|};
   };
 
   { op_name = "run-command";
@@ -454,8 +439,7 @@ See also: I<--firstboot>, I<--attach>, I<--upload>.";
     op_discrim = "`Command";
     op_exclude_v2v = false;
     op_shortdesc = "Run command in disk image";
-    op_pod_longdesc = "\
-Run the command and arguments on the disk image.  The command runs
+    op_pod_longdesc = {|Run the command and arguments on the disk image.  The command runs
 virtualized inside a small appliance, chrooted into the guest filesystem.
 
 If libguestfs supports it then a limited network connection is
@@ -467,7 +451,7 @@ connection (I<--attach>).  You can also upload data files (I<--upload>).
 You can have multiple I<--run-command> options.  They run
 in the same order that they appear on the command line.
 
-See also: I<--firstboot>, I<--attach>, I<--upload>.";
+See also: I<--firstboot>, I<--attach>, I<--upload>.|};
   };
 
   { op_name = "scrub";
@@ -475,8 +459,7 @@ See also: I<--firstboot>, I<--attach>, I<--upload>.";
     op_discrim = "`Scrub";
     op_exclude_v2v = false;
     op_shortdesc = "Scrub a file";
-    op_pod_longdesc = "\
-Scrub a file from the guest.  This is like I<--delete> except that:
+    op_pod_longdesc = {|Scrub a file from the guest.  This is like I<--delete> except that:
 
 =over 4
 
@@ -488,7 +471,7 @@ It scrubs the data so a guest could not recover it.
 
 It cannot delete directories, only regular files.
 
-=back";
+=back|};
   };
 
   { op_name = "sm-attach";
@@ -538,8 +521,7 @@ Unregister the guest using C<subscription-manager>.";
     op_discrim = "`SSHInject";
     op_exclude_v2v = false;
     op_shortdesc = "Inject a public key into the guest";
-    op_pod_longdesc = "\
-Inject an ssh key so the given C<USER> will be able to log in over
+    op_pod_longdesc = {|Inject an ssh key so the given C<USER> will be able to log in over
 ssh without supplying a password.  The C<USER> must exist already
 in the guest.
 
@@ -547,7 +529,7 @@ See L<virt-builder(1)/SSH KEYS> for the format of
 the C<SELECTOR> field.
 
 You can have multiple I<--ssh-inject> options, for different users
-and also for more keys for each user."
+and also for more keys for each user.|}
   };
 
   { op_name = "tar-in";
@@ -555,12 +537,11 @@ and also for more keys for each user."
     op_discrim = "`TarIn";
     op_exclude_v2v = false;
     op_shortdesc = "Copy local files or directories from a tarball into image";
-    op_pod_longdesc = "\
-Copy local files or directories from a local tar file
+    op_pod_longdesc = {|Copy local files or directories from a local tar file
 called C<TARFILE> into the disk image, placing them in the
 directory C<REMOTEDIR> (which must exist).  Note that
 the tar file must be uncompressed (F<.tar.gz> files will not work
-here)";
+here)|};
   };
 
   { op_name = "timezone";
@@ -606,13 +587,12 @@ This command recursively truncates all files under C<PATH> to zero-length.";
     op_discrim = "`UninstallPackages";
     op_exclude_v2v = false;
     op_shortdesc = "Uninstall package(s)";
-    op_pod_longdesc = "\
-Uninstall the named packages (a comma-separated list).  These are
+    op_pod_longdesc = {|Uninstall the named packages (a comma-separated list).  These are
 removed during the image build using the guest’s package manager
 (eg. apt, yum, etc.).  Dependent packages may also need to be
 uninstalled to satisfy the request.
 
-See also I<--install>, I<--update>.";
+See also I<--install>, I<--update>.|};
   };
 
   { op_name = "update";
@@ -620,12 +600,11 @@ See also I<--install>, I<--update>.";
     op_discrim = "`Update";
     op_exclude_v2v = false;
     op_shortdesc = "Update packages";
-    op_pod_longdesc = "\
-Do the equivalent of C<yum update>, C<apt-get upgrade>, or whatever
+    op_pod_longdesc = {|Do the equivalent of C<yum update>, C<apt-get upgrade>, or whatever
 command is required to update the packages already installed in the
 template to their latest versions.
 
-See also I<--install>, I<--uninstall>.";
+See also I<--install>, I<--uninstall>.|};
   };
 
   { op_name = "upload";
@@ -633,8 +612,7 @@ See also I<--install>, I<--uninstall>.";
     op_discrim = "`Upload";
     op_exclude_v2v = false;
     op_shortdesc = "Upload local file to destination";
-    op_pod_longdesc = "\
-Upload local file C<FILE> to destination C<DEST> in the disk image.
+    op_pod_longdesc = {|Upload local file C<FILE> to destination C<DEST> in the disk image.
 File owner and permissions from the original are preserved, so you
 should set them to what you want them to be in the disk image.
 
@@ -645,7 +623,7 @@ If C<DEST> is a directory name (which must already exist in the guest)
 then the file is uploaded into that directory, and it keeps the same
 name as on the local filesystem.
 
-See also: I<--mkdir>, I<--delete>, I<--scrub>.";
+See also: I<--mkdir>, I<--delete>, I<--scrub>.|};
   };
 
   { op_name = "write";
@@ -676,20 +654,18 @@ let flags = [
     flag_type = FlagBool false;
     flag_ml_var = "scrub_logfile";
     flag_shortdesc = "Scrub build log file";
-    flag_pod_longdesc = "\
-Scrub C<builder.log> (log file from build commands) from the image
+    flag_pod_longdesc = {|Scrub C<builder.log> (log file from build commands) from the image
 after building is complete.  If you don't want to reveal precisely how
 the image was built, use this option.
 
-See also: L</LOG FILE>.";
+See also: L</LOG FILE>.|};
   };
 
   { flag_name = "password-crypto";
     flag_type = FlagPasswordCrypto "md5|sha256|sha512";
     flag_ml_var = "password_crypto";
     flag_shortdesc = "Set password crypto";
-    flag_pod_longdesc = "\
-When the virt tools change or set a password in the guest, this
+    flag_pod_longdesc = {|When the virt tools change or set a password in the guest, this
 option sets the password encryption of that password to
 C<md5>, C<sha256> or C<sha512>.
 
@@ -707,15 +683,14 @@ Note this does not change the default password encryption used
 by the guest when you create new user accounts inside the guest.
 If you want to do that, then you should use the I<--edit> option
 to modify C</etc/sysconfig/authconfig> (Fedora, RHEL) or
-C</etc/pam.d/common-password> (Debian, Ubuntu).";
+C</etc/pam.d/common-password> (Debian, Ubuntu).|};
   };
 
   { flag_name = "no-selinux-relabel";
     flag_type = FlagBool false (* XXX - the default in virt-builder *);
     flag_ml_var = "no_selinux_relabel";
     flag_shortdesc = "Do not relabel files with correct SELinux labels";
-    flag_pod_longdesc = "\
-Do not attempt to correct the SELinux labels of files in the guest.
+    flag_pod_longdesc = {|Do not attempt to correct the SELinux labels of files in the guest.
 
 In such guests that support SELinux, customization automatically
 relabels files so that they have the correct SELinux label.  (The
@@ -724,7 +699,7 @@ customization will instead touch F</.autorelabel> on the image to
 schedule a relabel operation for the next time the image boots.)  This
 option disables the automatic relabeling.
 
-The option is a no-op for guests that do not support SELinux.";
+The option is a no-op for guests that do not support SELinux.|};
   };
 
   { flag_name = "selinux-relabel";
@@ -758,8 +733,7 @@ let rec generate_customize_cmdline_mli () =
   generate_ops_struct_decl ();
   pr "\n";
 
-  pr "\
-type argspec = Getopt.keys * Getopt.spec * Getopt.doc
+  pr {|type argspec = Getopt.keys * Getopt.spec * Getopt.doc
 val argspec : ?v2v:bool -> unit -> (argspec * string option * string) list * (unit -> ops)
 (** This returns a pair [(list, get_ops)].
 
@@ -770,13 +744,12 @@ val argspec : ?v2v:bool -> unit -> (argspec * string option * string) list * (un
     command line.
 
     If the parameter [~v2v] is true then this excludes parameters
-    that should be excluded from virt-v2v. *)"
+    that should be excluded from virt-v2v. *)|}
 
 and generate_customize_cmdline_ml () =
   generate_header OCamlStyle GPLv2plus;
 
-  pr "\
-(* Command line argument parsing, both for the virt-customize binary
+  pr {|(* Command line argument parsing, both for the virt-customize binary
  * and for the other tools that share the same code.
  *)
 
@@ -787,16 +760,15 @@ open Tools_utils
 open Common_gettext.Gettext
 open Getopt.OptionName
 
-";
+|};
   generate_ops_struct_decl ();
   pr "\n";
 
-  pr "\
-type argspec = Getopt.keys * Getopt.spec * Getopt.doc
+  pr {|type argspec = Getopt.keys * Getopt.spec * Getopt.doc
 
 let rec argspec ?(v2v = false) () =
   let ops = ref [] in
-";
+|};
   List.iter (
     function
     | { flag_type = FlagBool default; flag_ml_var = var } ->
@@ -806,45 +778,44 @@ let rec argspec ?(v2v = false) () =
     | { flag_type = FlagSMCredentials _; flag_ml_var = var } ->
       pr "  let %s = ref None in\n" var
   ) flags;
-  pr "\
-
+  pr {|
   let rec get_ops () = {
     ops = List.rev !ops;
     flags = get_flags ();
   }
   and get_flags () = {
-";
+|};
   List.iter (fun { flag_ml_var = var } -> pr "    %s = !%s;\n" var var) flags;
-  pr "  }
+  pr {|  }
   in
 
   let split_string_pair option_name arg =
     let i =
       try String.index arg ':'
       with Not_found ->
-        error (f_\"invalid format for '--%%s' parameter, see the man page\")
+        error (f_"invalid format for '--%%s' parameter, see the man page")
           option_name in
     let len = String.length arg in
     String.sub arg 0 i, String.sub arg (i+1) (len-(i+1))
   and split_string_triplet option_name arg =
-    match String.nsplit ~max:3 \":\" arg with
+    match String.nsplit ~max:3 ":" arg with
     | [a; b; c] -> a, b, c
     | _ ->
-        error (f_\"invalid format for '--%%s' parameter, see the man page\")
+        error (f_"invalid format for '--%%s' parameter, see the man page")
           option_name
   and split_string_list arg =
-    String.nsplit \",\" arg
+    String.nsplit "," arg
   in
   let split_links_list option_name arg =
-    match String.nsplit \":\" arg with
+    match String.nsplit ":" arg with
     | [] | [_] ->
-      error (f_\"invalid format for '--%%s' parameter, see the man page\")
+      error (f_"invalid format for '--%%s' parameter, see the man page")
         option_name
     | target :: lns -> target, lns
   in
 
   let rec argspec = [
-";
+|};
 
   List.iter (
     function
@@ -1059,7 +1030,7 @@ let rec argspec ?(v2v = false) () =
     | { op_type = SMPoolSelector _; } -> ()
   ) ops;
 
-pr "    ] in
+pr {|    ] in
     let lines = read_whole_file filename in
     let lines = String.lines_split lines in
     let lines = List.map String.triml lines in
@@ -1067,12 +1038,12 @@ pr "    ] in
       fun line ->
         String.length line > 0 && line.[0] <> '#'
     ) lines in
-    let cmds = List.map (fun line -> String.split \" \" line) lines in
+    let cmds = List.map (fun line -> String.split " " line) lines in
     (* Check for commands not allowed in files containing commands. *)
     List.iter (
       fun (cmd, _) ->
         if List.mem cmd forbidden_commands then
-          error (f_\"command '%%s' cannot be used in command files, see the man page\")
+          error (f_"command '%%s' cannot be used in command files, see the man page")
             cmd
     ) cmds;
     List.iter (
@@ -1086,10 +1057,10 @@ pr "    ] in
           | Getopt.Unit fn -> fn ()
           | Getopt.String (_, fn) -> fn arg
           | Getopt.Set varref -> varref := true
-          | _ -> error \"INTERNAL error: spec not handled for %%s\" cmd
+          | _ -> error "INTERNAL error: spec not handled for %%s" cmd
           )
         with Not_found ->
-          error (f_\"command '%%s' not valid, see the man page\")
+          error (f_"command '%%s' not valid, see the man page")
             cmd
     ) cmds
   in
@@ -1103,15 +1074,14 @@ pr "    ] in
     ) argspec in
 
   argspec, get_ops
-"
+|}
 
 and generate_ops_struct_decl () =
-  pr "\
-type ops = {
+  pr {|type ops = {
   ops : op list;
   flags : flags;
 }
-";
+|};
 
   (* Operations. *)
   pr "and op = [\n";
@@ -1250,12 +1220,11 @@ let generate_customize_options_pod ?(v2v = false) () =
 
   List.iter (
     fun (_, item, longdesc) ->
-      pr "\
-=item %s
+      pr {|=item %s
 
 %s
 
-" item longdesc
+|} item longdesc
   ) pod;
 
   pr "=back\n\n"
diff --git a/generator/daemon.ml b/generator/daemon.ml
index 6197288df..65844309e 100644
--- a/generator/daemon.ml
+++ b/generator/daemon.ml
@@ -94,8 +94,7 @@ let generate_daemon_stubs_h () =
 let generate_daemon_stubs actions () =
   generate_header CStyle GPLv2plus;
 
-  pr "\
-#include <config.h>
+  pr {|#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -106,15 +105,15 @@ let generate_daemon_stubs actions () =
 #include <rpc/types.h>
 #include <rpc/xdr.h>
 
-#include \"daemon.h\"
-#include \"c-ctype.h\"
-#include \"guestfs_protocol.h\"
-#include \"actions.h\"
-#include \"optgroups.h\"
-#include \"stubs.h\"
-#include \"stubs-macros.h\"
+#include "daemon.h"
+#include "c-ctype.h"
+#include "guestfs_protocol.h"
+#include "actions.h"
+#include "optgroups.h"
+#include "stubs.h"
+#include "stubs-macros.h"
 
-";
+|};
 
   List.iter (
     fun { name; style = ret, args, optargs; optional } ->
@@ -605,8 +604,7 @@ and generate_ocaml_daemon_prototype name (ret, args, optargs) =
 let generate_daemon_caml_stubs () =
   generate_header CStyle GPLv2plus;
 
-  pr "\
-#include <config.h>
+  pr {|#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -622,11 +620,11 @@ let generate_daemon_caml_stubs () =
 #include <caml/memory.h>
 #include <caml/mlvalues.h>
 
-#include \"daemon.h\"
-#include \"actions.h\"
-#include \"daemon-c.h\"
+#include "daemon.h"
+#include "actions.h"
+#include "daemon-c.h"
 
-";
+|};
 
   (* Implement code for returning structs and struct lists. *)
   let emit_return_struct typ =
@@ -922,8 +920,7 @@ let generate_daemon_caml_stubs () =
 let generate_daemon_dispatch () =
   generate_header CStyle GPLv2plus;
 
-  pr "\
-#include <config.h>
+  pr {|#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -933,14 +930,14 @@ let generate_daemon_dispatch () =
 #include <rpc/types.h>
 #include <rpc/xdr.h>
 
-#include \"daemon.h\"
-#include \"c-ctype.h\"
-#include \"guestfs_protocol.h\"
-#include \"actions.h\"
-#include \"optgroups.h\"
-#include \"stubs.h\"
+#include "daemon.h"
+#include "c-ctype.h"
+#include "guestfs_protocol.h"
+#include "actions.h"
+#include "optgroups.h"
+#include "stubs.h"
 
-";
+|};
 
   (* Dispatch function. *)
   pr "void\n";
@@ -1043,8 +1040,7 @@ let generate_daemon_optgroups_h () =
 
   pr "\n";
 
-  pr "\
-/* These macros can be used to disable an entire group of functions.
+  pr {|/* These macros can be used to disable an entire group of functions.
  * The advantage of generating this code is that it avoids an
  * undetected error when a new function in a group is added, but
  * the appropriate abort function is not added to the daemon (because
@@ -1052,7 +1048,7 @@ let generate_daemon_optgroups_h () =
  * is not present).
  */
 
-";
+|};
   List.iter (
     fun (group, fns) ->
       pr "#define OPTGROUP_%s_NOT_AVAILABLE \\\n"
@@ -1098,16 +1094,15 @@ let generate_daemon_optgroups_mli () =
 let generate_daemon_structs_cleanups_c () =
   generate_header CStyle GPLv2plus;
 
-  pr "\
-#include <config.h>
+  pr {|#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 
-#include \"daemon.h\"
-#include \"guestfs_protocol.h\"
+#include "daemon.h"
+#include "guestfs_protocol.h"
 
-";
+|};
 
   pr "/* Cleanup functions used by CLEANUP_* macros.  Do not call\n";
   pr " * these functions directly.\n";
@@ -1148,15 +1143,14 @@ let generate_daemon_structs_cleanups_c () =
 let generate_daemon_structs_cleanups_h () =
   generate_header CStyle GPLv2plus;
 
-  pr "\
-/* These CLEANUP_* macros automatically free the struct or struct list
+  pr {|/* These CLEANUP_* macros automatically free the struct or struct list
  * pointed to by the local variable at the end of the current scope.
  */
 
 #ifndef GUESTFS_DAEMON_STRUCTS_CLEANUPS_H_
 #define GUESTFS_DAEMON_STRUCTS_CLEANUPS_H_
 
-";
+|};
 
   List.iter (
     fun { s_name = name } ->
@@ -1166,13 +1160,12 @@ let generate_daemon_structs_cleanups_h () =
       pr "  __attribute__((cleanup(cleanup_free_int_%s_list)))\n" name
   ) structs;
 
-  pr "\
-
+  pr {|
 /* These functions are used internally by the CLEANUP_* macros.
  * Don't call them directly.
  */
 
-";
+|};
 
   List.iter (
     fun { s_name = name } ->
diff --git a/generator/docstrings.ml b/generator/docstrings.ml
index 047ad590a..2d81b82db 100644
--- a/generator/docstrings.ml
+++ b/generator/docstrings.ml
@@ -45,22 +45,22 @@ let deprecation_notice ?(prefix = "") ?(replace_underscores = false) =
     let alt =
       if replace_underscores then String.replace_char alt '_' '-' else alt in
     let txt =
-      sprintf "I<This function is deprecated.>
+      sprintf {|I<This function is deprecated.>
 In new code, use the L</%s%s> call instead.
 
 Deprecated functions will not be removed from the API, but the
 fact that they are deprecated indicates that there are problems
-with correct use of these functions." prefix alt in
+with correct use of these functions.|} prefix alt in
     Some txt
 
   | { deprecated_by = Deprecated_no_replacement } ->
-     Some "I<This function is deprecated.>
+     Some {|I<This function is deprecated.>
 There is no replacement.  Consult the API documentation in
 L<guestfs(3)> for further information.
 
 Deprecated functions will not be removed from the API, but the
 fact that they are deprecated indicates that there are problems
-with correct use of these functions."
+with correct use of these functions.|}
 
 let version_added = function
   | { added = (0, 0, release) } -> Some (sprintf "0.%d" release)
diff --git a/generator/erlang.ml b/generator/erlang.ml
index 864b3ff04..9018ba7f4 100644
--- a/generator/erlang.ml
+++ b/generator/erlang.ml
@@ -57,9 +57,8 @@ let rec generate_erlang_erl () =
 
   pr "\n";
 
-  pr "\
-create() ->
-  create(\"erl-guestfs\").
+  pr {|create() ->
+  create("erl-guestfs").
 
 create(ExtProg) ->
   G = spawn(?MODULE, init, [ExtProg]),
@@ -96,7 +95,7 @@ loop(Port) ->
       exit(port_terminated)
   end.
 
-";
+|};
 
   (* These bindings just marshal the parameters and call the back-end
    * process which dispatches them to the port.
@@ -186,8 +185,7 @@ loop(Port) ->
 and generate_erlang_actions_h () =
   generate_header CStyle GPLv2plus;
 
-  pr "\
-#ifndef GUESTFS_ERLANG_ACTIONS_H_
+  pr {|#ifndef GUESTFS_ERLANG_ACTIONS_H_
 #define GUESTFS_ERLANG_ACTIONS_H_
 
 extern guestfs_h *g;
@@ -207,7 +205,7 @@ extern int decode_bool (const char *buff, int *index, int *res);
 extern int decode_int (const char *buff, int *index, int *res);
 extern int decode_int64 (const char *buff, int *index, int64_t *res);
 
-";
+|};
 
   let emit_copy_list_decl typ =
     pr "int make_%s_list (ei_x_buff *buff, const struct guestfs_%s_list *%ss);\n"
@@ -238,8 +236,7 @@ extern int decode_int64 (const char *buff, int *index, int64_t *res);
 and generate_erlang_structs () =
   generate_header CStyle GPLv2plus;
 
-  pr "\
-#include <config.h>
+  pr {|#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -249,11 +246,11 @@ and generate_erlang_structs () =
 
 #include <ei.h>
 
-#include \"guestfs.h\"
-#include \"guestfs-utils.h\"
+#include "guestfs.h"
+#include "guestfs-utils.h"
 
-#include \"actions.h\"
-";
+#include "actions.h"
+|};
 
   (* Struct copy functions. *)
   let emit_copy_list_function typ =
@@ -328,8 +325,7 @@ and generate_erlang_structs () =
 and generate_erlang_actions actions () =
   generate_header CStyle GPLv2plus;
 
-  pr "\
-#include <config.h>
+  pr {|#include <config.h>
 
 /* It is safe to call deprecated functions from this file. */
 #define GUESTFS_NO_WARN_DEPRECATED
@@ -343,11 +339,11 @@ and generate_erlang_actions actions () =
 
 #include <ei.h>
 
-#include \"guestfs.h\"
-#include \"guestfs-utils.h\"
+#include "guestfs.h"
+#include "guestfs-utils.h"
 
-#include \"actions.h\"
-";
+#include "actions.h"
+|};
 
   (* The wrapper functions. *)
   List.iter (
@@ -526,8 +522,7 @@ and generate_erlang_actions actions () =
 and generate_erlang_dispatch () =
   generate_header CStyle GPLv2plus;
 
-  pr "\
-#include <config.h>
+  pr {|#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -537,10 +532,10 @@ and generate_erlang_dispatch () =
 
 #include <ei.h>
 
-#include \"guestfs.h\"
-#include \"guestfs-utils.h\"
+#include "guestfs.h"
+#include "guestfs-utils.h"
 
-#include \"actions.h\"
+#include "actions.h"
 
 int
 dispatch (ei_x_buff *retbuff, const char *buff, int *index)
@@ -552,7 +547,7 @@ dispatch (ei_x_buff *retbuff, const char *buff, int *index)
   if (ei_decode_atom (buff, index, fun) != 0) return -1;
 
   /* XXX We should use gperf here. */
-  ";
+  |};
 
   List.iter (
     fun { name; style = ret, args, optargs } ->
diff --git a/generator/errnostring.ml b/generator/errnostring.ml
index e5f4c69f8..03ae564ee 100644
--- a/generator/errnostring.ml
+++ b/generator/errnostring.ml
@@ -208,20 +208,20 @@ let () =
 let generate_errnostring_h () =
   generate_header CStyle LGPLv2plus;
 
-  pr "
+  pr {|
 #ifndef GUESTFS_ERRNOSTRING_H_
 #define GUESTFS_ERRNOSTRING_H_
 
-/* Convert errno (eg. EIO) to its string representation (\"EIO\").
+/* Convert errno (eg. EIO) to its string representation ("EIO").
  * This only works for a set of errors that are listed in the generator
  * AND are supported on the local operating system.  For other errors
- * the string (\"EINVAL\") is returned.
+ * the string ("EINVAL") is returned.
  *
  * NOTE: It is an error to call this function with errnum == 0.
  */
 extern const char *guestfs_int_errno_to_string (int errnum);
 
-/* Convert string representation of an error (eg. \"EIO\") to the errno
+/* Convert string representation of an error (eg. "EIO") to the errno
  * value (EIO).  As for the function above, this only works for a
  * subset of errors.  For errors not supported by the local operating
  * system, EINVAL is returned (all POSIX-conforming systems must
@@ -233,22 +233,21 @@ extern int guestfs_int_string_to_errno (const char *errnostr);
 struct errnostring_entry { char *name; int errnum; };
 
 #endif /* GUESTFS_ERRNOSTRING_H_ */
-"
+|}
 
 let generate_errnostring_c () =
   generate_header CStyle LGPLv2plus;
 
-  pr "\
-#include <config.h>
+  pr {|#include <config.h>
 
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 
-#include \"errnostring.h\"
+#include "errnostring.h"
 
 static const char *errno_to_string[] = {
-";
+|};
 
   List.iter (
     fun e ->
@@ -257,10 +256,9 @@ static const char *errno_to_string[] = {
       pr "#endif\n"
   ) errnos;
 
-  pr "\
-};
+  pr {|};
 
-#define ERRNO_TO_STRING_SIZE \\
+#define ERRNO_TO_STRING_SIZE \
   (sizeof errno_to_string / sizeof errno_to_string[0])
 
 const char *
@@ -272,17 +270,16 @@ guestfs_int_errno_to_string (int errnum)
 
   if (errnum < 0 || (size_t) errnum >= ERRNO_TO_STRING_SIZE ||
       errno_to_string[errnum] == NULL)
-    return \"EINVAL\";
+    return "EINVAL";
   else
     return errno_to_string[errnum];
 }
-"
+|}
 
 let generate_errnostring_gperf () =
   generate_header CStyle LGPLv2plus;
 
-  pr "\
-%%language=ANSI-C
+  pr {|%%language=ANSI-C
 %%define lookup-function-name guestfs_int_string_to_errno_lookup
 %%readonly-tables
 %%null-strings
@@ -295,9 +292,9 @@ let generate_errnostring_gperf () =
 #include <string.h>
 #include <errno.h>
 
-#include \"errnostring.h\"
+#include "errnostring.h"
 
-";
+|};
 
   (* Some of these errnos might not exist on the target platform, but
    * we are going to include E_ macros directly in the C output of
@@ -313,22 +310,20 @@ let generate_errnostring_gperf () =
       pr "#endif\n";
   ) errnos;
 
-  pr "\
-
+  pr {|
 %%}
 
 struct errnostring_entry;
 
 %%%%
-";
+|};
 
   List.iter (
     fun e ->
       pr "%s, %s\n" e e
   ) errnos;
 
-  pr "\
-%%%%
+  pr {|%%%%
 
 int
 guestfs_int_string_to_errno (const char *errnostr)
@@ -340,4 +335,4 @@ guestfs_int_string_to_errno (const char *errnostr)
   else
     return EINVAL;
 }
-"
+|}
diff --git a/generator/fish.ml b/generator/fish.ml
index d27a3d767..b8435ea54 100644
--- a/generator/fish.ml
+++ b/generator/fish.ml
@@ -577,7 +577,15 @@ Guestfish will prompt for these separately."
         else "" in
 
       let pod =
-        sprintf "%s - %s\n\n=head1 SYNOPSIS\n\n %s\n\n=head1 DESCRIPTION\n\n%s%s%s"
+        sprintf {|%s - %s
+
+=head1 SYNOPSIS
+
+ %s
+
+=head1 DESCRIPTION
+
+%s%s%s|}
           name2 shortdesc synopsis longdesc warnings describe_alias in
       let text =
         String.concat "\n" (pod2text ~trim:false ~discard:false "NAME" pod)
@@ -629,7 +637,13 @@ let generate_fish_cmds () =
         else "" in
 
       let pod =
-        sprintf "%s - %s\n\n=head1 DESCRIPTION\n\n%s\n\n%s"
+        sprintf {|%s - %s
+
+=head1 DESCRIPTION
+
+%s
+
+%s|}
           name2 shortdesc longdesc describe_alias in
       let text =
         String.concat "\n" (pod2text ~trim:false ~discard:false "NAME" pod)
@@ -688,8 +702,7 @@ and generate_fish_cmds_h () =
 and generate_fish_cmds_gperf () =
   generate_header CStyle GPLv2plus;
 
-  pr "\
-%%language=ANSI-C
+  pr {|%%language=ANSI-C
 %%define lookup-function-name lookup_fish_command
 %%ignore-case
 %%readonly-tables
@@ -704,24 +717,23 @@ and generate_fish_cmds_gperf () =
 #include <string.h>
 #include <libintl.h>
 
-#include \"fish.h\"
-#include \"run.h\"
-#include \"cmds-gperf.h\"
+#include "fish.h"
+#include "run.h"
+#include "cmds-gperf.h"
 
-";
+|};
 
   List.iter (
     fun { name } ->
       pr "extern struct command_entry %s_cmd_entry;\n" name
   ) fish_functions_and_commands_sorted;
 
-  pr "\
-%%}
+  pr {|%%}
 
 struct command_table;
 
 %%%%
-";
+|};
 
   List.iter (
     fun ({ name } as f) ->
@@ -742,8 +754,7 @@ struct command_table;
       ) aliases;
   ) fish_functions_and_commands_sorted;
 
-  pr "\
-%%%%
+  pr {|%%%%
 
 int
 display_command (const char *cmd)
@@ -772,28 +783,27 @@ run_action (const char *cmd, size_t argc, char *argv[])
      * that this function should print the command synopsis.
      */
     if (ret == RUN_WRONG_ARGS) {
-      fprintf (stderr, _(\"error: incorrect number of arguments\\n\"));
+      fprintf (stderr, _("error: incorrect number of arguments\n"));
       if (ct->entry->synopsis)
-        fprintf (stderr, _(\"usage: %%s\\n\"), ct->entry->synopsis);
-      fprintf (stderr, _(\"type 'help %%s' for more help on %%s\\n\"), cmd, cmd);
+        fprintf (stderr, _("usage: %%s\n"), ct->entry->synopsis);
+      fprintf (stderr, _("type 'help %%s' for more help on %%s\n"), cmd, cmd);
       ret = -1;
     }
   }
   else {
-    fprintf (stderr, _(\"%%s: unknown command\\n\"), cmd);
+    fprintf (stderr, _("%%s: unknown command\n"), cmd);
     if (command_num == 1)
       extended_help_message ();
   }
   return ret;
 }
-"
+|}
 
 (* Readline completion for guestfish. *)
 and generate_fish_completion () =
   generate_header CStyle GPLv2plus;
 
-  pr "\
-#include <config.h>
+  pr {|#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -803,13 +813,13 @@ and generate_fish_completion () =
 #include <readline/readline.h>
 #endif
 
-#include \"fish.h\"
+#include "fish.h"
 
 #ifdef HAVE_LIBREADLINE
 
 static const char *const commands[] = {
   BUILTIN_COMMANDS_FOR_COMPLETION,
-";
+|};
 
   (* Get the commands, including the aliases.  They don't need to be
    * sorted - the generator() function just does a dumb linear search.
@@ -825,7 +835,7 @@ static const char *const commands[] = {
 
   List.iter (pr "  \"%s\",\n") commands;
 
-  pr "  NULL
+  pr {|  NULL
 };
 
 static char *
@@ -876,7 +886,7 @@ do_completion (const char *text, int start, int end)
 
   return matches;
 }
-";
+|};
 
 (* Generate the POD documentation for guestfish. *)
 and generate_fish_actions_pod () =
@@ -976,9 +986,8 @@ and generate_fish_prep_options_h () =
   pr "#ifndef PREPOPTS_H\n";
   pr "\n";
 
-  pr "\
-struct prep {
-  const char *name;             /* eg. \"fs\" */
+  pr {|struct prep {
+  const char *name;             /* eg. "fs" */
 
   size_t nr_params;             /* optional parameters */
   struct prep_param *params;
@@ -1000,7 +1009,7 @@ struct prep_param {
 extern const struct prep preps[];
 #define NR_PREPS %d
 
-" (List.length prepopts);
+|} (List.length prepopts);
 
   List.iter (
     fun (name, _, _, _) ->
@@ -1016,15 +1025,14 @@ extern void prep_postlaunch_%s (const char *filename, prep_data *data, const cha
 and generate_fish_prep_options_c () =
   generate_header CStyle GPLv2plus;
 
-  pr "\
-#include <config.h>
+  pr {|#include <config.h>
 
 #include <stdio.h>
 
-#include \"fish.h\"
-#include \"prepopts.h\"
+#include "fish.h"
+#include "prepopts.h"
 
-";
+|};
 
   List.iter (
     fun (name, _, args, _) ->
@@ -1056,11 +1064,11 @@ and generate_fish_prep_options_c () =
       let longdesc = loop longdesc in
       let longdesc = String.concat "" longdesc in
 
-      pr "  { \"%s\", %d, %s_args,
-    \"%s\",
-    \"%s\",
+      pr {|  { "%s", %d, %s_args,
+    "%s",
+    "%s",
     prep_prelaunch_%s, prep_postlaunch_%s },
-"
+|}
         name (List.length args) name
         (c_quote shortdesc) (c_quote longdesc)
         name name;
@@ -1097,22 +1105,21 @@ and generate_fish_prep_options_pod () =
 and generate_fish_event_names () =
   generate_header CStyle GPLv2plus;
 
-  pr "\
-#include <config.h>
+  pr {|#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <libintl.h>
 
-#include \"fish.h\"
+#include "fish.h"
 
 int
 event_bitmask_of_event_set (const char *arg, uint64_t *eventset_r)
 {
   size_t n;
 
-  if (STREQ (arg, \"*\")) {
+  if (STREQ (arg, "*")) {
     *eventset_r = GUESTFS_EVENT_ALL;
     return 0;
   }
@@ -1120,9 +1127,9 @@ event_bitmask_of_event_set (const char *arg, uint64_t *eventset_r)
   *eventset_r = 0;
 
   while (*arg) {
-    n = strcspn (arg, \",\");
+    n = strcspn (arg, ",");
 
-    ";
+    |};
 
   List.iter (
     fun (name, _) ->
@@ -1132,9 +1139,8 @@ event_bitmask_of_event_set (const char *arg, uint64_t *eventset_r)
       pr "    else ";
   ) events;
 
-  pr "\
-{
-      fprintf (stderr, _(\"unknown event name: %%s\\n\"), arg);
+  pr {|{
+      fprintf (stderr, _("unknown event name: %%s\n"), arg);
       return -1;
     }
 
@@ -1145,7 +1151,7 @@ event_bitmask_of_event_set (const char *arg, uint64_t *eventset_r)
 
   return 0;
 }
-"
+|}
 
 and generate_fish_test_prep_sh () =
   pr "#!/bin/bash -\n";
@@ -1153,8 +1159,7 @@ and generate_fish_test_prep_sh () =
 
   let all_disks = sprintf "prep{1..%d}.img" (List.length prepopts) in
 
-  pr "\
-
+  pr {|
 source ../tests/functions.sh
 set -e
 set -x
@@ -1163,8 +1168,8 @@ skip_if_skipped
 
 rm -f %s
 
-$VG guestfish \\
-" all_disks;
+$VG guestfish \
+|} all_disks;
 
   let vg_count = ref 0 in
 
diff --git a/generator/fish_commands.ml b/generator/fish_commands.ml
index 73d7f13cd..9df97e929 100644
--- a/generator/fish_commands.ml
+++ b/generator/fish_commands.ml
@@ -34,7 +34,7 @@ let fish_commands = [
     name = "alloc";
     fish_alias = ["allocate"];
     shortdesc = "allocate and add a disk file";
-    longdesc = " alloc filename size
+    longdesc = {| alloc filename size
 
 This creates an empty (zeroed) file of the given size, and then adds
 so it can be further examined.
@@ -44,12 +44,12 @@ For more advanced image creation, see L</disk-create>.
 Size can be specified using standard suffixes, eg. C<1M>.
 
 To create a sparse file, use L</sparse> instead.  To create a
-prepared disk image, see L</PREPARED DISK IMAGES>." };
+prepared disk image, see L</PREPARED DISK IMAGES>.|} };
 
   { defaults with
     name = "copy_in";
     shortdesc = "copy local files or directories into an image";
-    longdesc = " copy-in local [local ...] /remotedir
+    longdesc = {| copy-in local [local ...] /remotedir
 
 C<copy-in> copies local files or directories recursively into the disk
 image, placing them in the directory called F</remotedir> (which must
@@ -58,12 +58,12 @@ L</tar-in> and other commands as necessary.
 
 Multiple local files and directories can be specified, but the last
 parameter must always be a remote directory.  Wildcards cannot be
-used." };
+used.|} };
 
   { defaults with
     name = "copy_out";
     shortdesc = "copy remote files or directories out of an image";
-    longdesc = " copy-out remote [remote ...] localdir
+    longdesc = {| copy-out remote [remote ...] localdir
 
 C<copy-out> copies remote files or directories recursively out of the
 disk image, placing them on the host disk in a local directory called
@@ -80,23 +80,23 @@ current directory, use C<.> as in:
 Wildcards cannot be used in the ordinary command, but you can use
 them with the help of L</glob> like this:
 
- glob copy-out /home/* ." };
+ glob copy-out /home/* .|} };
 
   { defaults with
     name = "delete_event";
     shortdesc = "delete a previously registered event handler";
-    longdesc = " delete-event name
+    longdesc = {| delete-event name
 
 Delete the event handler which was previously registered as C<name>.
 If multiple event handlers were registered with the same name, they
 are all deleted.
 
-See also the guestfish commands C<event> and C<list-events>." };
+See also the guestfish commands C<event> and C<list-events>.|} };
 
   { defaults with
     name = "display";
     shortdesc = "display an image";
-    longdesc = " display filename
+    longdesc = {| display filename
 
 Use C<display> (a graphical display program) to display an image
 file.  It downloads the file, and runs C<display> on it.
@@ -106,7 +106,7 @@ environment variable.  For example to use the GNOME display program:
 
  export GUESTFISH_DISPLAY_IMAGE=eog
 
-See also L<display(1)>." };
+See also L<display(1)>.|} };
 
   { defaults with
     name = "echo";
@@ -119,19 +119,19 @@ This echos the parameters to the terminal." };
     name = "edit";
     fish_alias = ["vi"; "emacs"];
     shortdesc = "edit a file";
-    longdesc = " edit filename
+    longdesc = {| edit filename
 
 This is used to edit a file.  It downloads the file, edits it
 locally using your editor, then uploads the result.
 
 The editor is C<$EDITOR>.  However if you use the alternate
 commands C<vi> or C<emacs> you will get those corresponding
-editors." };
+editors.|} };
 
   { defaults with
     name = "event";
     shortdesc = "register a handler for an event or events";
-    longdesc = " event name eventset \"shell script ...\"
+    longdesc = {| event name eventset "shell script ..."
 
 Register a shell script fragment which is executed when an
 event is raised.  See L<guestfs(3)/guestfs_set_event_callback>
@@ -155,27 +155,27 @@ The shell script fragment receives callback parameters as
 arguments C<$1>, C<$2> etc.  The actual event that was
 called is available in the environment variable C<$EVENT>.
 
- event \"\" close \"echo closed\"
- event messages appliance,library,trace \"echo $@\"
- event \"\" progress \"echo progress: $3/$4\"
- event \"\" * \"echo $EVENT $@\"
+ event "" close "echo closed"
+ event messages appliance,library,trace "echo $@"
+ event "" progress "echo progress: $3/$4"
+ event "" * "echo $EVENT $@"
 
-See also the guestfish commands C<delete-event> and C<list-events>." };
+See also the guestfish commands C<delete-event> and C<list-events>.|} };
 
   { defaults with
     name = "glob";
     shortdesc = "expand wildcards in command";
-    longdesc = " glob command args...
+    longdesc = {| glob command args...
 
 Expand wildcards in any paths in the args list, and run C<command>
 repeatedly on each matching path.
 
-See L</WILDCARDS AND GLOBBING>." };
+See L</WILDCARDS AND GLOBBING>.|} };
 
   { defaults with
     name = "hexedit";
     shortdesc = "edit with a hex editor";
-    longdesc = " hexedit <filename|device>
+    longdesc = {| hexedit <filename|device>
  hexedit <filename|device> <max>
  hexedit <filename|device> <start> <max>
 
@@ -207,17 +207,17 @@ This command requires the external L<hexedit(1)> program.  You
 can specify another program to use by setting the C<HEXEDITOR>
 environment variable.
 
-See also L</hexdump>." };
+See also L</hexdump>.|} };
 
   { defaults with
     name = "lcd";
     shortdesc = "change working directory";
-    longdesc = " lcd directory
+    longdesc = {| lcd directory
 
 Change the local directory, ie. the current directory of guestfish
 itself.
 
-Note that C<!cd> won't do what you might expect." };
+Note that C<!cd> won't do what you might expect.|} };
 
   { defaults with
     name = "list_events";
@@ -239,40 +239,40 @@ Opens the manual page for guestfish." };
     name = "more";
     fish_alias = ["less"];
     shortdesc = "view a file";
-    longdesc = " more filename
+    longdesc = {| more filename
 
  less filename
 
 This is used to view a file.
 
 The default viewer is C<$PAGER>.  However if you use the alternate
-command C<less> you will get the C<less> command specifically." };
+command C<less> you will get the C<less> command specifically.|} };
 
   { defaults with
     name = "reopen";
     shortdesc = "close and reopen libguestfs handle";
-    longdesc = "  reopen
+    longdesc = {|  reopen
 
 Close and reopen the libguestfs handle.  It is not necessary to use
 this normally, because the handle is closed properly when guestfish
-exits.  However this is occasionally useful for testing." };
+exits.  However this is occasionally useful for testing.|} };
 
   { defaults with
     name = "setenv";
     shortdesc = "set an environment variable";
-    longdesc = "  setenv VAR value
+    longdesc = {|  setenv VAR value
 
 Set the environment variable C<VAR> to the string C<value>.
 
 To print the value of an environment variable use a shell command
 such as:
 
- !echo $VAR" };
+ !echo $VAR|} };
 
   { defaults with
     name = "sparse";
     shortdesc = "create a sparse disk image and add";
-    longdesc = " sparse filename size
+    longdesc = {| sparse filename size
 
 This creates an empty sparse file of the given size, and then adds
 so it can be further examined.
@@ -287,18 +287,18 @@ For more advanced image creation, see L</disk-create>.
 
 Size can be specified using standard suffixes, eg. C<1M>.
 
-See also the guestfish L</scratch> command." };
+See also the guestfish L</scratch> command.|} };
 
   { defaults with
     name = "supported";
     shortdesc = "list supported groups of commands";
-    longdesc = " supported
+    longdesc = {| supported
 
 This command returns a list of the optional groups
 known to the daemon, and indicates which ones are
 supported by this build of the libguestfs appliance.
 
-See also L<guestfs(3)/AVAILABILITY>." };
+See also L<guestfs(3)/AVAILABILITY>.|} };
 
   { defaults with
     name = "time";
diff --git a/generator/golang.ml b/generator/golang.ml
index a5b39f5df..35d5d6bf6 100644
--- a/generator/golang.ml
+++ b/generator/golang.ml
@@ -36,15 +36,14 @@ let generate_header = generate_header ~inputs:["generator/golang.ml"]
 let generate_golang_go () =
   generate_header CStyle LGPLv2plus;
 
-  pr "\
-package guestfs
+  pr {|package guestfs
 
 /*
 #cgo CFLAGS:  -DGUESTFS_PRIVATE=1 -DGUESTFS_NO_WARN_DEPRECATED -UGUESTFS_NO_DEPRECATED
 #cgo LDFLAGS: -lguestfs
 #include <stdio.h>
 #include <stdlib.h>
-#include \"guestfs.h\"
+#include "guestfs.h"
 
 // cgo can't deal with variable argument functions.
 static guestfs_h *
@@ -87,13 +86,13 @@ void freeStringArray (pChar *array)
     free (array);
 }
 */
-import \"C\"
+import "C"
 
 import (
-    \"fmt\"
-    \"runtime\"
-    \"syscall\"
-    \"unsafe\"
+    "fmt"
+    "runtime"
+    "syscall"
+    "unsafe"
 )
 
 /* Handle. */
@@ -103,7 +102,7 @@ type Guestfs struct {
 
 /* Convert handle to string (just for debugging). */
 func (g *Guestfs) String () string {
-    return \"&Guestfs{}\"
+    return "&Guestfs{}"
 }
 
 /* Create a new handle with flags. */
@@ -142,9 +141,9 @@ type GuestfsError struct {
 
 func (e *GuestfsError) String() string {
     if e.Errno != 0 {
-        return fmt.Sprintf (\"%%s: %%s\", e.Op, e.Errmsg);
+        return fmt.Sprintf ("%%s: %%s", e.Op, e.Errmsg);
     } else {
-        return fmt.Sprintf (\"%%s: %%s: %%s\", e.Op, e.Errmsg, e.Errno);
+        return fmt.Sprintf ("%%s: %%s: %%s", e.Op, e.Errmsg, e.Errno);
     }
 }
 
@@ -164,14 +163,14 @@ func get_error_from_handle (g *Guestfs, op string) *GuestfsError {
 }
 
 func closed_handle_error (op string) *GuestfsError {
-    return &GuestfsError{ Op : op, Errmsg : \"handle is closed\",
+    return &GuestfsError{ Op : op, Errmsg : "handle is closed",
                           Errno : syscall.Errno (0) }
 }
 
 /* Close the handle. */
 func (g *Guestfs) Close () *GuestfsError {
     if g.g == nil {
-        return closed_handle_error (\"close\")
+        return closed_handle_error ("close")
     }
     C.guestfs_close (g.g)
     g.g = nil
@@ -222,7 +221,7 @@ func return_hashtable (argv **C.char) map[string]string {
         argv = (**C.char) (unsafe.Pointer (uintptr (unsafe.Pointer (argv)) +
                                            unsafe.Sizeof (*argv)))
         if *argv == nil {
-            panic (\"odd number of items in hash table\")
+            panic ("odd number of items in hash table")
         }
 
         r[key] = C.GoString (*argv)
@@ -233,7 +232,7 @@ func return_hashtable (argv **C.char) map[string]string {
 }
 
 /* XXX Events/callbacks not yet implemented. */
-";
+|};
 
   (* Structures. *)
   List.iter (
diff --git a/generator/haskell.ml b/generator/haskell.ml
index d87000ab2..425424c61 100644
--- a/generator/haskell.ml
+++ b/generator/haskell.ml
@@ -65,7 +65,7 @@ module Guestfs (
       if can_generate style then pr ",\n  %s" name
   ) (actions |> external_functions |> sort);
 
-  pr "
+  pr {|
   ) where
 
 -- Unfortunately some symbols duplicate ones already present
@@ -84,11 +84,11 @@ data GuestfsS = GuestfsS            -- represents the opaque C struct
 type GuestfsP = Ptr GuestfsS        -- guestfs_h *
 type GuestfsH = ForeignPtr GuestfsS -- guestfs_h * with attached finalizer
 
-foreign import ccall unsafe \"guestfs.h guestfs_create\" c_create
+foreign import ccall unsafe "guestfs.h guestfs_create" c_create
   :: IO GuestfsP
-foreign import ccall unsafe \"guestfs.h &guestfs_close\" c_close
+foreign import ccall unsafe "guestfs.h &guestfs_close" c_close
   :: FunPtr (GuestfsP -> IO ())
-foreign import ccall unsafe \"guestfs.h guestfs_set_error_handler\" c_set_error_handler
+foreign import ccall unsafe "guestfs.h guestfs_set_error_handler" c_set_error_handler
   :: GuestfsP -> Ptr CInt -> Ptr CInt -> IO ()
 
 create :: IO GuestfsH
@@ -98,28 +98,28 @@ create = do
   h <- newForeignPtr c_close p
   return h
 
-foreign import ccall unsafe \"guestfs.h guestfs_last_error\" c_last_error
+foreign import ccall unsafe "guestfs.h guestfs_last_error" c_last_error
   :: GuestfsP -> IO CString
 
 -- last_error :: GuestfsH -> IO (Maybe String)
 -- last_error h = do
---   str <- withForeignPtr h (\\p -> c_last_error p)
+--   str <- withForeignPtr h (\p -> c_last_error p)
 --   maybePeek peekCString str
 
 last_error :: GuestfsH -> IO String
 last_error h = do
-  str <- withForeignPtr h (\\p -> c_last_error p)
+  str <- withForeignPtr h (\p -> c_last_error p)
   if (str == nullPtr)
-    then return \"no error\"
+    then return "no error"
     else peekCString str
 
 assocListOfHashtable :: Eq a => [a] -> [(a,a)]
 assocListOfHashtable [] = []
 assocListOfHashtable [a] =
-  fail \"RHashtable returned an odd number of elements\"
+  fail "RHashtable returned an odd number of elements"
 assocListOfHashtable (a:b:rest) = (a,b) : assocListOfHashtable rest
 
-";
+|};
 
   (* Generate wrappers for each foreign function. *)
   List.iter (
diff --git a/generator/java.ml b/generator/java.ml
index 909db4530..d1d9c4b96 100644
--- a/generator/java.ml
+++ b/generator/java.ml
@@ -44,8 +44,7 @@ let drop_empty_trailing_lines l =
 let rec generate_java_java () =
   generate_header CStyle LGPLv2plus;
 
-  pr "\
-package com.redhat.et.libguestfs;
+  pr {|package com.redhat.et.libguestfs;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -60,8 +59,8 @@ import java.util.Map;
  * the following man pages:
  * </p>
  * <ol>
- * <li> <a href=\"http://libguestfs.org/guestfs-java.3.html\"><code>guestfs-java(3)</code></a> and </li>
- * <li> <a href=\"http://libguestfs.org/guestfs.3.html\"><code>guestfs(3)</code></a>. </li>
+ * <li> <a href="http://libguestfs.org/guestfs-java.3.html"><code>guestfs-java(3)</code></a> and </li>
+ * <li> <a href="http://libguestfs.org/guestfs.3.html"><code>guestfs(3)</code></a>. </li>
  * </ol>
  * <p>
  * This javadoc is <b>not</b> a good introduction to using libguestfs.
@@ -72,7 +71,7 @@ import java.util.Map;
 public class GuestFS {
   // Load the native code.
   static {
-    System.loadLibrary (\"guestfs_jni\");
+    System.loadLibrary ("guestfs_jni");
   }
 
   /**
@@ -97,11 +96,11 @@ public class GuestFS {
     Object _optobj;
     _optobj = null;
     if (optargs != null)
-      _optobj = optargs.get (\"environment\");
+      _optobj = optargs.get ("environment");
     if (_optobj != null && !((Boolean) _optobj).booleanValue())
       flags |= CREATE_NO_ENVIRONMENT;
     if (optargs != null)
-      _optobj = optargs.get (\"close_on_exit\");
+      _optobj = optargs.get ("close_on_exit");
     if (_optobj != null && !((Boolean) _optobj).booleanValue())
       flags |= CREATE_NO_CLOSE_ON_EXIT;
 
@@ -146,7 +145,7 @@ public class GuestFS {
     close ();
   }
 
-";
+|};
 
   (* Events. *)
   pr "  // Event bitmasks.\n\n";
@@ -166,8 +165,7 @@ public class GuestFS {
   pr "  public static final long EVENT_ALL = 0x%x;\n" all_events_bitmask;
   pr "\n";
 
-  pr "\
-  /**
+  pr {|/**
    * Utility function to turn an event number or bitmask into a string.
    *
    * @param events the event number to convert
@@ -210,7 +208,7 @@ public class GuestFS {
    * </p>
    *
    * @throws LibGuestFSException If there is a libguestfs error.
-   * @see \"The section &quot;EVENTS&quot; in the guestfs(3) manual\"
+   * @see "The section &quot;EVENTS&quot; in the guestfs(3) manual"
    * @see #delete_event_callback
    * @return handle for the event
    */
@@ -218,7 +216,7 @@ public class GuestFS {
     throws LibGuestFSException
   {
     if (g == 0)
-      throw new LibGuestFSException (\"set_event_callback: handle is closed\");
+      throw new LibGuestFSException ("set_event_callback: handle is closed");
 
     return _set_event_callback (g, callback, events);
   }
@@ -246,14 +244,14 @@ public class GuestFS {
     throws LibGuestFSException
   {
     if (g == 0)
-      throw new LibGuestFSException (\"delete_event_callback: handle is closed\");
+      throw new LibGuestFSException ("delete_event_callback: handle is closed");
 
     _delete_event_callback (g, eh);
   }
 
   private native void _delete_event_callback (long g, int eh);
 
-";
+|};
 
   (* Methods. *)
   List.iter (
@@ -545,8 +543,7 @@ and generate_java_prototype ?(public=false) ?(privat=false) ?(native=false)
 and generate_java_struct jtyp cols () =
   generate_header CStyle LGPLv2plus;
 
-  pr "\
-package com.redhat.et.libguestfs;
+  pr {|package com.redhat.et.libguestfs;
 
 /**
  * %s structure.
@@ -555,7 +552,7 @@ package com.redhat.et.libguestfs;
  * @see GuestFS
  */
 public class %s {
-" jtyp jtyp;
+|} jtyp jtyp;
 
   List.iter (
     function
@@ -576,8 +573,7 @@ public class %s {
 and generate_java_c actions () =
   generate_header CStyle LGPLv2plus;
 
-  pr "\
-#include <config.h>
+  pr {|#include <config.h>
 
 /* It is safe to call deprecated functions from this file. */
 #define GUESTFS_NO_WARN_DEPRECATED
@@ -588,10 +584,10 @@ and generate_java_c actions () =
 #include <string.h>
 #include <inttypes.h>
 
-#include \"com_redhat_et_libguestfs_GuestFS.h\"
-#include \"guestfs.h\"
-#include \"guestfs-utils.h\"
-#include \"structs-cleanups.h\"
+#include "com_redhat_et_libguestfs_GuestFS.h"
+#include "guestfs.h"
+#include "guestfs-utils.h"
+#include "structs-cleanups.h"
 
 /* Note that this function returns.  The exception is not thrown
  * until after the wrapper function returns.
@@ -601,7 +597,7 @@ throw_exception (JNIEnv *env, const char *msg)
 {
   jclass cl;
   cl = (*env)->FindClass (env,
-                          \"com/redhat/et/libguestfs/LibGuestFSException\");
+                          "com/redhat/et/libguestfs/LibGuestFSException");
   (*env)->ThrowNew (env, cl, msg);
 }
 
@@ -613,10 +609,10 @@ throw_out_of_memory (JNIEnv *env, const char *msg)
 {
   jclass cl;
   cl = (*env)->FindClass (env,
-                          \"com/redhat/et/libguestfs/LibGuestFSOutOfMemory\");
+                          "com/redhat/et/libguestfs/LibGuestFSOutOfMemory");
   (*env)->ThrowNew (env, cl, msg);
 }
-";
+|};
 
   List.iter (
     fun { name; style = (ret, args, optargs as style);
diff --git a/generator/lua.ml b/generator/lua.ml
index 685645abf..6f55cd132 100644
--- a/generator/lua.ml
+++ b/generator/lua.ml
@@ -36,8 +36,7 @@ let generate_header = generate_header ~inputs:["generator/lua.ml"]
 let generate_lua_c () =
   generate_header CStyle LGPLv2plus;
 
-  pr "\
-#include <config.h>
+  pr {|#include <config.h>
 
 /* It is safe to call deprecated functions from this file. */
 #define GUESTFS_NO_WARN_DEPRECATED
@@ -67,12 +66,12 @@ let generate_lua_c () =
 #endif
 #endif
 
-#include \"ignore-value.h\"
+#include "ignore-value.h"
 
 #include <guestfs.h>
-#include \"guestfs-utils.h\"
+#include "guestfs-utils.h"
 
-#define GUESTFS_LUA_HANDLE \"guestfs handle\"
+#define GUESTFS_LUA_HANDLE "guestfs handle"
 
 /* This struct is managed on the Lua heap.  If the GC collects it,
  * the Lua '__gc' function is called which ends up calling
@@ -114,7 +113,7 @@ static uint64_t get_event (lua_State *L, int index);
 static uint64_t get_event_bitmask (lua_State *L, int index);
 static void push_event (lua_State *L, uint64_t event);
 
-";
+|};
 
   List.iter (
     function
@@ -125,20 +124,19 @@ static void push_event (lua_State *L, uint64_t event);
       pr "static void push_%s_list (lua_State *L, struct guestfs_%s_list *v);\n" typ typ
   ) (rstructs_used_by (actions |> external_functions));
 
-  pr "\
-
+  pr {|
 /* On the stack at 'index' should be a table.  Check if 'name' (string)
  * is a key in this table, and if so execute 'code'.  While 'code' is
  * executing, the top of stack (ie. index == -1) is the value of 'name'.
  */
-#define OPTARG_IF_SET(index, name, code) \\
-  do {                                   \\
-    lua_pushliteral (L, name);           \\
-    lua_gettable (L, index);             \\
-    if (!lua_isnil (L, -1)) {            \\
-      code                               \\
-    }                                    \\
-    lua_pop (L, 1);                      \\
+#define OPTARG_IF_SET(index, name, code) \
+  do {                                   \
+    lua_pushliteral (L, name);           \
+    lua_gettable (L, index);             \
+    if (!lua_isnil (L, -1)) {            \
+      code                               \
+    }                                    \
+    lua_pop (L, 1);                      \
   } while (0)
 
 /* Create a new connection. */
@@ -151,21 +149,21 @@ guestfs_int_lua_create (lua_State *L)
   char err[256];
 
   if (lua_gettop (L) == 1) {
-    OPTARG_IF_SET (1, \"environment\",
+    OPTARG_IF_SET (1, "environment",
         if (! lua_toboolean (L, -1))
             flags |= GUESTFS_CREATE_NO_ENVIRONMENT;
     );
-    OPTARG_IF_SET (1, \"close_on_exit\",
+    OPTARG_IF_SET (1, "close_on_exit",
         if (! lua_toboolean (L, -1))
             flags |= GUESTFS_CREATE_NO_CLOSE_ON_EXIT;
     );
   }
   else if (lua_gettop (L) > 1)
-    return luaL_error (L, \"Guestfs.create: too many arguments\");
+    return luaL_error (L, "Guestfs.create: too many arguments");
 
   g = guestfs_create_flags (flags);
   if (!g)
-    return luaL_error (L, \"Guestfs.create: cannot create handle: %%s\",
+    return luaL_error (L, "Guestfs.create: cannot create handle: %%s",
                        guestfs_int_strerror (errno, err, sizeof err));
 
   guestfs_set_error_handler (g, NULL, NULL);
@@ -235,15 +233,15 @@ error__tostring (lua_State *L)
   const char *msg;
   char err[256];
 
-  lua_pushliteral (L, \"code\");
+  lua_pushliteral (L, "code");
   lua_gettable (L, 1);
   code = luaL_checkint (L, -1);
-  lua_pushliteral (L, \"msg\");
+  lua_pushliteral (L, "msg");
   lua_gettable (L, 1);
   msg = luaL_checkstring (L, -1);
 
   if (code)
-    lua_pushfstring (L, \"%%s: %%s\", msg,
+    lua_pushfstring (L, "%%s: %%s", msg,
                      guestfs_int_strerror (code, err, sizeof err));
   else
     lua_pushstring (L, msg);
@@ -259,15 +257,15 @@ last_error (lua_State *L, guestfs_h *g)
    * and 'code' fields.
    */
   lua_newtable (L);
-  lua_pushliteral (L, \"msg\");
+  lua_pushliteral (L, "msg");
   lua_pushstring (L, guestfs_last_error (g));
   lua_settable (L, -3);
-  lua_pushliteral (L, \"code\");
+  lua_pushliteral (L, "code");
   lua_pushinteger (L, guestfs_last_errno (g));
   lua_settable (L, -3);
 
   lua_newtable (L);
-  lua_pushliteral (L, \"__tostring\");
+  lua_pushliteral (L, "__tostring");
   lua_pushcfunction (L, error__tostring);
   lua_settable (L, -3);
 
@@ -299,7 +297,7 @@ get_per_handle_table (lua_State *L, guestfs_h *g)
   }
 }
 
-/* Free the per-handle Lua table.  It doesn't literally \"free\"
+/* Free the per-handle Lua table.  It doesn't literally "free"
  * anything since the GC will do that.  It just removes the entry
  * from the global registry.
  */
@@ -324,8 +322,8 @@ guestfs_int_lua_set_event_callback (lua_State *L)
   struct event_state *es;
 
   if (g == NULL)
-    return luaL_error (L, \"Guestfs.%%s: handle is closed\",
-                       \"set_event_callback\");
+    return luaL_error (L, "Guestfs.%%s: handle is closed",
+                       "set_event_callback");
 
   event_bitmask = get_event_bitmask (L, 3);
 
@@ -340,7 +338,7 @@ guestfs_int_lua_set_event_callback (lua_State *L)
 
   es = malloc (sizeof *es);
   if (!es)
-    return luaL_error (L, \"failed to allocate event_state\");
+    return luaL_error (L, "failed to allocate event_state");
   es->next = u->es;
   es->L = L;
   es->u = u;
@@ -375,7 +373,7 @@ event_callback_wrapper (guestfs_h *g,
   lua_rawgeti (L, -1, es->ref);
 
   if (!lua_isfunction (L, -1)) {
-    fprintf (stderr, \"lua-guestfs: %%s: internal error: no closure found for g = %%p, eh = %%d\\n\",
+    fprintf (stderr, "lua-guestfs: %%s: internal error: no closure found for g = %%p, eh = %%d\n",
              __func__, g, eh);
     goto out;
   }
@@ -395,21 +393,21 @@ event_callback_wrapper (guestfs_h *g,
   case 0: /* call ok - do nothing */
     break;
   case LUA_ERRRUN:
-    fprintf (stderr, \"lua-guestfs: %%s: unexpected error in event handler: \",
+    fprintf (stderr, "lua-guestfs: %%s: unexpected error in event handler: ",
              __func__);
     print_any (L, -1, stderr);
     lua_pop (L, 1);
-    fprintf (stderr, \"\\n\");
+    fprintf (stderr, "\n");
     break;
   case LUA_ERRERR: /* can probably never happen */
-    fprintf (stderr, \"lua-guestfs: %%s: error calling error handler\\n\",
+    fprintf (stderr, "lua-guestfs: %%s: error calling error handler\n",
              __func__);
     break;
   case LUA_ERRMEM:
-    fprintf (stderr, \"lua-guestfs: %%s: memory allocation failed\\n\", __func__);
+    fprintf (stderr, "lua-guestfs: %%s: memory allocation failed\n", __func__);
     break;
   default:
-    fprintf (stderr, \"lua-guestfs: %%s: unknown error\\n\", __func__);
+    fprintf (stderr, "lua-guestfs: %%s: unknown error\n", __func__);
   }
 
   /* Pop the per-handle table. */
@@ -426,8 +424,8 @@ guestfs_int_lua_delete_event_callback (lua_State *L)
   int eh;
 
   if (g == NULL)
-    return luaL_error (L, \"Guestfs.%%s: handle is closed\",
-                       \"delete_event_callback\");
+    return luaL_error (L, "Guestfs.%%s: handle is closed",
+                       "delete_event_callback");
 
   eh = luaL_checkint (L, 2);
 
@@ -436,7 +434,7 @@ guestfs_int_lua_delete_event_callback (lua_State *L)
   return 0;
 }
 
-";
+|};
 
   (* Actions. *)
   List.iter (
@@ -632,8 +630,7 @@ guestfs_int_lua_delete_event_callback (lua_State *L)
       pr "\n"
   ) (actions |> external_functions |> sort);
 
-  pr "\
-static struct userdata *
+  pr {|static struct userdata *
 get_handle (lua_State *L, int index)
 {
   struct userdata *u;
@@ -653,7 +650,7 @@ get_string_list (lua_State *L, int index)
 
   strs = malloc ((len+1) * sizeof (char *));
   if (strs == NULL) {
-    luaL_error (L, \"get_string_list: malloc failed: %%s\",
+    luaL_error (L, "get_string_list: malloc failed: %%s",
                 guestfs_int_strerror (errno, err, sizeof err));
     /*NOTREACHED*/
     return NULL;
@@ -707,15 +704,15 @@ get_int64 (lua_State *L, int index)
   switch (lua_type (L, index)) {
   case LUA_TSTRING:
     s = luaL_checkstring (L, index);
-    if (sscanf (s, \"%%\" SCNi64, &r) != 1)
-      return luaL_error (L, \"int64 parameter expected\");
+    if (sscanf (s, "%%" SCNi64, &r) != 1)
+      return luaL_error (L, "int64 parameter expected");
     return r;
 
   case LUA_TNUMBER:
     return luaL_checkint (L, index);
 
   default:
-    return luaL_error (L, \"expecting 64 bit integer\");
+    return luaL_error (L, "expecting 64 bit integer");
   }
 }
 
@@ -724,7 +721,7 @@ push_int64 (lua_State *L, int64_t i64)
 {
   char s[64];
 
-  snprintf (s, sizeof s, \"%%\" PRIi64, i64);
+  snprintf (s, sizeof s, "%%" PRIi64, i64);
   lua_pushstring (L, s);
 }
 
@@ -746,14 +743,14 @@ push_int64_array (lua_State *L, const int64_t *array, size_t len)
 static void
 print_any (lua_State *L, int index, FILE *out)
 {
-  lua_getglobal(L, \"tostring\");
+  lua_getglobal(L, "tostring");
   lua_pushvalue (L, index >= 0 ? index : index-1);
   lua_call (L, 1, 1);
-  fprintf (out, \"%%s\", luaL_checkstring (L, -1));
+  fprintf (out, "%%s", luaL_checkstring (L, -1));
   lua_pop (L, 1);
 }
 
-";
+|};
 
   (* Code to handle events. *)
   pr "\
@@ -764,7 +761,7 @@ static const char *event_all[] = {
     fun (event, _) -> pr "  \"%s\",\n" event
   ) events;
 
-  pr "  NULL
+  pr {|  NULL
 };
 
 static uint64_t
@@ -797,7 +794,7 @@ get_event (lua_State *L, int index)
 static void
 push_event (lua_State *L, uint64_t event)
 {
-";
+|};
 
   List.iter (
     fun (event, i) ->
@@ -869,35 +866,33 @@ push_event (lua_State *L, uint64_t event)
       generate_push_struct_list typ
   ) (rstructs_used_by (actions |> external_functions));
 
-  pr "\
-/* Metamethods.
+  pr {|/* Metamethods.
  * See: http://article.gmane.org/gmane.comp.lang.lua.general/95065
  */
 static luaL_Reg metamethods[] = {
-  { \"__gc\", guestfs_int_lua_finalizer },
+  { "__gc", guestfs_int_lua_finalizer },
   { NULL, NULL }
 };
 
 /* Module functions. */
 static luaL_Reg functions[] = {
-  { \"create\", guestfs_int_lua_create },
+  { "create", guestfs_int_lua_create },
   { NULL, NULL }
 };
 
 /* Methods. */
 static luaL_Reg methods[] = {
-  { \"close\", guestfs_int_lua_close },
-  { \"set_event_callback\", guestfs_int_lua_set_event_callback },
-  { \"delete_event_callback\", guestfs_int_lua_delete_event_callback },
+  { "close", guestfs_int_lua_close },
+  { "set_event_callback", guestfs_int_lua_set_event_callback },
+  { "delete_event_callback", guestfs_int_lua_delete_event_callback },
 
-";
+|};
 
   List.iter (
     fun { name } -> pr "  { \"%s\", guestfs_int_lua_%s },\n" name name
   ) (actions |> external_functions |> sort);
 
-  pr "\
-
+  pr {|
   { NULL, NULL }
 };
 
@@ -910,7 +905,7 @@ make_version_string (char *version, size_t size)
   g = guestfs_create ();
   v = guestfs_version (g);
   snprintf (version, size,
-            \"libguestfs %%\" PRIi64 \".%%\" PRIi64 \".%%\" PRIi64 \"%%s\",
+            "libguestfs %%" PRIi64 ".%%" PRIi64 ".%%" PRIi64 "%%s",
             v->major, v->minor, v->release, v->extra);
   free (v);
   guestfs_close (g);
@@ -940,7 +935,7 @@ luaopen_guestfs (lua_State *L)
 #endif
 
   /* Set __index field of metatable to point to methods table. */
-  lua_setfield (L, -2, \"__index\");
+  lua_setfield (L, -2, "__index");
 
   /* Pop metatable, it is no longer needed. */
   lua_pop (L, 1);
@@ -954,28 +949,28 @@ luaopen_guestfs (lua_State *L)
 #endif
 
   /* Globals in the module namespace. */
-  lua_pushliteral (L, \"event_all\");
+  lua_pushliteral (L, "event_all");
   push_string_list (L, (char **) event_all);
   lua_settable (L, -3);
 
   /* Add _COPYRIGHT, etc. fields to the module namespace. */
-  lua_pushliteral (L, \"_COPYRIGHT\");
-  lua_pushliteral (L, \"Copyright (C) %s Red Hat Inc.\");
+  lua_pushliteral (L, "_COPYRIGHT");
+  lua_pushliteral (L, "Copyright (C) %s Red Hat Inc.");
   lua_settable (L, -3);
 
-  lua_pushliteral (L, \"_DESCRIPTION\");
-  lua_pushliteral (L, \"Lua binding to libguestfs\");
+  lua_pushliteral (L, "_DESCRIPTION");
+  lua_pushliteral (L, "Lua binding to libguestfs");
   lua_settable (L, -3);
 
-  lua_pushliteral (L, \"_VERSION\");
+  lua_pushliteral (L, "_VERSION");
   make_version_string (v, sizeof v);
   lua_pushlstring (L, v, strlen (v));
   lua_settable (L, -3);
 
   /* Return module table, so users choose their own name for the module:
-   * local G = require \"guestfs\"
+   * local G = require "guestfs"
    * g = G.create ()
    */
   return 1;
 }
-" copyright_years;
+|} copyright_years;
diff --git a/generator/perl.ml b/generator/perl.ml
index 17ed64d29..11421733e 100644
--- a/generator/perl.ml
+++ b/generator/perl.ml
@@ -37,8 +37,7 @@ let generate_header = generate_header ~inputs:["generator/perl.ml"]
 let rec generate_perl_xs () =
   generate_header CStyle LGPLv2plus;
 
-  pr "\
-#include <config.h>
+  pr {|#include <config.h>
 
 /* It is safe to call deprecated functions from this file. */
 #define GUESTFS_NO_WARN_DEPRECATED
@@ -50,9 +49,9 @@ let rec generate_perl_xs () =
 #include <inttypes.h>
 #include <errno.h>
 
-#include \"EXTERN.h\"
-#include \"perl.h\"
-#include \"XSUB.h\"
+#include "EXTERN.h"
+#include "perl.h"
+#include "XSUB.h"
 
 /* perl CORE/config.h defines '_' to something completely bonkers. */
 #ifdef _
@@ -60,7 +59,7 @@ let rec generate_perl_xs () =
 #endif
 
 #include <guestfs.h>
-#include \"guestfs-internal-all.h\"
+#include "guestfs-internal-all.h"
 
 static SV *
 my_newSVll(long long val) {
@@ -69,7 +68,7 @@ my_newSVll(long long val) {
 #else
   char buf[100];
   int len;
-  len = snprintf(buf, 100, \"%%\" PRId64, val);
+  len = snprintf(buf, 100, "%%" PRId64, val);
   return newSVpv(buf, len);
 #endif
 }
@@ -81,7 +80,7 @@ my_newSVull(unsigned long long val) {
 #else
   char buf[100];
   int len;
-  len = snprintf(buf, 100, \"%%\" PRIu64, val);
+  len = snprintf(buf, 100, "%%" PRIu64, val);
   return newSVpv(buf, len);
 #endif
 }
@@ -100,7 +99,7 @@ my_SvIV64 (SV *sv)
     const char *str = SvPV_nolen (sv);
     int64_t r;
 
-    sscanf (str, \"%%\" SCNi64, &r);
+    sscanf (str, "%%" SCNi64, &r);
     return r;
   }
   else
@@ -116,19 +115,19 @@ XS_unpack_charPtrPtr (SV *arg) {
   I32 i;
 
   if (!arg || !SvOK (arg) || !SvROK (arg) || SvTYPE (SvRV (arg)) != SVt_PVAV)
-    croak (\"array reference expected\");
+    croak ("array reference expected");
 
   av = (AV *)SvRV (arg);
   ret = malloc ((av_len (av) + 1 + 1) * sizeof (char *));
   if (!ret)
-    croak (\"malloc failed\");
+    croak ("malloc failed");
 
   for (i = 0; i <= av_len (av); i++) {
     SV **elem = av_fetch (av, i, 0);
 
     if (!elem || !*elem) {
       free (ret);
-      croak (\"missing element in list\");
+      croak ("missing element in list");
     }
 
     ret[i] = SvPV_nolen (*elem);
@@ -155,7 +154,7 @@ _event_callback_wrapper (guestfs_h *g,
   PUSHMARK (SP);
   XPUSHs (sv_2mortal (my_newSVull (event)));
   XPUSHs (sv_2mortal (newSViv (event_handle)));
-  XPUSHs (sv_2mortal (newSVpvn (buf ? buf : \"\", buf_len)));
+  XPUSHs (sv_2mortal (newSVpvn (buf ? buf : "", buf_len)));
   AV *av = newAV ();
   size_t i;
   for (i = 0; i < array_len; ++i)
@@ -179,19 +178,19 @@ get_all_event_callbacks (guestfs_h *g, size_t *len_rtn)
   *len_rtn = 0;
   cb = guestfs_first_private (g, &key);
   while (cb != NULL) {
-    if (strncmp (key, \"_perl_event_\", strlen (\"_perl_event_\")) == 0)
+    if (strncmp (key, "_perl_event_", strlen ("_perl_event_")) == 0)
       (*len_rtn)++;
     cb = guestfs_next_private (g, &key);
   }
 
   /* Copy them into the return array. */
   r = malloc (sizeof (SV *) * (*len_rtn));
-  if (r == NULL) croak (\"malloc: %%m\");
+  if (r == NULL) croak ("malloc: %%m");
 
   i = 0;
   cb = guestfs_first_private (g, &key);
   while (cb != NULL) {
-    if (strncmp (key, \"_perl_event_\", strlen (\"_perl_event_\")) == 0) {
+    if (strncmp (key, "_perl_event_", strlen ("_perl_event_")) == 0) {
       r[i] = cb;
       i++;
     }
@@ -232,7 +231,7 @@ _create (flags)
    CODE:
       RETVAL = guestfs_create_flags (flags);
       if (!RETVAL)
-        croak (\"could not create guestfs handle\");
+        croak ("could not create guestfs handle");
       guestfs_set_error_handler (RETVAL, NULL, NULL);
  OUTPUT:
       RETVAL
@@ -247,7 +246,7 @@ DESTROY (sv)
        * display an error.
        */
       HV *hv = (HV *) SvRV (sv);
-      SV **svp = hv_fetch (hv, \"_g\", 2, 0);
+      SV **svp = hv_fetch (hv, "_g", 2, 0);
       if (svp != NULL) {
         guestfs_h *g = INT2PTR (guestfs_h *, SvIV (*svp));
         _close_handle (g);
@@ -260,7 +259,7 @@ close (g)
       _close_handle (g);
       /* Avoid double-free in DESTROY method. */
       HV *hv = (HV *) SvRV (ST(0));
-      (void) hv_delete (hv, \"_g\", 2, G_DISCARD);
+      (void) hv_delete (hv, "_g", 2, G_DISCARD);
 
 SV *
 set_event_callback (g, cb, event_bitmask)
@@ -274,7 +273,7 @@ PREINIT:
       eh = guestfs_set_event_callback (g, _event_callback_wrapper,
                                        event_bitmask, 0, cb);
       if (eh == -1)
-        croak (\"%%s\", guestfs_last_error (g));
+        croak ("%%s", guestfs_last_error (g));
 
       /* Increase the refcount for this callback, since we are storing
        * it in the opaque C libguestfs handle.  We need to remember that
@@ -283,7 +282,7 @@ PREINIT:
        */
       SvREFCNT_inc (cb);
 
-      snprintf (key, sizeof key, \"_perl_event_%%d\", eh);
+      snprintf (key, sizeof key, "_perl_event_%%d", eh);
       guestfs_set_private (g, key, cb);
 
       RETVAL = newSViv (eh);
@@ -298,7 +297,7 @@ PREINIT:
       char key[64];
       SV *cb;
    CODE:
-      snprintf (key, sizeof key, \"_perl_event_%%d\", event_handle);
+      snprintf (key, sizeof key, "_perl_event_%%d", event_handle);
       cb = guestfs_get_private (g, key);
       if (cb) {
         SvREFCNT_dec (cb);
@@ -314,7 +313,7 @@ PREINIT:
    CODE:
       str = guestfs_event_to_string (event_bitmask);
       if (str == NULL)
-        croak (\"%%m\");
+        croak ("%%m");
       RETVAL = newSVpv (str, 0);
       free (str);
  OUTPUT:
@@ -331,7 +330,7 @@ PREINIT:
  OUTPUT:
       RETVAL
 
-";
+|};
 
   List.iter (
     fun { name; style = (ret, args, optargs as style);
@@ -676,8 +675,7 @@ and generate_perl_struct_code typ cols name style =
 and generate_perl_pm () =
   generate_header HashStyle LGPLv2plus;
 
-  pr "\
-=encoding utf8
+  pr {|=encoding utf8
 
 =pod
 
@@ -747,11 +745,10 @@ $VERSION = '1.0';
 require XSLoader;
 XSLoader::load ('Sys::Guestfs');
 
-";
+|};
 
   (* Methods. *)
-  pr "\
-=item $g = Sys::Guestfs->new ([environment => 0,] [close_on_exit => 0]);
+  pr {|=item $g = Sys::Guestfs->new ([environment => 0,] [close_on_exit => 0]);
 
 Create a new guestfs handle.
 
@@ -798,7 +795,7 @@ C<close> the program must not call any method (including C<close>)
 on the handle (but the implicit call to C<DESTROY> that happens
 when the final reference is cleaned up is OK).
 
-";
+|};
 
   List.iter (
     fun (name, bitmask) ->
@@ -822,8 +819,7 @@ when the final reference is cleaned up is OK).
   pr "our $EVENT_ALL = 0x%x;\n" all_events_bitmask;
   pr "\n";
 
-  pr "\
-=item $event_handle = $g->set_event_callback (\\&cb, $event_bitmask);
+  pr {|=item $event_handle = $g->set_event_callback (\&cb, $event_bitmask);
 
 Register C<cb> as a callback function for all of the events
 in C<$event_bitmask> (one or more C<$Sys::Guestfs::EVENT_*> flags
@@ -888,14 +884,14 @@ You can use the standard Perl module L<Errno(3)> to compare
 the numeric error returned from this call with symbolic
 errnos:
 
- $g->mkdir (\"/foo\");
+ $g->mkdir ("/foo");
  if ($g->last_errno() == Errno::EEXIST()) {
    # mkdir failed because the directory exists already.
  }
 
 =cut
 
-";
+|};
 
   (* Actions.  We only need to print documentation for these as
    * they are pulled in from the XS code automatically.
@@ -942,8 +938,7 @@ C<$g-E<gt>feature-available>.\n\n" opt
   pr "=cut\n\n";
 
   (* End of file. *)
-  pr "\
-1;
+  pr {|1;
 
 =back
 
@@ -960,15 +955,15 @@ class, use the ordinary Perl UNIVERSAL method C<can(METHOD)>
 (see L<perlobj(1)>).  For example:
 
  use Sys::Guestfs;
- if (defined (Sys::Guestfs->can (\"set_verbose\"))) {
-   print \"\\$g->set_verbose is available\\n\";
+ if (defined (Sys::Guestfs->can ("set_verbose"))) {
+   print "\$g->set_verbose is available\n";
  }
 
 To test if particular features are supported by the current
 build, use the L</feature_available> method like the example below.  Note
 that the appliance must be launched first.
 
- $g->feature_available ( [\"augeas\"] );
+ $g->feature_available ( ["augeas"] );
 
 For further discussion on this topic, refer to
 L<guestfs(3)/AVAILABILITY>.
@@ -1007,7 +1002,7 @@ L<guestfish(1)>,
 L<http://libguestfs.org>.
 
 =cut
-" copyright_years
+|} copyright_years
 
 and generate_perl_prototype name (ret, args, optargs) =
   (match ret with
diff --git a/generator/php.ml b/generator/php.ml
index 2b336f96f..b43b3010b 100644
--- a/generator/php.ml
+++ b/generator/php.ml
@@ -35,42 +35,39 @@ let generate_header = generate_header ~inputs:["generator/php.ml"]
 let rec generate_php_h () =
   generate_header CStyle LGPLv2plus;
 
-  pr "\
-#ifndef PHP_GUESTFS_PHP_H
+  pr {|#ifndef PHP_GUESTFS_PHP_H
 #define PHP_GUESTFS_PHP_H 1
 
 #ifdef ZTS
-#include \"TSRM.h\"
+#include "TSRM.h"
 #endif
 
-#define PHP_GUESTFS_PHP_EXTNAME \"guestfs_php\"
-#define PHP_GUESTFS_PHP_VERSION \"1.0\"
+#define PHP_GUESTFS_PHP_EXTNAME "guestfs_php"
+#define PHP_GUESTFS_PHP_VERSION "1.0"
 
 PHP_MINIT_FUNCTION (guestfs_php);
 
-#define PHP_GUESTFS_HANDLE_RES_NAME \"guestfs_h\"
+#define PHP_GUESTFS_HANDLE_RES_NAME "guestfs_h"
 
 PHP_FUNCTION (guestfs_create);
 PHP_FUNCTION (guestfs_last_error);
-";
+|};
 
   List.iter (
     fun { name } -> pr "PHP_FUNCTION (guestfs_%s);\n" name
   ) (actions |> external_functions |> sort);
 
-  pr "\
-
+  pr {|
 extern zend_module_entry guestfs_php_module_entry;
 #define phpext_guestfs_php_ptr &guestfs_php_module_entry
 
 #endif /* PHP_GUESTFS_PHP_H */
-"
+|}
 
 and generate_php_c () =
   generate_header CStyle LGPLv2plus;
 
-  pr "\
-/* NOTE: Be very careful with all macros in PHP header files.  The
+  pr {|/* NOTE: Be very careful with all macros in PHP header files.  The
  * morons who wrote them aren't good at making them safe for inclusion
  * in arbitrary places in C code, eg. not using 'do ... while(0)'
  * or parenthesizing any of the arguments.
@@ -93,8 +90,8 @@ and generate_php_c () =
 #include <php.h>
 #include <php_guestfs_php.h>
 
-#include \"guestfs.h\"
-#include \"guestfs-utils.h\" /* Only for POINTER_NOT_IMPLEMENTED */
+#include "guestfs.h"
+#include "guestfs-utils.h" /* Only for POINTER_NOT_IMPLEMENTED */
 
 static int res_guestfs_h;
 
@@ -105,27 +102,27 @@ static int res_guestfs_h;
 #endif
 
 #if ZEND_MODULE_API_NO >= 20151012
-# define GUESTFS_RETURN_STRING(x, duplicate) \\
+# define GUESTFS_RETURN_STRING(x, duplicate) \
     do { if (duplicate) { RETURN_STRING(x); } else { RETVAL_STRING(x); efree ((char *)x); return; } } while (0)
-# define guestfs_add_assoc_string(arg, key, str, dup) \\
+# define guestfs_add_assoc_string(arg, key, str, dup) \
     add_assoc_string(arg, key, str)
-# define guestfs_add_assoc_stringl(arg, key, str, len, dup) \\
+# define guestfs_add_assoc_stringl(arg, key, str, len, dup) \
     add_assoc_stringl(arg, key, str, len)
-# define guestfs_add_next_index_string(retval, val, x) \\
+# define guestfs_add_next_index_string(retval, val, x) \
     add_next_index_string (retval, val)
-# define GUESTFS_ZEND_FETCH_RESOURCE(rsrc, rsrc_type, passed_id, resource_type_name, resource_type) \\
+# define GUESTFS_ZEND_FETCH_RESOURCE(rsrc, rsrc_type, passed_id, resource_type_name, resource_type) \
     (rsrc) = (rsrc_type) zend_fetch_resource (Z_RES_P(passed_id), resource_type_name, resource_type)
 typedef size_t guestfs_string_length;
 #else
-# define GUESTFS_RETURN_STRING(x, duplicate) \\
+# define GUESTFS_RETURN_STRING(x, duplicate) \
     RETURN_STRING(x, duplicate)
-# define guestfs_add_assoc_string(arg, key, str, dup) \\
+# define guestfs_add_assoc_string(arg, key, str, dup) \
     add_assoc_string(arg, key, str, dup)
-# define guestfs_add_assoc_stringl(arg, key, str, len, dup) \\
+# define guestfs_add_assoc_stringl(arg, key, str, len, dup) \
     add_assoc_stringl(arg, key, str, len, dup)
-# define guestfs_add_next_index_string(retval, val, x) \\
+# define guestfs_add_next_index_string(retval, val, x) \
     add_next_index_string (retval, val, x)
-# define GUESTFS_ZEND_FETCH_RESOURCE(rsrc, rsrc_type, passed_id, resource_type_name, resource_type) \\
+# define GUESTFS_ZEND_FETCH_RESOURCE(rsrc, rsrc_type, passed_id, resource_type_name, resource_type) \
   ZEND_FETCH_RESOURCE(rsrc, rsrc_type, &(passed_id), -1, resource_type_name, resource_type)
 typedef int guestfs_string_length;
 #endif
@@ -138,7 +135,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_last_error, 0, 0, 1)
   ZEND_ARG_INFO(0, g)
 ZEND_END_ARG_INFO()
 
-";
+|};
   List.iter (
     fun { name = shortname; style = ret, args, optargs; } ->
       let len = List.length args in
@@ -159,7 +156,7 @@ ZEND_END_ARG_INFO()
       pr "ZEND_END_ARG_INFO()\n\n";
   ) (actions |> external_functions |> sort);
 
-  pr "
+  pr {|
 
 /* Convert array to list of strings.
  * http://marc.info/?l=pecl-dev&m=112205192100631&w=2
@@ -237,13 +234,13 @@ PHP_MINIT_FUNCTION (guestfs_php)
 static zend_function_entry guestfs_php_functions[] = {
   PHP_FE (guestfs_create, arginfo_create)
   PHP_FE (guestfs_last_error, arginfo_last_error)
-";
+|};
 
   List.iter (
     fun { name } -> pr "  PHP_FE (guestfs_%s, arginfo_%s)\n" name name
   ) (actions |> external_functions |> sort);
 
-  pr "  { NULL, NULL, NULL }
+  pr {|  { NULL, NULL, NULL }
 };
 
 zend_module_entry guestfs_php_module_entry = {
@@ -288,7 +285,7 @@ PHP_FUNCTION (guestfs_last_error)
   zval *z_g;
   guestfs_h *g;
 
-  if (zend_parse_parameters (ZEND_NUM_ARGS() TSRMLS_CC, \"r\",
+  if (zend_parse_parameters (ZEND_NUM_ARGS() TSRMLS_CC, "r",
                              &z_g) == FAILURE) {
     RETURN_FALSE;
   }
@@ -307,7 +304,7 @@ PHP_FUNCTION (guestfs_last_error)
   }
 }
 
-";
+|};
 
   (* Now generate the PHP bindings for each action. *)
   List.iter (
diff --git a/generator/prepopts.ml b/generator/prepopts.ml
index c769b7928..38c58c185 100644
--- a/generator/prepopts.ml
+++ b/generator/prepopts.ml
@@ -36,36 +36,36 @@ The default size can be changed by supplying an optional parameter.");
    "create a partitioned disk",
    [ "size", "1G", "the size of the disk image";
      "partition", "mbr", "partition table type" ],
-   "Create a disk with a single partition.  By default the size of the disk
+   {|Create a disk with a single partition.  By default the size of the disk
 is 1G (the available space in the partition will be a tiny bit smaller)
 and the partition table will be MBR (old DOS-style).
 
-These defaults can be changed by supplying optional parameters.");
+These defaults can be changed by supplying optional parameters.|});
 
   ("fs",
    "create a filesystem",
    [ "filesystem", "ext2", "the type of filesystem to use";
      "size", "1G", "the size of the disk image";
      "partition", "mbr", "partition table type" ],
-   "Create a disk with a single partition, with the partition containing
+   {|Create a disk with a single partition, with the partition containing
 an empty filesystem.  This defaults to creating a 1G disk (the available
 space in the filesystem will be a tiny bit smaller) with an MBR (old
 DOS-style) partition table and an ext2 filesystem.
 
-These defaults can be changed by supplying optional parameters.");
+These defaults can be changed by supplying optional parameters.|});
 
   ("lv",
    "create a disk with logical volume",
    [ "name", "/dev/VG/LV", "the name of the VG and LV to use";
      "size", "1G", "the size of the disk image";
      "partition", "mbr", "partition table type" ],
-   "Create a disk with a single partition, set up the partition as an
+   {|Create a disk with a single partition, set up the partition as an
 LVM2 physical volume, and place a volume group and logical volume
 on there.  This defaults to creating a 1G disk with the VG and
 LV called C</dev/VG/LV>.  You can change the name of the VG and LV
 by supplying an alternate name as the first optional parameter.
 
-Note this does not create a filesystem.  Use 'lvfs' to do that.");
+Note this does not create a filesystem.  Use 'lvfs' to do that.|});
 
   ("lvfs",
    "create a disk with logical volume and filesystem",
@@ -73,11 +73,11 @@ Note this does not create a filesystem.  Use 'lvfs' to do that.");
      "filesystem", "ext2", "the type of filesystem to use";
      "size", "1G", "the size of the disk image";
      "partition", "mbr", "partition table type" ],
-   "Create a disk with a single partition, set up the partition as an
+   {|Create a disk with a single partition, set up the partition as an
 LVM2 physical volume, and place a volume group and logical volume
 on there.  Then format the LV with a filesystem.  This defaults to
 creating a 1G disk with the VG and LV called C</dev/VG/LV>, with an
-ext2 filesystem.");
+ext2 filesystem.|});
 
   ("bootroot",
    "create a boot and root filesystem",
diff --git a/generator/python.ml b/generator/python.ml
index 86b70b2de..d712e21af 100644
--- a/generator/python.ml
+++ b/generator/python.ml
@@ -37,17 +37,16 @@ let generate_header = generate_header ~inputs:["generator/python.ml"]
 let rec generate_python_actions_h () =
   generate_header CStyle LGPLv2plus;
 
-  pr "\
-#ifndef GUESTFS_PYTHON_ACTIONS_H_
+  pr {|#ifndef GUESTFS_PYTHON_ACTIONS_H_
 #define GUESTFS_PYTHON_ACTIONS_H_
 
-#include \"guestfs.h\"
-#include \"guestfs-stringlists-utils.h\"
+#include "guestfs.h"
+#include "guestfs-stringlists-utils.h"
 
 #define PY_SSIZE_T_CLEAN 1
 
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored \"-Wcast-align\"
+#pragma GCC diagnostic ignored "-Wcast-align"
 #include <Python.h>
 #pragma GCC diagnostic pop
 
@@ -56,14 +55,14 @@ get_handle (PyObject *obj)
 {
   assert (obj);
   assert (obj != Py_None);
-  return (guestfs_h*) PyCapsule_GetPointer(obj, \"guestfs_h\");
+  return (guestfs_h*) PyCapsule_GetPointer(obj, "guestfs_h");
 }
 
 static inline PyObject *
 put_handle (guestfs_h *g)
 {
   assert (g);
-  return PyCapsule_New ((void *) g, \"guestfs_h\", NULL);
+  return PyCapsule_New ((void *) g, "guestfs_h", NULL);
 }
 
 extern void guestfs_int_py_extend_module (PyObject *module);
@@ -80,7 +79,7 @@ extern PyObject *guestfs_int_py_fromstring (const char *str);
 extern PyObject *guestfs_int_py_fromstringsize (const char *str, size_t size);
 extern char *guestfs_int_py_asstring (PyObject *obj);
 
-";
+|};
 
   let emit_put_list_decl typ =
     pr "#ifdef GUESTFS_HAVE_STRUCT_%s\n" (String.uppercase_ascii typ);
@@ -118,16 +117,15 @@ extern char *guestfs_int_py_asstring (PyObject *obj);
 and generate_python_structs () =
   generate_header CStyle LGPLv2plus;
 
-  pr "\
-#include <config.h>
+  pr {|#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
 
-#include \"actions.h\"
+#include "actions.h"
 
-";
+|};
 
   let emit_put_list_function typ =
     pr "#ifdef GUESTFS_HAVE_STRUCT_%s\n" (String.uppercase_ascii typ);
@@ -254,8 +252,7 @@ and generate_python_structs () =
 and generate_python_actions actions () =
   generate_header CStyle LGPLv2plus;
 
-  pr "\
-#include <config.h>
+  pr {|#include <config.h>
 
 /* It is safe to call deprecated functions from this file. */
 #define GUESTFS_NO_WARN_DEPRECATED
@@ -265,9 +262,9 @@ and generate_python_actions actions () =
 #include <stdlib.h>
 #include <assert.h>
 
-#include \"actions.h\"
+#include "actions.h"
 
-";
+|};
 
   List.iter (
     fun { name; style = (ret, args, optargs as style);
@@ -526,16 +523,15 @@ and generate_python_actions actions () =
 and generate_python_module () =
   generate_header CStyle LGPLv2plus;
 
-  pr "\
-#include <config.h>
+  pr {|#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
 
-#include \"actions.h\"
+#include "actions.h"
 
-";
+|};
 
   (* Table of functions. *)
   pr "static PyMethodDef methods[] = {\n";
@@ -559,11 +555,10 @@ and generate_python_module () =
   pr "\n";
 
   (* Init function. *)
-  pr "\
-static struct PyModuleDef moduledef = {
+  pr {|static struct PyModuleDef moduledef = {
   PyModuleDef_HEAD_INIT,
-  \"libguestfsmod\",     /* m_name */
-  \"libguestfs module\",   /* m_doc */
+  "libguestfsmod",     /* m_name */
+  "libguestfs module",   /* m_doc */
   -1,                    /* m_size */
   methods,               /* m_methods */
   NULL,                  /* m_reload */
@@ -592,7 +587,7 @@ PyInit_libguestfsmod (void)
 {
   return moduleinit ();
 }
-"
+|}
 
 (* Generate Python module. *)
 and generate_python_py () =
@@ -603,12 +598,11 @@ and generate_python_py () =
 
   generate_header HashStyle LGPLv2plus;
 
-  pr "\
-\"\"\"Python bindings for libguestfs
+  pr {|"""Python bindings for libguestfs
 
 import guestfs
 g = guestfs.GuestFS(python_return_dict=True)
-g.add_drive_opts(\"guest.img\", format=\"raw\")
+g.add_drive_opts("guest.img", format="raw")
 g.launch()
 parts = g.list_partitions()
 
@@ -641,7 +635,7 @@ sequence of calls:
 # Create the handle, call add_drive* at least once, and possibly
 # several times if the guest has multiple block devices:
 g = guestfs.GuestFS()
-g.add_drive_opts(\"guest.img\", format=\"raw\")
+g.add_drive_opts("guest.img", format="raw")
 
 # Launch the qemu subprocess and wait for it to become ready:
 g.launch()
@@ -649,14 +643,14 @@ g.launch()
 # Now you can issue commands, for example:
 logvols = g.lvs()
 
-\"\"\"
+"""
 
 import os
 import sys
 import libguestfsmod
 from typing import Union, List, Tuple, Optional
 
-";
+|};
 
   List.iter (
     fun (name, bitmask) ->
@@ -664,10 +658,9 @@ from typing import Union, List, Tuple, Optional
   ) events;
   pr "EVENT_ALL = 0x%x\n" all_events_bitmask;
   pr "\n";
-  pr "\
-
+  pr {|
 def event_to_string(events):
-    \"\"\"Return a printable string from an event or event bitmask\"\"\"
+    """Return a printable string from an event or event bitmask"""
     return libguestfsmod.event_to_string(events)
 
 
@@ -676,13 +669,13 @@ class ClosedHandle(ValueError):
 
 
 class GuestFS(object):
-    \"\"\"Instances of this class are libguestfs API handles.\"\"\"
+    """Instances of this class are libguestfs API handles."""
 
     def __init__(self, python_return_dict=False,
                  environment=True, close_on_exit=True):
-        \"\"\"Create a new libguestfs handle.
+        """Create a new libguestfs handle.
 
-        Note about \"python_return_dict\" flag:
+        Note about "python_return_dict" flag:
 
         Setting this flag to 'True' causes all functions
         that internally return hashes to return a dict.  This is
@@ -692,7 +685,7 @@ class GuestFS(object):
         If this flag is not present then hashes are returned
         as lists of pairs.  This was the only possible behaviour
         in libguestfs <= 1.20.
-        \"\"\"
+        """
         flags = 0
         if not environment:
             flags |= libguestfsmod.GUESTFS_CREATE_NO_ENVIRONMENT
@@ -711,7 +704,7 @@ class GuestFS(object):
 
     def _check_not_closed(self):
         if not self._o:
-            raise ClosedHandle(\"GuestFS: method called on closed handle\")
+            raise ClosedHandle("GuestFS: method called on closed handle")
 
     def _maybe_convert_to_dict(self, r):
         if self._python_return_dict:
@@ -719,7 +712,7 @@ class GuestFS(object):
         return r
 
     def close(self):
-        \"\"\"Explicitly close the guestfs handle.
+        """Explicitly close the guestfs handle.
 
         The handle is closed implicitly when its reference count goes
         to zero (eg. when it goes out of scope or the program ends).
@@ -728,41 +721,41 @@ class GuestFS(object):
         close now.  After calling this, the program must not call
         any method on the handle (except the implicit call to
         __del__ which happens when the final reference is cleaned up).
-        \"\"\"
+        """
         self._check_not_closed()
         libguestfsmod.close(self._o)
         self._o = None
 
     def set_event_callback(self, cb, event_bitmask):
-        \"\"\"Register an event callback.
+        """Register an event callback.
 
-        Register \"cb\" as a callback function for all of the
-        events in \"event_bitmask\".  \"event_bitmask\" should be
-        one or more \"guestfs.EVENT_*\" flags logically or'd together.
+        Register "cb" as a callback function for all of the
+        events in "event_bitmask".  "event_bitmask" should be
+        one or more "guestfs.EVENT_*" flags logically or'd together.
 
         This function returns an event handle which can be used
-        to delete the callback (see \"delete_event_callback\").
+        to delete the callback (see "delete_event_callback").
 
         The callback function receives 4 parameters:
 
         cb (event, event_handle, buf, array)
 
-        \"event\" is one of the \"EVENT_*\" flags.  \"buf\" is a
-        message buffer (only for some types of events).  \"array\"
+        "event" is one of the "EVENT_*" flags.  "buf" is a
+        message buffer (only for some types of events).  "array"
         is an array of integers (only for some types of events).
 
         You should read the documentation for
-        \"guestfs_set_event_callback\" in guestfs(3) before using
+        "guestfs_set_event_callback" in guestfs(3) before using
         this function.
-        \"\"\"
+        """
         self._check_not_closed()
         return libguestfsmod.set_event_callback(self._o, cb, event_bitmask)
 
     def delete_event_callback(self, event_handle):
-        \"\"\"Delete an event callback.\"\"\"
+        """Delete an event callback."""
         self._check_not_closed()
         libguestfsmod.delete_event_callback(self._o, event_handle)
-";
+|};
 
   let map_join f l =
     String.concat "" (List.map f l)
diff --git a/generator/ruby.ml b/generator/ruby.ml
index f9787af69..686badb31 100644
--- a/generator/ruby.ml
+++ b/generator/ruby.ml
@@ -37,14 +37,13 @@ let generate_header = generate_header ~inputs:["generator/ruby.ml"]
 let rec generate_ruby_h () =
   generate_header CStyle LGPLv2plus;
 
-  pr "\
-#ifndef GUESTFS_RUBY_ACTIONS_H_
+  pr {|#ifndef GUESTFS_RUBY_ACTIONS_H_
 #define GUESTFS_RUBY_ACTIONS_H_
 
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
+#pragma GCC diagnostic ignored "-Wstrict-prototypes"
 #if defined(__GNUC__) && __GNUC__ >= 6 /* gcc >= 6 */
-#pragma GCC diagnostic ignored \"-Wshift-overflow\"
+#pragma GCC diagnostic ignored "-Wshift-overflow"
 #endif
 #include <ruby.h>
 #pragma GCC diagnostic pop
@@ -54,10 +53,10 @@ let rec generate_ruby_h () =
 #undef _
 #endif
 
-#include \"guestfs.h\"
-#include \"guestfs-utils.h\" /* Only for POINTER_NOT_IMPLEMENTED */
+#include "guestfs.h"
+#include "guestfs-utils.h" /* Only for POINTER_NOT_IMPLEMENTED */
 
-#include \"extconf.h\"
+#include "extconf.h"
 
 /* For Ruby < 1.9 */
 #ifndef RARRAY_LEN
@@ -85,7 +84,7 @@ extern VALUE guestfs_int_ruby_set_event_callback (VALUE gv, VALUE cbv, VALUE eve
 extern VALUE guestfs_int_ruby_delete_event_callback (VALUE gv, VALUE event_handlev);
 extern VALUE guestfs_int_ruby_event_to_string (VALUE modulev, VALUE eventsv);
 
-";
+|};
 
   List.iter (
     fun f ->
@@ -108,8 +107,7 @@ extern VALUE guestfs_int_ruby_event_to_string (VALUE modulev, VALUE eventsv);
 and generate_ruby_c actions () =
   generate_header CStyle LGPLv2plus;
 
-  pr "\
-#include <config.h>
+  pr {|#include <config.h>
 
 /* It is safe to call deprecated functions from this file. */
 #define GUESTFS_NO_WARN_DEPRECATED
@@ -122,9 +120,9 @@ and generate_ruby_c actions () =
 #include <errno.h>
 #include <assert.h>
 
-#include \"actions.h\"
+#include "actions.h"
 
-";
+|};
 
   List.iter (
     fun f ->
@@ -186,8 +184,7 @@ and generate_ruby_c actions () =
           | RStringList _
           | RStructList _ -> "list" in
 
-        pr "\
-/*
+        pr {|/*
  * call-seq:
  *   g.%s(%s) -> %s
  *
@@ -198,16 +195,15 @@ and generate_ruby_c actions () =
  * [C API] For the C API documentation for this function, see
  *         {guestfs_%s}[http://libguestfs.org/guestfs.3.html#guestfs_%s].
  */
-" f.name args ret f.shortdesc doc f.name f.name
+|} f.name args ret f.shortdesc doc f.name f.name
       ) else (
-        pr "\
-/*
+        pr {|/*
  * call-seq:
  *   g.%s
  *
  * :nodoc:
  */
-" f.name
+|} f.name
       );
 
       (* Generate the function.  Prototype is completely different
@@ -441,8 +437,7 @@ and generate_ruby_c actions () =
 and generate_ruby_module () =
   generate_header CStyle LGPLv2plus;
 
-  pr "\
-#include <config.h>
+  pr {|#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -451,7 +446,7 @@ and generate_ruby_module () =
 #include <errno.h>
 #include <assert.h>
 
-#include \"actions.h\"
+#include "actions.h"
 
 VALUE m_guestfs;                  /* guestfs module */
 VALUE c_guestfs;                  /* guestfs_h handle */
@@ -463,9 +458,9 @@ extern void Init__guestfs (void); /* keep GCC warnings happy */
 void
 Init__guestfs (void)
 {
-  m_guestfs = rb_define_module (\"Guestfs\");
-  c_guestfs = rb_define_class_under (m_guestfs, \"Guestfs\", rb_cObject);
-  e_Error = rb_define_class_under (m_guestfs, \"Error\", rb_eStandardError);
+  m_guestfs = rb_define_module ("Guestfs");
+  c_guestfs = rb_define_class_under (m_guestfs, "Guestfs", rb_cObject);
+  e_Error = rb_define_class_under (m_guestfs, "Error", rb_eStandardError);
 
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 #ifndef HAVE_TYPE_RB_ALLOC_FUNC_T
@@ -474,24 +469,24 @@ Init__guestfs (void)
   rb_define_alloc_func (c_guestfs, (rb_alloc_func_t) guestfs_int_ruby_alloc_handle);
 #endif
 
-  rb_define_method (c_guestfs, \"initialize\",
+  rb_define_method (c_guestfs, "initialize",
                     guestfs_int_ruby_initialize_handle, -1);
-  rb_define_method (c_guestfs, \"close\",
+  rb_define_method (c_guestfs, "close",
                     guestfs_int_ruby_close_handle, 0);
-  rb_define_method (c_guestfs, \"set_event_callback\",
+  rb_define_method (c_guestfs, "set_event_callback",
                     guestfs_int_ruby_set_event_callback, 2);
-  rb_define_method (c_guestfs, \"delete_event_callback\",
+  rb_define_method (c_guestfs, "delete_event_callback",
                     guestfs_int_ruby_delete_event_callback, 1);
-  rb_define_module_function (m_guestfs, \"event_to_string\",
+  rb_define_module_function (m_guestfs, "event_to_string",
                              guestfs_int_ruby_event_to_string, 1);
 
   /* For backwards compatibility with older code, define a ::create
    * module function.
    */
-  rb_define_module_function (m_guestfs, \"create\",
+  rb_define_module_function (m_guestfs, "create",
                              guestfs_int_ruby_compat_create_handle, -1);
 
-";
+|};
 
   (* Constants. *)
   List.iter (
diff --git a/generator/rust.ml b/generator/rust.ml
index f4dcfd723..1b3b369ce 100644
--- a/generator/rust.ml
+++ b/generator/rust.ml
@@ -55,7 +55,7 @@ let translate_bad_symbols s =
 let generate_rust () =
   generate_header ~copyrights CStyle LGPLv2plus;
 
-  pr "
+  pr {|
 use crate::base::*;
 use crate::utils::*;
 use crate::error::*;
@@ -67,10 +67,10 @@ use std::os::raw::{c_char, c_int, c_void};
 use std::ptr;
 use std::slice;
 
-extern \"C\" {
+extern "C" {
     fn free(buf: *const c_void);
 }
-";
+|};
 
   (* event enum *)
   pr "\n";
diff --git a/generator/tests_c_api.ml b/generator/tests_c_api.ml
index 0bf65c124..c9ef3b0c8 100644
--- a/generator/tests_c_api.ml
+++ b/generator/tests_c_api.ml
@@ -35,8 +35,7 @@ let generate_header = generate_header ~inputs:["generator/tests_c_api.ml"]
 let rec generate_c_api_tests () =
   generate_header CStyle GPLv2plus;
 
-  pr "\
-#include <config.h>
+  pr {|#include <config.h>
 
 /* It is safe to call deprecated functions from this file. */
 #define GUESTFS_NO_WARN_DEPRECATED
@@ -50,13 +49,13 @@ let rec generate_c_api_tests () =
 #include <sys/stat.h>
 #include <errno.h>
 
-#include \"guestfs.h\"
-#include \"guestfs-utils.h\"
-#include \"structs-cleanups.h\"
+#include "guestfs.h"
+#include "guestfs-utils.h"
+#include "structs-cleanups.h"
 
-#include \"tests.h\"
+#include "tests.h"
 
-";
+|};
 
   (* Generate a list of commands which are not tested anywhere. *)
   pr "void\n";
@@ -124,16 +123,15 @@ and generate_one_test name optional i (init, prereq, test, cleanup) =
   );
   pr "\n";
 
-  pr "\
-static int
+  pr {|static int
 %s (guestfs_h *g)
 {
   if (%s_skip ()) {
-    skipped (\"%s\", \"environment variable set\");
+    skipped ("%s", "environment variable set");
     return 0;
   }
 
-" test_name test_name test_name;
+|} test_name test_name test_name;
 
   (* Optional functions should only be tested if the relevant
    * support is available in the daemon.
@@ -181,23 +179,22 @@ static int
   pr "}\n";
   pr "\n";
 
-  pr "\
-static int
+  pr {|static int
 %s_skip (void)
 {
   const char *str;
 
-  str = getenv (\"TEST_ONLY\");
+  str = getenv ("TEST_ONLY");
   if (str)
-    return strstr (str, \"%s\") == NULL;
-  str = getenv (\"SKIP_%s\");
-  if (str && STREQ (str, \"1\")) return 1;
-  str = getenv (\"SKIP_TEST_%s\");
-  if (str && STREQ (str, \"1\")) return 1;
+    return strstr (str, "%s") == NULL;
+  str = getenv ("SKIP_%s");
+  if (str && STREQ (str, "1")) return 1;
+  str = getenv ("SKIP_TEST_%s");
+  if (str && STREQ (str, "1")) return 1;
   return 0;
 }
 
-" test_name name
+|} test_name name
      (String.uppercase_ascii test_name)
      (String.uppercase_ascii name);