Merge branch 'devel-2.1' into devel-2.2

* devel-2.1:
  Fix case of MAC special-values

(no conflicts, took LGTM from original commit)

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>

diff --git a/man/gnt-backup.sgml b/man/gnt-backup.sgml
index 5992d67..91c4955 100644 (file)
--- a/man/gnt-backup.sgml
+++ b/man/gnt-backup.sgml
@@ -214,9 +214,8 @@
           <varlistentry>
             <term>mac</term>
             <listitem>
-              <simpara>either a value or <constant>GENERATE</constant>
-              to generate a new unique MAC, or
-              <constant>AUTO</constant> to reuse the old MAC</simpara>
+              <simpara>either a value or 'generate' to generate a new
+              unique MAC, or 'auto' to reuse the old MAC</simpara>
             </listitem>
           </varlistentry>
           <varlistentry>

diff --git a/man/gnt-instance.sgml b/man/gnt-instance.sgml
index f4d2f54..9be66b1 100644 (file)
--- a/man/gnt-instance.sgml
+++ b/man/gnt-instance.sgml
@@ -200,8 +200,8 @@
             <varlistentry>
               <term>mac</term>
               <listitem>
-                <simpara>either a value or <constant>GENERATE</constant>
-                  to generate a new unique MAC</simpara>
+                <simpara>either a value or 'generate' to generate a
+                  new unique MAC</simpara>
               </listitem>
             </varlistentry>
             <varlistentry>