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 @@
<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>
......
......@@ -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>
......
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