diff --git a/source/_docs/configuration.markdown b/source/_docs/configuration.markdown
index afe48dbf883..1c51b041608 100644
--- a/source/_docs/configuration.markdown
+++ b/source/_docs/configuration.markdown
@@ -28,6 +28,16 @@ If you run into trouble while configuring Home Assistant, have a look at the [co
 
 </div>
 
+## Editing `configuration.yaml`
+
+There are many ways you can edit `configuration.yaml`. Here are three options to get you started:
+
+The simplest is to use the "File Editor" add-on. This will allow you to edit your configuration from within Home Assistant itself.
+
+You can also use Samba (you may need to install the "Samba" add-on) and your favorite file editor.
+
+The most basic is to use SSH to connect to the system (you may need to install the SSH add-on) and then use `nano` (or `vim`) to edit the file.
+
 ## Reloading changes
 
 You will have to restart Home Assistant for most changes to `configuration.yaml` to take effect.