Merge branch 'dev' of github.com:xoseperez/espurna into dev

.github/stale.yml

@@ -23,7 +23,7 @@ staleLabel: stale
 # Comment to post when marking as stale. Set to `false` to disable
 markComment: >
   This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed in 30 days if no further activity occurs.
+  recent activity. It will be closed in 7 days if no further activity occurs.
   Thank you for your contributions.
 
 # Comment to post when removing the stale label.
@@ -32,7 +32,7 @@ markComment: >
 
 # Comment to post when closing a stale Issue or Pull Request.
 closeComment: >
-  This issue will be auto-closed because there hasn't been any activity for a few months. Feel free to open a new one if you still experience this problem.
+  This issue will be auto-closed because there hasn't been any activity for two months. Feel free to open a new one if you still experience this problem.
 
 # Limit the number of actions per hour, from 1-30. Default is 30
 limitPerRun: 30

code/html/index.html

@@ -1367,7 +1367,7 @@
                 <label class="pure-u-1 pure-u-lg-1-4 more">Static IP</label>
                 <input class="pure-u-1 pure-u-lg-3-4 more" name="ip" type="text" action="reconnect" value="" maxlength="15" tabindex="0" autocomplete="false" />
                 <div class="pure-u-0 pure-u-lg-1-4 more"></div>
-                <div class="pure-u-1 pure-u-lg-3-4 hint more">Leave empty for DNS negotiation</div>
+                <div class="pure-u-1 pure-u-lg-3-4 hint more">Leave empty for DHCP negotiation</div>
 
                 <label class="pure-u-1 pure-u-lg-1-4 more">Gateway IP</label>
                 <input class="pure-u-1 pure-u-lg-3-4 more" name="gw" type="text" action="reconnect" value="" maxlength="15" tabindex="0" autocomplete="false" />