From: Sam Leonard <sam.leonard@codethink.co.uk>
Date: Thu, 25 Jan 2024 14:55:23 +0000 (+0000)
Subject: vmspawn: fix incorrect mention of container
X-Git-Tag: v256-rc1~940
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a759d3239dd2d4165cc0ac46bccd605bf05b4b99;p=thirdparty%2Fsystemd.git

vmspawn: fix incorrect mention of container
---

diff --git a/man/systemd-vmspawn.xml b/man/systemd-vmspawn.xml
index 1bd459058a3..d5ece4acea0 100644
--- a/man/systemd-vmspawn.xml
+++ b/man/systemd-vmspawn.xml
@@ -171,8 +171,8 @@
           <term><option>-M</option></term>
           <term><option>--machine=</option></term>
 
-          <listitem><para>Sets the machine name for this container. This
-          name may be used to identify this container during its runtime
+          <listitem><para>Sets the machine name for this virtual machine. This
+          name may be used to identify this virtual machine during its runtime
           (for example in tools like
           <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
           and similar).</para>
@@ -189,7 +189,7 @@
           <term><option>--load-credential=</option><replaceable>ID</replaceable>:<replaceable>PATH</replaceable></term>
           <term><option>--set-credential=</option><replaceable>ID</replaceable>:<replaceable>VALUE</replaceable></term>
 
-          <listitem><para>Pass a credential to the container. These two options correspond to the
+          <listitem><para>Pass a credential to the virtual machine. These two options correspond to the
           <varname>LoadCredential=</varname> and <varname>SetCredential=</varname> settings in unit files. See
           <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry> for
           details about these concepts, as well as the syntax of the option's arguments.</para>
diff --git a/src/vmspawn/vmspawn.c b/src/vmspawn/vmspawn.c
index a08bc4c6794..c89c38165e0 100644
--- a/src/vmspawn/vmspawn.c
+++ b/src/vmspawn/vmspawn.c
@@ -89,13 +89,14 @@ static int help(void) {
                "                            supports Secure Boot\n"
                "     --firmware=PATH|list   Select firmware definition file (or list available)\n"
                "\n%3$sSystem Identity:%4$s\n"
-               "  -M --machine=NAME         Set the machine name for the container\n"
+               "  -M --machine=NAME         Set the machine name for the virtual machine\n"
                "\n%3$sCredentials:%4$s\n"
                "     --set-credential=ID:VALUE\n"
-               "                            Pass a credential with literal value to container.\n"
+               "                            Pass a credential with literal value to the\n"
+               "                            virtual machine\n"
                "     --load-credential=ID:PATH\n"
-               "                            Load credential to pass to container from file or\n"
-               "                            AF_UNIX stream socket.\n"
+               "                            Load credential to pass to the virtual machine from\n"
+               "                            file or AF_UNIX stream socket.\n"
                "\nSee the %2$s for details.\n",
                program_invocation_short_name,
                link,