Commit 8341ec93 authored by Iustin Pop's avatar Iustin Pop

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: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parents acf931b7 d4068f64
...@@ -214,9 +214,8 @@ ...@@ -214,9 +214,8 @@
<varlistentry> <varlistentry>
<term>mac</term> <term>mac</term>
<listitem> <listitem>
<simpara>either a value or <constant>GENERATE</constant> <simpara>either a value or 'generate' to generate a new
to generate a new unique MAC, or unique MAC, or 'auto' to reuse the old MAC</simpara>
<constant>AUTO</constant> to reuse the old MAC</simpara>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
......
...@@ -200,8 +200,8 @@ ...@@ -200,8 +200,8 @@
<varlistentry> <varlistentry>
<term>mac</term> <term>mac</term>
<listitem> <listitem>
<simpara>either a value or <constant>GENERATE</constant> <simpara>either a value or 'generate' to generate a
to generate a new unique MAC</simpara> new unique MAC</simpara>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment