diff --git a/source/getting-started/configuration.markdown b/source/getting-started/configuration.markdown
index 787f20885b1..887a0421be1 100644
--- a/source/getting-started/configuration.markdown
+++ b/source/getting-started/configuration.markdown
@@ -11,9 +11,7 @@ footer: true
 
 Home Assistant will create a configuration folder when it is run for the first time. The location of the folder differs between operating systems: on OS X and Linux it's `~/.homeassistant` and on Windows it's `%APPDATA%/.homeassistant`. If you want to use a different folder for configuration, run `hass --config path/to/config`.
 
-Inside your configuration folder is the file `configuration.yaml`. This is the main file that contains which components will be loaded and what their configuration is.  
-This file contains YAML code, which is explained briefly below.  
-[An example configuration file is located here](https://github.com/balloob/home-assistant/blob/master/config/configuration.yaml.example).
+Inside your configuration folder is the file `configuration.yaml`. This is the main file that contains which components will be loaded and what their configuration is. This file contains YAML code, which is explained briefly below. [An example configuration file is located here](https://github.com/balloob/home-assistant/blob/master/config/configuration.yaml.example).
 
 When launched for the first time, Home Assistant will write a default configuration file enabling the web interface and device discovery. It can take up to a minute for your devices to be discovered and show up in the user interface.
 
@@ -28,8 +26,8 @@ If you run into trouble while configuring Home Assistant, have a look at [the co
 
 Home Assistant uses the [YAML](http://yaml.org/) syntax for configuration. YAML might take a while to get used to but is really powerful in allowing you to express complex configurations.
 
-For each component that you want to use in Home Assistant, you add code in your `configuraton.yaml` file to specify its settings.  
-Example, the following code specifies that you want to use the [notify component](/components/notify)  with the [pushbullet platform](/components/notify.pushbullet).  
+For each component that you want to use in Home Assistant, you add code in your `configuraton.yaml` file to specify its settings.
+The following example entry specifies that you want to use the [notify component](/components/notify) with the [pushbullet platform](/components/notify.pushbullet).
 
 
 ```yaml
@@ -42,15 +40,14 @@ notify:
 - A **component** provides the core logic for some functionality (like `notify` provides sending notifications). 
 - A **platform** makes the connection to a specific software or hardware platform (like `pushbullet` works with the service from pushbullet.com).
 
-The basics of YAML syntax are block collections and mappings containing key-value pairs.  
-Each item in a collection starts with a `-` while mappings have the format `key: value`. If you specify duplicate keys, the last value for a key is used.  
+The basics of YAML syntax are block collections and mappings containing key-value pairs. Each item in a collection starts with a `-` while mappings have the format `key: value`. If you specify duplicate keys, the last value for a key is used.
 
-Note that indentation is an important part of specifying relationships using YAML. Things that are indented are nested "inside" things that are one level higher. So in the above example, `platform: pushbullet` is a property of (nested inside) the `notify` component.  
+Note that indentation is an important part of specifying relationships using YAML. Things that are indented are nested "inside" things that are one level higher. So in the above example, `platform: pushbullet` is a property of (nested inside) the `notify` component.
 Getting the right indentation can be tricky if you're not using an editor with a fixed width font. Tabs are not allowed to be used for indentation. Convention is to use 2 spaces for each level of indentation.
 
 Lines that start with **#** are comments and are ignored by the system.
 
-The next example shows an [input_select](/components/input_select) component that uses a block collection for the options values.  
+The next example shows an [input_select](/components/input_select) component that uses a block collection for the options values.
 The other properties (like name) are specified using mappings. Note that the second line just has `threat:` with no value on the same line. Here threat is the name of the input_select and the values for it are everything nested below it.
 
 ```yaml
@@ -66,8 +63,7 @@ input_select:
     initial: 0
 ```
 
-The following example shows nesting a collection of mappings in a mapping.  
-In Home Assistant, this would create two sensors that each use the MQTT platform but have different values for their `state_topic` (one of the properties used for MQTT sensors). 
+The following example shows nesting a collection of mappings in a mapping. In Home Assistant, this would create two sensors that each use the MQTT platform but have different values for their `state_topic` (one of the properties used for MQTT sensors). 
 
 ```yaml
 sensor: