Merge lp:~andreserl/maas/lp1628052 into lp:~maas-committers/maas/trunk

[Andres Rodriguez]

Update help text in input fields

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

=== modified file 'src/maasserver/static/partials/intro.html'
--- src/maasserver/static/partials/intro.html	2016-09-16 18:49:23 +0000
+++ src/maasserver/static/partials/intro.html	2016-09-27 15:48:14 +0000
@@ -11,7 +11,7 @@
                 <div class="u-margin--top">
                     <maas-obj-form obj="maasName" manager="configManager">
                         <div class="three-col">
-                            <maas-obj-field type="text" key="value" label="Region name" subtle="false" blur-on-enter="true"></maas-obj-field>
+                            <maas-obj-field type="text" key="value" label="Region name" placeholder="e.g. us-west"  subtle="false" blur-on-enter="true"></maas-obj-field>
                         </div>
                     </maas-obj-form>
                 </div>
@@ -27,7 +27,7 @@
                 <div class="row u-border--none u-padding--none u-margin--top">
                     <maas-obj-form obj="upstreamDNS" manager="configManager">
                         <div class="three-col">
-                            <maas-obj-field type="text" key="value" label="DNS forwarder" subtle="false" blur-on-enter="true"></maas-obj-field>
+                            <maas-obj-field type="text" key="value" label="DNS forwarder" placeholder="e.g. 8.8.8.8" subtle="false" blur-on-enter="true"></maas-obj-field>
                         </div>
                         <div class="one-col"></div>
                         <div class="five-col last-col u-text--subtle">The address used to resolve domains not managed by MAAS. The value is used as the value of 'forwarders' in the DNS server configuration.</div>