Merge remote-tracking branch 'origin/current' into next

source/_addons/duckdns.markdown

@@ -43,3 +43,7 @@ http:
 ```
 
 If you use a other port as `8123` or a SSL proxy, change the port number.
+
+## {% linkable_title Router configuration %}
+
+You'll need to forward the port you listed in your configuration (8123 in the example above) on your router to your Home Assistant system. You can find guides on how to do this on [Port Forward](https://portforward.com/) - noting that you'll only need to forward the TCP port.

source/_components/xiaomi_aqara.markdown

@@ -179,3 +179,4 @@ That means that Home Assistant is not getting any response from your Xiaomi gate
 - Try to disable and then enable LAN access.
 - Hard reset the gateway: Press the button of the gateway 30 seconds and start again from scratch.
 - If you are using Home Assistant in [Docker](/docs/installation/docker/), make sure to use `--net=host`.
+- If you receive an `{"error":"Invalid key"}` in your log while trying to control the gateway light, you should generate the key again using an Android Phone or alternativly an emulator such as [bluestacks](https://www.bluestacks.com). In some instances there is an issue with keys being generated using the iOS application.

source/_cookbook/configuration_yaml_by_ntalekt

@@ -0,0 +1,12 @@
+---
+layout: page
+title: "Configuration.yaml by ntalekt"
+description: ""
+date: 2017-10-26 13:08 -0700
+sidebar: true
+comments: false
+sharing: true
+footer: true
+ha_category: Example configuration.yaml
+ha_external_link: https://github.com/ntalekt/homeassistant
+---

source/_docs/ecosystem/certificates/lets_encrypt.markdown

@@ -445,7 +445,7 @@ To set a cron job to run the script at regular intervals:
  * Change to your Home Assistant user (command similar to):
  
 ```bash
-$ su - s /bin/bash hass
+$ sudo su -s /bin/bash hass
 ```
  
  * Open the crontab:

source/developers/development_submitting.markdown

@@ -36,5 +36,12 @@ Submit your improvements, fixes, and new features to Home Assistant one at a tim
  
  6. Follow [these steps](https://help.github.com/articles/creating-a-pull-request/) to create your pull request.
  
+     * On GitHub, navigate to the main page of the Home Assistant repository.
+     * In the "Branch" menu, choose the branch that contains your commits (from your fork).
+     * To the right of the Branch menu, click **New pull request**.
+     * Use the base branch dropdown menu to select the branch you'd like to merge your changes into, then use the compare branch drop-down menu to choose the topic branch you made your changes in. Make sure the Home Assistant branch matches with your forked branch (`dev`) else you will propose ALL committs between branches.
+     * Type a title and complete the provided description for your pull request. 
+     * Click **Create pull request**.
+ 
  7. Check for comments and suggestions on your pull request and keep an eye on the [CI output](https://travis-ci.org/home-assistant/home-assistant/).
 

source/developers/development_testing.markdown

@@ -42,7 +42,7 @@ $ tox -e py36 -- tests/test_core.py --duration=10
 Running tox will invoke the full test suite. Even if you specify which tox target to run, you still run all tests inside that target. That's not very convenient to quickly iterate on your code! To be able to run the specific test suites without Tox, you'll need to install the test dependencies into your Python environment:
 
 ```bash
-$ bash pip3 install -r requirements_test_all.txt
+$ pip3 install -r requirements_test_all.txt
 ```
 
 Now that you have all test dependencies installed, you can run tests on individual files: