Merge branch 'current' into next

source/hassio/installation.markdown

@@ -20,6 +20,10 @@ Hass.io images are available for all available Raspberry Pi and Intel NUC platfo
 - Optional - Setup the WiFi or static IP: On the SD-card, edit the `system-connections/resin-sample` file and follow the [ResinOS howto][resinos-network].
 - Insert SD card to Raspberry Pi and turn it on. On first boot, it downloads the latest version of Home Assistant which takes ~20 minutes (slower/faster depending on the platform).
 
+<p class='note'>
+Please remember to ensure you're using an [appropriate power supply](https://www.raspberrypi.org/help/faqs/#powerReqs) with your Pi. Mobile chargers may not be suitable, since some are designed to only provide the full power with that manufacturer's handsets.
+</p>
+
 <img src='/images/hassio/screenshots/first-start.png' style='clear: right; border:none; box-shadow: none; float: right; margin-bottom: 12px;' width='150' />
 
 - You will be able to reach your installation at [http://hassio.local:8123][local].

source/hassio/zwave.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Z-Wave"
-description: "Instructions on how-to use Z-Wave with Hass.io."
+description: "Instructions on how-to enable Z-Wave with Hass.io."
 date: 2017-04-30 13:28
 sidebar: true
 comments: false
@@ -40,3 +40,7 @@ zha:
   usb_path: /dev/ttyUSB1
   database_path: /config/zigbee.db
 ```
+
+## {% linkable_title Further reading %}
+
+For more information on using Z-Wave, see the [main documentation](/docs/z-wave/).