diff --git a/atom.xml b/atom.xml index 6d123b1a19..dc69fcaef7 100644 --- a/atom.xml +++ b/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Home Assistant]]> - 2016-10-04T20:09:01+00:00 + 2016-10-04T20:26:23+00:00 https://home-assistant.io/ diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml index da135a6c60..45a4adad4d 100644 --- a/blog/categories/community/atom.xml +++ b/blog/categories/community/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Community | Home Assistant]]> - 2016-10-04T20:09:01+00:00 + 2016-10-04T20:26:23+00:00 https://home-assistant.io/ diff --git a/blog/categories/device-tracking/atom.xml b/blog/categories/device-tracking/atom.xml index 1fbdb0526b..1f2f4fd3dc 100644 --- a/blog/categories/device-tracking/atom.xml +++ b/blog/categories/device-tracking/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Device-Tracking | Home Assistant]]> - 2016-10-04T20:09:01+00:00 + 2016-10-04T20:26:23+00:00 https://home-assistant.io/ diff --git a/blog/categories/esp8266/atom.xml b/blog/categories/esp8266/atom.xml index 7feb35432d..b799124e7b 100644 --- a/blog/categories/esp8266/atom.xml +++ b/blog/categories/esp8266/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: ESP8266 | Home Assistant]]> - 2016-10-04T20:09:01+00:00 + 2016-10-04T20:26:23+00:00 https://home-assistant.io/ diff --git a/blog/categories/how-to/atom.xml b/blog/categories/how-to/atom.xml index d106482073..e99f5f98d4 100644 --- a/blog/categories/how-to/atom.xml +++ b/blog/categories/how-to/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: How-To | Home Assistant]]> - 2016-10-04T20:09:01+00:00 + 2016-10-04T20:26:23+00:00 https://home-assistant.io/ diff --git a/blog/categories/ibeacons/atom.xml b/blog/categories/ibeacons/atom.xml index 732d560df2..05d1753702 100644 --- a/blog/categories/ibeacons/atom.xml +++ b/blog/categories/ibeacons/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: iBeacons | Home Assistant]]> - 2016-10-04T20:09:01+00:00 + 2016-10-04T20:26:23+00:00 https://home-assistant.io/ diff --git a/blog/categories/internet-of-things/atom.xml b/blog/categories/internet-of-things/atom.xml index 94d1e937ac..3a153154eb 100644 --- a/blog/categories/internet-of-things/atom.xml +++ b/blog/categories/internet-of-things/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Internet-of-Things | Home Assistant]]> - 2016-10-04T20:09:01+00:00 + 2016-10-04T20:26:23+00:00 https://home-assistant.io/ diff --git a/blog/categories/iot-data/atom.xml b/blog/categories/iot-data/atom.xml index a3c82da76d..210c5fd186 100644 --- a/blog/categories/iot-data/atom.xml +++ b/blog/categories/iot-data/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: IoT-Data | Home Assistant]]> - 2016-10-04T20:09:01+00:00 + 2016-10-04T20:26:23+00:00 https://home-assistant.io/ diff --git a/blog/categories/micropython/atom.xml b/blog/categories/micropython/atom.xml index c58f05be27..f6bf941c08 100644 --- a/blog/categories/micropython/atom.xml +++ b/blog/categories/micropython/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Micropython | Home Assistant]]> - 2016-10-04T20:09:01+00:00 + 2016-10-04T20:26:23+00:00 https://home-assistant.io/ diff --git a/blog/categories/mqtt/atom.xml b/blog/categories/mqtt/atom.xml index 0f9cacec78..8203f2261d 100644 --- a/blog/categories/mqtt/atom.xml +++ b/blog/categories/mqtt/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: MQTT | Home Assistant]]> - 2016-10-04T20:09:01+00:00 + 2016-10-04T20:26:23+00:00 https://home-assistant.io/ diff --git a/blog/categories/organisation/atom.xml b/blog/categories/organisation/atom.xml index c9d0fe7fad..d136c4d942 100644 --- a/blog/categories/organisation/atom.xml +++ b/blog/categories/organisation/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Organisation | Home Assistant]]> - 2016-10-04T20:09:01+00:00 + 2016-10-04T20:26:23+00:00 https://home-assistant.io/ diff --git a/blog/categories/owntracks/atom.xml b/blog/categories/owntracks/atom.xml index 5bc9485de5..83f5781c12 100644 --- a/blog/categories/owntracks/atom.xml +++ b/blog/categories/owntracks/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: OwnTracks | Home Assistant]]> - 2016-10-04T20:09:01+00:00 + 2016-10-04T20:26:23+00:00 https://home-assistant.io/ diff --git a/blog/categories/presence-detection/atom.xml b/blog/categories/presence-detection/atom.xml index 431a050ddb..c619471f1f 100644 --- a/blog/categories/presence-detection/atom.xml +++ b/blog/categories/presence-detection/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Presence-Detection | Home Assistant]]> - 2016-10-04T20:09:01+00:00 + 2016-10-04T20:26:23+00:00 https://home-assistant.io/ diff --git a/blog/categories/public-service-announcement/atom.xml b/blog/categories/public-service-announcement/atom.xml index 5c709b6239..8befce871a 100644 --- a/blog/categories/public-service-announcement/atom.xml +++ b/blog/categories/public-service-announcement/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Public-Service-Announcement | Home Assistant]]> - 2016-10-04T20:09:01+00:00 + 2016-10-04T20:26:23+00:00 https://home-assistant.io/ diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml index 51c7cb07df..bf24ffb74c 100644 --- a/blog/categories/release-notes/atom.xml +++ b/blog/categories/release-notes/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Release-Notes | Home Assistant]]> - 2016-10-04T20:09:01+00:00 + 2016-10-04T20:26:23+00:00 https://home-assistant.io/ diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml index b26356d27f..d176b05bf5 100644 --- a/blog/categories/survey/atom.xml +++ b/blog/categories/survey/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Survey | Home Assistant]]> - 2016-10-04T20:09:01+00:00 + 2016-10-04T20:26:23+00:00 https://home-assistant.io/ diff --git a/blog/categories/talks/atom.xml b/blog/categories/talks/atom.xml index 5de97fd46d..e13e5bd31a 100644 --- a/blog/categories/talks/atom.xml +++ b/blog/categories/talks/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Talks | Home Assistant]]> - 2016-10-04T20:09:01+00:00 + 2016-10-04T20:26:23+00:00 https://home-assistant.io/ diff --git a/blog/categories/technology/atom.xml b/blog/categories/technology/atom.xml index 345ff1ceaf..7cb8451656 100644 --- a/blog/categories/technology/atom.xml +++ b/blog/categories/technology/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Technology | Home Assistant]]> - 2016-10-04T20:09:01+00:00 + 2016-10-04T20:26:23+00:00 https://home-assistant.io/ diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml index 8d17935811..d6e33e4185 100644 --- a/blog/categories/user-stories/atom.xml +++ b/blog/categories/user-stories/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: User-Stories | Home Assistant]]> - 2016-10-04T20:09:01+00:00 + 2016-10-04T20:26:23+00:00 https://home-assistant.io/ diff --git a/blog/categories/video/atom.xml b/blog/categories/video/atom.xml index 80da23837e..61bdd900c8 100644 --- a/blog/categories/video/atom.xml +++ b/blog/categories/video/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Video | Home Assistant]]> - 2016-10-04T20:09:01+00:00 + 2016-10-04T20:26:23+00:00 https://home-assistant.io/ diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml index d16134e6fa..b5e88b8315 100644 --- a/blog/categories/website/atom.xml +++ b/blog/categories/website/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Website | Home Assistant]]> - 2016-10-04T20:09:01+00:00 + 2016-10-04T20:26:23+00:00 https://home-assistant.io/ diff --git a/developers/development_catching_up/index.html b/developers/development_catching_up/index.html index e959efbf37..347d0ac9b3 100644 --- a/developers/development_catching_up/index.html +++ b/developers/development_catching_up/index.html @@ -89,7 +89,7 @@
-

If you’re taking a while developing your feature and would like to catch up with what’s in the current Home Assistant dev branch, you can use git rebase to do so. This will pull the latest Home Assistant changes locally, rewind your commits, bring in the latest changes from Home Assistant and then replay all of your commits on top.

+

If it’s taking a while to develop your feature, and you want to catch up with what’s in the current Home Assistant dev branch, you can use git rebase. This will pull the latest Home Assistant changes locally, rewind your commits, bring in the latest changes from Home Assistant, and replay all of your commits on top.

# Run this from your feature branch
 $ git fetch upstream dev  # to pull the latest changes into a local dev branch
@@ -97,23 +97,22 @@
-

If rebase detects conflicts, you can repeat the following process until all changes have been resolved:

+

If rebase detects conflicts, repeat this process until all changes have been resolved:

    -
  1. git status will show you the file with the conflict.
    2. -
  2. Edit the file and resolving the lines between <<<< | >>>>
    3. -
  3. Add the modified file git add <file> or git add .
    4. -
  4. Continue rebase git rebase --continue
    5. -
  5. Repeat until you’ve resolved all conflicts.
    6. +
  6. git status shows you the file with the conflict; edit the file and resolve the lines between <<<< | >>>>
    7. +
  7. Add the modified file: git add <file> or git add .
    8. +
  8. Continue rebase: git rebase --continue
    9. +
  9. Repeat until you’ve resolved all conflicts
-

There is other workflows that is covered in detail in the Github documentation. Add an additional remote after you clone your fork.

+

Other workflows are covered in detail in the Github documentation. Add an additional remote after you clone your fork.

$ git remote add upstream https://github.com/home-assistant/home-assistant.git
-

and then simply git pull --rebase upstream dev.

+

Then, git pull --rebase upstream dev.

diff --git a/sitemap.xml b/sitemap.xml index 5b4d72cd70..71a5e694c2 100644 --- a/sitemap.xml +++ b/sitemap.xml @@ -2113,62 +2113,62 @@ https://home-assistant.io/demo/frontend.html -2016-10-04T20:08:12+00:00 +2016-10-04T20:25:43+00:00 https://home-assistant.io/demo/index.html -2016-10-04T20:08:12+00:00 +2016-10-04T20:25:43+00:00 https://home-assistant.io/demo/panels/ha-panel-dev-event.html -2016-10-04T20:08:12+00:00 +2016-10-04T20:25:43+00:00 https://home-assistant.io/demo/panels/ha-panel-dev-info.html -2016-10-04T20:08:12+00:00 +2016-10-04T20:25:43+00:00 https://home-assistant.io/demo/panels/ha-panel-dev-service.html -2016-10-04T20:08:12+00:00 +2016-10-04T20:25:43+00:00 https://home-assistant.io/demo/panels/ha-panel-dev-state.html -2016-10-04T20:08:12+00:00 +2016-10-04T20:25:43+00:00 https://home-assistant.io/demo/panels/ha-panel-dev-template.html -2016-10-04T20:08:12+00:00 +2016-10-04T20:25:43+00:00 https://home-assistant.io/demo/panels/ha-panel-history.html -2016-10-04T20:08:12+00:00 +2016-10-04T20:25:43+00:00 https://home-assistant.io/demo/panels/ha-panel-iframe.html -2016-10-04T20:08:12+00:00 +2016-10-04T20:25:43+00:00 https://home-assistant.io/demo/panels/ha-panel-logbook.html -2016-10-04T20:08:12+00:00 +2016-10-04T20:25:43+00:00 https://home-assistant.io/demo/panels/ha-panel-map.html -2016-10-04T20:08:12+00:00 +2016-10-04T20:25:43+00:00 https://home-assistant.io/googlef4f3693c209fe788.html -2016-10-04T20:08:12+00:00 +2016-10-04T20:25:43+00:00 https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html -2016-10-04T20:08:12+00:00 +2016-10-04T20:25:43+00:00 https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html -2016-10-04T20:08:12+00:00 +2016-10-04T20:25:43+00:00 https://home-assistant.io/static/mdi-demo.html -2016-10-04T20:08:12+00:00 +2016-10-04T20:25:43+00:00