diff --git a/source/_docs/configuration/basic.markdown b/source/_docs/configuration/basic.markdown
index 4af7df1a350..99614cefc1f 100644
--- a/source/_docs/configuration/basic.markdown
+++ b/source/_docs/configuration/basic.markdown
@@ -14,26 +14,27 @@ By default, Home Assistant will try to detect your location from IP address geol
 
 ```yaml
 homeassistant:
-  # Omitted values in this section will be auto detected using freegeoip.io
-
-  # Location required to calculate the time the sun rises and sets
   latitude: 32.87336
   longitude: 117.22743
-
-  # Impacts weather/sunrise data (altitude above sea level in meters) 
   elevation: 430
-
-  # 'metric' for Metric, 'imperial' for Imperial
   unit_system: metric
-
-  # Pick yours from here:
-  # http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
   time_zone: America/Los_Angeles
-
-  # Name of the location where Home Assistant is running
   name: Home
 ```
 
+Configuration variables:
+
+- **latitude** (*Optional*): Latitude of your location required to calculate the time the sun rises and sets.
+- **longitude** (*Optional*): Longitude of your location required to calculate the time the sun rises and sets.
+- **elevation** (*Optional*): Altitude above sea level in meters. Impacts weather/sunrise data. 
+- **unit_system** (*Optional*): `metric` for Metric, `imperial` for Imperial.
+- **time_zone** (*Optional*): Pick yours from here: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+- **name** (*Optional*): Name of the location where Home Assistant is running.
+- **customize** (*Optional*): [Customize](/docs/configuration/customizing-devices/) entities.
+- **customize_domain** (*Optional*): [Customize](/docs/configuration/customizing-devices/) all entities in a domain.
+- **customize_glob** (*Optional*): [Customize](/docs/configuration/customizing-devices/) entities matching a pattern.
+- **whitelist_external_dirs** (*Optional*): List of folders that can be used as sources for sending files.
+
 ### {% linkable_title Password protecting the web interface %}
 
 First, you'll want to add a password for the Home Assistant web interface. Use your favourite text editor to open `configuration.yaml` and edit the `http` section: