From ec99ee80ae595e6980e7ed8b41cff623d6de5880 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sun, 26 Mar 2017 12:14:30 +0200
Subject: [PATCH] Add breaking change and update Android IP webcam docs

---
 source/_components/android_ip_webcam.markdown         | 11 -----------
 .../_posts/2017-03-25-todo-volumio-workday.markdown   |  7 ++++---
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/source/_components/android_ip_webcam.markdown b/source/_components/android_ip_webcam.markdown
index 89631c4cf77..d95d9f64ba4 100644
--- a/source/_components/android_ip_webcam.markdown
+++ b/source/_components/android_ip_webcam.markdown
@@ -21,17 +21,7 @@ To set it up, download [the IP Webcam app][app] and add the following informatio
 ```yaml
 # Example configuration.yaml entry
 android_ip_webcam:
-<<<<<<< HEAD
-<<<<<<< HEAD
   - host: 192.168.1.10
-=======
-  # This should be the ip of your phone
-=======
-  # This should be the IP Address of the phone
->>>>>>> origin/current
-  - host: 192.168.1.10
-    name: Entrance
->>>>>>> current
 ```
 
 Configuration variables:
@@ -42,7 +32,6 @@ Configuration variables:
 - **username** (*Optional*): The username to access the phone.
 - **password** (*Optional*): The password to access the phone.
 - **scan_interval** (*Optional*): Default is 10 seconds. Defines the update interval of the phone.
-- **auto_discovery** (*Optional*): Default is True. Auto detect which sensors and settings are available for setup.
 - **sensors** array (*Optional*): Conditions to display sensor in the frontend. See list of supported sensors.
 - **switches** array (*Optional*): Conditions to display settings in the frontend. See list of supported settings.
 - **motion_sensor** (*Optional*): Activate motion sensor if auto_discovery is disabled.
diff --git a/source/_posts/2017-03-25-todo-volumio-workday.markdown b/source/_posts/2017-03-25-todo-volumio-workday.markdown
index 3b10ea18e22..8f87641bdfb 100644
--- a/source/_posts/2017-03-25-todo-volumio-workday.markdown
+++ b/source/_posts/2017-03-25-todo-volumio-workday.markdown
@@ -36,6 +36,7 @@ The new format of the changelog which was introduced with 0.40 will provide a li
 - The [Emby mediaplayer][emby] platform was changed to avoid name clashes ([#6664]).
 - In a lot of places were the power and energy units update. This change mostly affects the `switch` platforms ([#6212]).
 - If set to `auto` then the [MQTT][mqtt] implementation will use the bundled certificates automatically ([#6707]).
+- Autodiscovery of [Android IP Webcam][android] was removed ([#6528])
 
 ## If you need help...
 ...don't hesitate to use our very active [forums][forum] or join us for a little [chat][gitter]. The release notes have comments enabled but it's preferred if you use the former communication channels. Thanks.
@@ -102,12 +103,11 @@ Experiencing issues introduced by this release? Please report them in our [issue
 - Add "Refactor zwave discovery to entity schema" ([@balloob] - [#6565])
 - Tests for ZWave climate ([@armills] - [#6629])
 - Correctly flag Kodi media types ([@armills] - [#6628])
-- since knx_2_float can't handle 0, bypass converting 0 value from knx to float ([@goofz] - [#6626])
 - Use sqlite's WAL mode to avoid `database is locked` errors ([@n8henrie] - [#6519])
 - Remove event decorators ([@balloob] - [#6634]) (Breaking Change)
 - Deprecate event forwarding ([@balloob])
 - Upgrade aiohttp to 1.3.4 ([@pvizeli] - [#6643])
-- media_player.kodi extra attributes for tvshow and music media ([@mvillarejo] - [#6622])
+- Kodi extra attributes for tvshow and music media ([@mvillarejo] - [#6622])
 - Add ZWave cover tests ([@armills] - [#6648])
 - Kodi: Fix episode media type classification ([@armills] - [#6645])
 - Move LIFX to aiolifx for driving the bulbs ([@amelchio] - [#6584])
@@ -121,7 +121,7 @@ Experiencing issues introduced by this release? Please report them in our [issue
 - Fix hydroquebec ([@titilambert] - [#6574])
 - Update pyecobee version to 0.0.7 ([@dale3h] - [#6593])
 - Update SMA solar sensor to work with the new add_devices callback ([@kellerza] - [#6602])
-- since knx_2_float can't handle 0, bypass converting 0 value from knx to float ([@goofz] - [#6626])
+- Since knx_2_float can't handle 0, bypass converting 0 value from knx to float ([@goofz] - [#6626])
 - Bugfix RFLINK remove group ([@pvizeli] - [#6580])
 - Added workday sensor ([@BastianPoe] - [#6599])
 - Add test for Z-wave switch ([@turbokongen] - [#6619])
@@ -341,6 +341,7 @@ Experiencing issues introduced by this release? Please report them in our [issue
 [tado]: https://home-assistant.io/components/climate.tado/
 [volumio]: https://home-assistant.io//components/media_player.volumio/
 [workday]: https://home-assistant.io/components/binary_sensor.workday/
+[android]: https://home-assistant.io/components/android_ip_webcam/
 
 [forum]: https://community.home-assistant.io/
 [gitter]: https://gitter.im/home-assistant/home-assistant