
diff --git a/source/getting-started/configuration.markdown b/source/getting-started/configuration.markdown
index 360ef56f009..5814b3c1cb1 100644
--- a/source/getting-started/configuration.markdown
+++ b/source/getting-started/configuration.markdown
@@ -9,19 +9,59 @@ sharing: true
footer: true
---
-When launched for the first time, Home Assistant will write a default configuration file, called `configuration.yaml`, enabling the web interface and [device discovery](/components/discovery/). It can take up to a minute for your devices to be discovered and appear in the user interface.
+If you made it here, awesome! That means that you got Home Assistant up and running. It might have already found some of your networked devices. This is going to be fun!
-The `configuration.yaml` is written in [YAML](/docs/configuration/yaml/), stored in [`.homeassistant`](/docs/configuration/), and can be modified with a text editor.
+Home Assistant stores its configuration in a file called `configuration.yaml`. A default one is created when Home Assistant is started for the first time. Some of the things in the configuration file can be edited via the user interface, other parts require you to edit the configuration file directly.
-See the [components overview page](/components/) to find sample entries for your devices and services. For a sensor that is showing [random values](/components/sensor.random/), the entry would look like the sample below:
+There are two common approaches to edit your configuration: via Samba/Windows Networking and via the HASS Configurator. Both of these are [official add-ons for Hass.io](/addons/).
+
+## {% linkable_title Installing Hass.io add-ons %}
+
+Hass.io add-ons are installed from the add-on store embedded in the Hass.io panel:
+
+ - Open Home Assistant by navigating to [http://hassio.local:8123][local].
+ - Click on the menu icon in the top left and select Hass.io in the sidebar.
+ - The Hass.io panel opens, now open the add-on store by clicking the shopping bag.
+
+[local]: http://hassio.local:8123
+
+
+
+From the Hass.io main panel open the add-on store.
+
+
+### {% linkable_title Editing config via HASS Configurator %}
+
+The first add-on we should install is the HASS Configurator. With the HASS Configurator you'll be able to edit your Home Assistant configuration from the web interface.
+
+Go to the add-on store (see previous step), click on Configurator and click on INSTALL. When installation is complete the UI will go to the add-on details page for the configurator. Here you will be able to change settings, start and stop the add-on.
+
+ - Change the settings to set a password and click on save
+ - Start the add-on
+ - You will be able to click the "WEB UI" link to open the Web UI
+
+Time for the first practice with the configurator. Add the following to `configuration.yaml` file to add a link to the Configurator in the sidebar:
```yaml
-sensor:
- - platform: random
+panel_iframe:
+ configurator:
+ title: Configurator
+ icon: mdi:wrench
+ url: http://hassio.local:3218
```
-The [Setting up devices part](/docs/configuration/devices/) contains the additional documentation details about adding devices and services and [customization](/docs/configuration/customizing-devices/).
+Now restart Home Assistant for the changes to the configuration to take effect. You can do this by going to the config panel (Configuration in the sidebar) -> General -> Restart Home Assistant.
-For further details about configuration, please take a look at the [configuration documentation](/docs/configuration/).
+### {% linkable_title Editing config via Samba/Windows Networking %}
+
+Maybe you are not a big fan of our web editor and want to use a text editor on your computer instead. This is possible by sharing the configuration over the network using the Samba add-on, which can be installed from the Hass.io add-on store.
+
+After you have installed it, click on START. Hass.io should now be available in the networking tab on your computer. Use a text editor like the free [Visual Studio Code](https://code.visualstudio.com/) to edit `configuration.yaml`.
+
+## {% linkable_title Configuring integrations %}
+
+Now that you are able to edit the configuration, it's time to set up some of your devices and services. Each service and device will have its own instructions on how to be integrated. Find your devices and services on the [components overview page](/components/).
+
+
YAML can be a little daunting at first. A lot is possible! [Here is some more info.](/docs/configuration/devices/)
### [Next step: Automate Home Assistant »](/getting-started/automation/)
diff --git a/source/getting-started/index.markdown b/source/getting-started/index.markdown
index 6c15f7caac3..79d410fb25f 100644
--- a/source/getting-started/index.markdown
+++ b/source/getting-started/index.markdown
@@ -9,30 +9,39 @@ sharing: true
footer: true
---
-First you will need to install Home Assistant before we can get started:
+The goal of this getting started guide is to install Hass.io on a Raspberry Pi 3. Hass.io is our own all in one solution that turns your Raspberry PI into the utlimate home automation hub.
-We have developed **Hass.io** to turn your device into a dedicated Home Assistant hub controlled by a nice webinterface.
-For Raspberry Pi and Intel NUC we offer configured images. Flash the image, setup WiFi (if required) and everything else can be done inside the Hass.io webinterface. Great, isn't it?
+Follow this guide if you want to easily get started with Home Assistant or if you have none or little Linux experience. For advanced users, check our [alternative installation methods](/docs/installation/).
-Also Home Assistant runs on any other device that supports **Python 3**.
-
-
+### {% linkable_title Hardware requirements %}
-For alternative installation methods, please take a look at the [installation documentation](/docs/installation/).
+We will need a few things to get started with installing Home Assistant. Links below are linking to Amazon US. If you're not in the US, you should be able to find these items in web stores in your country.
-If you run into any issues, please see [the troubleshooting page](/docs/installation/troubleshooting/) or [communication channels](/help/). It contains solutions to many commonly encountered issues.
+ - [Raspberry Pi 3 model B](http://a.co/gEfMqL4) + [Power Supply](http://a.co/cgKUgkt) (atleast 2.5A)
+ - [Micro SD Card](http://a.co/gslOydD). Get one that is Class 10 as they are more reliable. Size 32GB or bigger recommended.
+ - SD Card reader. Part of most laptops. Also available as [standalone USB sticks](http://a.co/5FCyb0N) (brand doesn't matter, just pick cheapest)
+ - Ethernet cable (optional, Hass.io can work with WiFi too)
+
+### {% linkable_title Software requirements %}
+
+ - Download [Hass.io image for Raspberry Pi 3][pi3]
+ - Download [Etcher] to write the image to an SD card
+ - Text Editor like [Visual Studio Code](https://code.visualstudio.com/)
+
+[Etcher]: https://etcher.io/
+[pi3]: https://github.com/home-assistant/hassio-build/releases/download/1.1/resinos-hassio-1.1-raspberrypi3.img.bz2
+
+### Installing Hass.io
+
+ 1. Put the SD card in your SD card reader,
+ 2. Open Etcher, select the Hass.io image and flash it to the SD card.
+ 3. WiFi setup only: open the file `system-connections/resin-sample` with a text editor. Change `ssid` to be your network name and `psk` to be your password.
+ 4. Unmount the SD card and remove it from your SD card reader.
+ 5. Insert the SD card into your Raspberry Pi 3. If you are going to use an Ethernet cable to supply Internet, connect that too.
+ 6. Connect your Raspberry Pi to the power supply so it turns on.
+ 7. The Raspberry Pi will now boot up, connect to the Internet and download the latest version of Home Assistant. This will take about 20 minutes.
+ 8. Home Assistant will be available at [http://hassio.local:8123][local].
+
+[local]: http://hassio.local:8123
### [Next step: Configuring Home Assistant »](/getting-started/configuration/)
From cfeb8fac3da37e05736c4818d27cbe86a0f1ece6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter
Date: Sat, 16 Dec 2017 15:07:24 +0100
Subject: [PATCH 08/10] Add 'force_update' (#4221)
---
source/_components/sensor.mqtt.markdown | 42 ++++++++++++++++++++-----
1 file changed, 34 insertions(+), 8 deletions(-)
diff --git a/source/_components/sensor.mqtt.markdown b/source/_components/sensor.mqtt.markdown
index ca8be055d12..0fb3ab1175f 100644
--- a/source/_components/sensor.mqtt.markdown
+++ b/source/_components/sensor.mqtt.markdown
@@ -25,14 +25,40 @@ sensor:
state_topic: "home/bedroom/temperature"
```
-Configuration variables:
-
-- **state_topic** (*Required*): The MQTT topic subscribed to receive sensor values.
-- **name** (*Optional*): The name of the sensor. Default is 'MQTT Sensor'.
-- **qos** (*Optional*): The maximum QoS level of the state topic. Default is 0.
-- **unit_of_measurement** (*Optional*): Defines the units of measurement of the sensor, if any.
-- **expire_after** (*Optional*): Defines the number of seconds after the value expires if it's not updated. Default is 0 (=never expire).
-- **value_template** (*Optional*): Defines a [template](/docs/configuration/templating/#processing-incoming-data) to extract a value from the payload.
+{% configuration %}
+state_topic:
+ description: The MQTT topic subscribed to receive sensor values.
+ required: true
+ type: string
+name:
+ description: Name of the MQTT sensor.
+ required: false
+ type: string
+ default: MQTT Sensor
+qos:
+ description: The maximum QoS level of the state topic.
+ required: false
+ type: int
+ default: 0
+unit_of_measurement:
+ description: Defines the units of measurement of the sensor, if any.
+ required: false
+ type: string
+expire_after:
+ description: Defines the number of seconds after the value expires if it's not updated.
+ required: false
+ type: int
+ default: 0
+value_template:
+ description: "Defines a [template](/docs/configuration/templating/#processing-incoming-data) to extract the value."
+ required: false
+ type: template
+force_update:
+ description: Sends update events even if the value hasn't changed. Useful if you want to have meaningful value graphs in history.
+ reqired: false
+ type: boolean
+ default: False
+{% endconfiguration %}
## {% linkable_title Examples %}
From de6ecd1d11eac742fe72ad84f8672ae941ca21a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Przemek=20Wi=C4=99ch?=
Date: Sat, 16 Dec 2017 19:04:04 +0100
Subject: [PATCH 09/10] Updated documentation about running local development
instance. (#4205)
* Updated documentation about running local development instance.
* Make it venv only
---
.../developers/development_environment.markdown | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/source/developers/development_environment.markdown b/source/developers/development_environment.markdown
index d6779d701e6..d33521d5237 100644
--- a/source/developers/development_environment.markdown
+++ b/source/developers/development_environment.markdown
@@ -85,21 +85,23 @@ $ git remote add upstream https://github.com/home-assistant/home-assistant.git
### {% linkable_title Setting up virtual environment %}
-If you plan on providing isolation to your environment using [`venv`](https://docs.python.org/3.4/library/venv.html). Within the `home-assistant` directory, create and activate your virtual environment.
+To isolate your environment from the rest of the system, set up a [`venv`](https://docs.python.org/3.4/library/venv.html). Within the `home-assistant` directory, create and activate your virtual environment.
```bash
-$ python3 -m venv venv
-$ source venv/bin/activate
+$ python3 -m venv .
+$ source bin/activate
```
-
-### {% linkable_title Setup and Run %}
+Install the requirements with a provided script named `setup`.
```bash
-$ cd home-assistant
$ script/setup
```
-* Run `hass` to invoke your local installation.
+Invoke your installation.
+
+```bash
+$ hass
+```
### {% linkable_title Logging %}
From 78573e962448cccd1a03822ee0362055974fd7e1 Mon Sep 17 00:00:00 2001
From: Jenya Y
Date: Sun, 17 Dec 2017 11:29:34 +0200
Subject: [PATCH 10/10] Typo (#4224)
---
source/_docs/installation/virtualenv.markdown | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/source/_docs/installation/virtualenv.markdown b/source/_docs/installation/virtualenv.markdown
index 234ea989460..a1b4c25c876 100644
--- a/source/_docs/installation/virtualenv.markdown
+++ b/source/_docs/installation/virtualenv.markdown
@@ -10,7 +10,7 @@ footer: true
redirect_from: /getting-started/installation-virtualenv/
---
-If you alreacy have Python 3.5 or later installed, you can easily give Home Assistant a spin.
+If you already have Python 3.5 or later installed, you can easily give Home Assistant a spin.
It's recommended when installing Python packages that you use a virtual environment. This will make sure that your Python installation and Home Assistant installation won't impact one another.