Merge lp:~jtv/maas/bug-1364228 into lp:~maas-committers/maas/trunk

[Jeroen T. Vermeulen]

Stop telling users that generated hostnames will be MAC-based.

Low-hanging-fruit fix from the 1.7.0 milestone. The random names have been through a few changes since that UI text was written, so going into detail about what the generated names will look like would only set us up for the next way to get it wrong. Let's just say MAAS will make up a name.

Jeroen

[Julian Edwards (julian-edwards)]

 review: approve

review: Approve

=== modified file 'src/maasserver/templates/maasserver/snippets.html'
--- src/maasserver/templates/maasserver/snippets.html	2014-06-09 19:58:06 +0000
+++ src/maasserver/templates/maasserver/snippets.html	2014-09-02 09:27:46 +0000
@@ -12,7 +12,8 @@
       <span class="form-optional">(optional)</span>
     </label>
     {{ node_form.hostname }}
-    <div class="field-help">Default is MAC-based, e.g. "node-aabbccddeeff"
+    <div class="field-help">
+      MAAS will generate an arbitrary name if you don't provide one.
     </div>
   </p>
   <p>