From: Mark Clarkstone <hello@markclarkstone.co.uk>
Date: Tue, 30 Aug 2016 22:19:04 +0000 (+0100)
Subject: mdhelp: add new screenshot for detach bouquet + info about detaching channels from... 
X-Git-Tag: v4.2.1~325
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71899ab00154ebcd0bb09d53ae2d3ddc5778407e;p=thirdparty%2Ftvheadend.git

mdhelp: add new screenshot for detach bouquet + info about detaching channels from bouquets
---

diff --git a/docs/class/bouquet.md b/docs/class/bouquet.md
index c50e29064..b31c19583 100644
--- a/docs/class/bouquet.md
+++ b/docs/class/bouquet.md
@@ -39,6 +39,30 @@ Button         | Function
 
 ---
 
+###Detaching Channels
+
+If you're mapping another service to a channel created by a bouquet you 
+must first detach the channel to prevent unexpected 
+changes, you can do this by selecting the desired channels from within 
+the grid and then pressing the *Detach selected channels from bouquet* 
+option from the *[Map services]* button.
+
+!['Map All Services'](static/img/doc/mapallserviceschannels.png)
+
+If you do not detach channel(s) before mapping additional 
+services the following changes can occur..
+
+* The last mapped service's values will override the channel values set by the bouquet, e,g, if service "MyTV" with channel number 155 gets mapped to the channel "BBC One" on channel number 1 it will be renamed "MyTV" with channel number 155.
+* Any changes (mapped services, number changes etc) to the channels can be lost if new changes in the bouquet override them.
+
+Detaching channels from a bouquet will prevent any further updates 
+provided by the bouquet, which unfortunately means you will have to 
+manually re-map when changes to services occur (e.g, mux moves, ceased broadcasting etc).
+
+<tvh_include>inc/selecting_entries_tip</tvh_include>
+
+---
+
 <tvh_include>inc/del_grid_entries</tvh_include>
 
 ---
diff --git a/docs/class/channel.md b/docs/class/channel.md
index 7642e767a..14b1aa808 100644
--- a/docs/class/channel.md
+++ b/docs/class/channel.md
@@ -36,12 +36,23 @@ Numbering Button            | Function
 
 !['Add Channel Dialog'](static/img/doc/addchanneldialog.png)
 
+In the above example image, we're creating a channel called Channel 4 
+and mapping it to the service of the same name. You can name a channel 
+whatever you like, it doesn't have to match the service it's linking 
+to. 
+
+If you have a lot of services you may want to use the [Map services](class/mpegts_service) 
+functions or a [Bouquet](class/bouquet).
+
 ---
 
 <tvh_include>inc/edit_grid_entries</tvh_include>
 
 !['Edit Channel Dialog'](static/img/doc/channeleditsingle.png)
 
+Note that editing a channel created by a bouquet can have unexpected 
+results, please see *Detaching Channels* on the [Bouquet](class/bouquet) page for info.
+
 ---
 
 <tvh_include>inc/del_grid_entries</tvh_include>
diff --git a/src/webui/static/img/doc/mapallserviceschannels.png b/src/webui/static/img/doc/mapallserviceschannels.png
new file mode 100644
index 000000000..228633b79
Binary files /dev/null and b/src/webui/static/img/doc/mapallserviceschannels.png differ