From 379cadfafd2c9cff5423b9579cb8fdee894b152d Mon Sep 17 00:00:00 2001
From: Fredrik Lindqvist <landrash@gmail.com>
Date: Thu, 29 Sep 2016 08:43:44 +0200
Subject: [PATCH] Add information for Raspberry Pi Image (#995)

* Add information for Raspberry Pi Image, installation and general Raspberry Pi information update.
---
 .../asides/getting_started_navigation.html    |  1 +
 ...tallation-raspberry-pi-all-in-one.markdown |  2 +-
 .../installation-raspberry-pi-image.markdown  | 42 +++++++++++++++++++
 .../installation-raspberry-pi.markdown        | 10 ++++-
 4 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 source/getting-started/installation-raspberry-pi-image.markdown

diff --git a/source/_includes/asides/getting_started_navigation.html b/source/_includes/asides/getting_started_navigation.html
index 77d992a1df7..dedfbe4d3ba 100644
--- a/source/_includes/asides/getting_started_navigation.html
+++ b/source/_includes/asides/getting_started_navigation.html
@@ -9,6 +9,7 @@
         <ul>
           <li>{% active_link /getting-started/installation-raspberry-pi/ Raspberry Pi %}</li>
           <li>{% active_link /getting-started/installation-raspberry-pi-all-in-one/ Raspberry Pi All-In-One Installer %}</li>
+          <li>{% active_link /getting-started/installation-raspberry-pi-image/ Raspberry Pi Image %}</li>
           <li>{% active_link /getting-started/installation-docker/ Docker %}</li>
           <li>{% active_link /getting-started/installation-vagrant/ Vagrant %}</li>
           <li>{% active_link /getting-started/installation-synology/ Synology NAS %}</li>
diff --git a/source/getting-started/installation-raspberry-pi-all-in-one.markdown b/source/getting-started/installation-raspberry-pi-all-in-one.markdown
index 69540647bc6..7acb8286c3c 100644
--- a/source/getting-started/installation-raspberry-pi-all-in-one.markdown
+++ b/source/getting-started/installation-raspberry-pi-all-in-one.markdown
@@ -2,7 +2,7 @@
 layout: page
 title: "Raspberry Pi All-In-One Installer"
 date: 2016-05-12 01:39
-comments: true
+comments: false
 sharing: true
 footer: true
 ---
diff --git a/source/getting-started/installation-raspberry-pi-image.markdown b/source/getting-started/installation-raspberry-pi-image.markdown
new file mode 100644
index 00000000000..93676eff28c
--- /dev/null
+++ b/source/getting-started/installation-raspberry-pi-image.markdown
@@ -0,0 +1,42 @@
+---
+layout: page
+title: "Hassbian image on a Raspberry Pi"
+description: "Instructions to install the Home Assistant Hassbian image on a Raspberry Pi."
+date: 2016-09-26 21:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+---
+
+### {% linkable_title Hassbian %}
+
+We finally have a Raspberry Pi image! It's been named Hassbian in honor of Raspbian.
+This image comes pre-installed with the dependencies, permissions and so on for Home Assistant. Image is based on the same install instructions as the [Manual installation](/getting-started/installation-raspberry-pi/).  
+It's based on Raspbian Lite and generated with a fork of the same [script](https://github.com/home-assistant/pi-gen) that builds the [official Raspbian images](raspberrypi.org/downloads/raspbian/). Please note that this project has no association with the Raspberry Pi foundation or their projects.  
+
+On first boot the latest release of Home Assistant will be installed in a [Virtual Environment](getting-started/installation-virtualenv) at `/srv/homeassistant` and started as a service run by the user `homeassistant`. Since this is done automatically it's required that the Raspberry Pi is connected to the internet with a ethernet cable. Installation takes about 5 minutes on first boot and after that you can connect to your Raspberry Pi on `ipaddress:8123`.
+
+Pre-installed on this image is the MQTT broker [Mosquitto](https://mosquitto.org/), Bluetooth support for none Bluetooth LE and settings for the `homeassistant` user to use the GPIO pins of the Raspberry Pi. Mosquitto is not activated by default.
+
+As it is today there is no pre-compiled Z-Wave support but it can be installed by following the [Getting started instructions for Z-Wave](/getting-started/z-wave/).
+
+For Raspberry Pi hardware specific components have a look at our [install guide for the Raspberry Pi](/getting-started/installation-raspberry-pi/#raspberry-pi-hardware-specific-components). Default password for the `pi` user is `raspberry` and is highly recommended to be changed. 
+
+### {% linkable_title Installation %}
+
+The image can be found as a [release](https://github.com/home-assistant/pi-gen/releases) in the [pi-gen repository](https://github.com/home-assistant/pi-gen/).
+
+Installation instructions are the same as for Raspbian and it's recommended to follow [these](https://www.raspberrypi.org/documentation/installation/installing-images/README.md).
+
+### {% linkable_title Troubleshooting %}
+
+If you run into any issues, please see [the troubleshooting page](/getting-started/troubleshooting/). It contains solutions to many of the more commonly encountered issues.
+
+In addition to this site, check out these sources for additional help:
+
+ - [Forum](https://community.home-assistant.io) for Home Assistant discussions and questions.
+ - [Gitter Chat Room](https://gitter.im/home-assistant/home-assistant) for real-time chat about Home Assistant.
+ - [GitHub Page](https://github.com/home-assistant/home-assistant/issues) for issue reporting.
+
+### [Next step: Configuring Home Assistant &raquo;](/getting-started/configuration/)
diff --git a/source/getting-started/installation-raspberry-pi.markdown b/source/getting-started/installation-raspberry-pi.markdown
index 67e4be1656d..5b42f7233e4 100644
--- a/source/getting-started/installation-raspberry-pi.markdown
+++ b/source/getting-started/installation-raspberry-pi.markdown
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "Raspbian Lite on a Raspberry Pi"
+title: "Manual installation on a Raspberry Pi"
 description: "Instructions to install Home Assistant on a Raspberry Pi runnning Raspbian Lite."
 date: 2016-09-05 16:00
 sidebar: true
@@ -11,6 +11,14 @@ footer: true
 
 ### {% linkable_title Installation %}
 
+There's currently three documented ways to install Home Assistant on a Raspberry Pi.  
+ - [Manual installation](/getting-started/installation-raspberry-pi/#Manual-Installation). Following this guide doing each step manually. This is highly recommended as a first installation since you get a good overview of the installation.
+ - [Hassbian image](/getting-started/installation-raspberry-pi-image). Basic installation with the same settings as following the manual installation guide. Some additional software is preinstalled to make installation quicker and easier.
+ - [All-in-One Installer](/getting-started/installation-raspberry-pi-all-in-one/). Fabric based installation script that installs and compiles many of the things an advanced Home Assistant install is likely to need.
+
+
+### {% linkable_title Manual Installation %}
+
 This installation of Home Assistant requires the Raspberry Pi to run [Raspbian Lite](https://www.raspberrypi.org/downloads/raspbian/).
 The installation will be installed in a [Virtual Environment](/getting-started/installation-virtualenv) with minimal overhead. Instructions assume this is a new installation of Raspbian Lite.