From: Mark Clarkstone <hello@markclarkstone.co.uk>
Date: Fri, 6 Jan 2017 21:45:51 +0000 (+0000)
Subject: mdhelp: tweak some more docs/properties, update base config screenshot
X-Git-Tag: v4.2.1~113
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3600a5012966717e9689708bfa953bb320fc9996;p=thirdparty%2Ftvheadend.git

mdhelp: tweak some more docs/properties, update base config screenshot
---

diff --git a/docs/property/config_channelname_scheme.md b/docs/property/config_channelname_scheme.md
index 1add8c8aa..905bb56e5 100644
--- a/docs/property/config_channelname_scheme.md
+++ b/docs/property/config_channelname_scheme.md
@@ -1,9 +1,9 @@
 : 
-You must correctly set the *Channel icon path* (above) to be able to generate icon 
-filenames. Note that changing this option **won't** automatically (re-)generate 
-icon filenames, you must manually (re-)generate them using the 
-*[Reset Icons]* button in the *Configuration -> Channel / EPG -> Channels* 
-tab.
+
+The *Channel icon path* (above) must be set to generate the filenames. 
+Also note that changing the scheme will not update existing icons, you must 
+use the *[Reset Icons]* button in the [Channels](class/channel) tab
+to re-generate them.
 
 Scheme                 | Description
 -----------------------|-------------------
diff --git a/docs/property/config_picon_path.md b/docs/property/config_picon_path.md
index aba81a46e..92ac21d5b 100644
--- a/docs/property/config_picon_path.md
+++ b/docs/property/config_picon_path.md
@@ -1,6 +1,6 @@
 This can be named however you wish, as either a local (file://) or 
 remote (http://) location - however, remember that it’s pointing to a 
 directory as the picon names are automatically generated from the 
-service parameters frequency, orbital position, etc.).
+service parameters frequency, orbital position (required), etc.
 
 Example: `file:///home/hts/picons`
diff --git a/docs/property/config_picon_servicetype.md b/docs/property/config_picon_servicetype.md
index b215cf1d0..ab6f85553 100644
--- a/docs/property/config_picon_servicetype.md
+++ b/docs/property/config_picon_servicetype.md
@@ -1,14 +1,11 @@
 :
 
-You must set the *Picon path* (above) to be able to correctly 
-generate icon filenames.
+The *Picon path* (above) must be set to generate the filenames. 
+Also note that changing the scheme will not update existing icons, you must 
+use the *[Reset Icons]* button in the [Channels](class/channel) tab
+to re-generate them.
 
 Scheme                        | Description
 ------------------------------|------------
-**Standard**                  | If your filenames use the standard naming scheme, e.g "1_0_19_xxxx".
-**force service type to 1**   | If your picon pack uses filenames that start with "1_0_1_xxxx".
-
-Note that changing this setting **won't** 
-automatically (re-)generate icon filenames, you must manually 
-(re-)generate them using the *[Reset Icons]* button in the 
-[Channels](class/channel) tab.
+**Standard**                  | Choose this if your picon pack uses the standard naming scheme, e.g "1_0_19_xxxx".
+**force service type to 1**   | Choose this if your picon pack has icons that start with "1_0_1_xxxx".
diff --git a/src/config.c b/src/config.c
index afbee1a38..59ca041c5 100644
--- a/src/config.c
+++ b/src/config.c
@@ -2347,7 +2347,7 @@ const idclass_t config_class = {
       .type   = PT_INT,
       .id     = "chiconscheme",
       .name   = N_("Channel icon name scheme"),
-      .desc   = N_("Scheme to generate the the channel icon names "
+      .desc   = N_("Scheme to generate the channel icon names "
                    "(all lower-case, service name picons etc.)."),
       .list   = config_class_chiconscheme_list,
       .doc    = prop_doc_config_channelname_scheme,
diff --git a/src/webui/static/img/doc/configbaseall.png b/src/webui/static/img/doc/configbaseall.png
index d547efc60..73c1c6ab9 100644
Binary files a/src/webui/static/img/doc/configbaseall.png and b/src/webui/static/img/doc/configbaseall.png differ