From: Mark Clarkstone <hello@markclarkstone.co.uk>
Date: Mon, 13 Mar 2017 12:51:44 +0000 (+0000)
Subject: mdhelp: add note to epggrabber_modules about NZ grabbers and update screenshot mdhelp... 
X-Git-Tag: v4.2.1~82
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e664c3e98ba7d18c8c074c9c3522121f5328d2e0;p=thirdparty%2Ftvheadend.git

mdhelp: add note to epggrabber_modules about NZ grabbers and update screenshot mdhelp: add note about epg grabbers to the wizard (mapping doc) mpegts: add UTC +12, +12:45, +13 and +14 EIT offsets
---

diff --git a/docs/class/epggrabber_modules.md b/docs/class/epggrabber_modules.md
index fa95f5b90..145cbab0b 100644
--- a/docs/class/epggrabber_modules.md
+++ b/docs/class/epggrabber_modules.md
@@ -20,7 +20,24 @@ Button                      | Function
 
 ---
 
+###Notes
 
+* Only OTA EIT and PSIP (ATSC) grabbers are enabled by default. If 
+you're missing EPG data, make sure to enable the correct grabber(s) 
+for your location/provider.
+* If you use more than one grabber, be sure to give a higher priority 
+to the grabber that provides you with richer data.
 
+####New Zealand Grabbers
 
+Due to non-standard DVB-T configuration used in NZ. Additional 
+set-up is required in order to receive full 7 day OTA EPG data for 
+regional services, if you live outside Auckland.
 
+If you want to receive regional data, you must first enable the 
+*New Zealand: Auckland* grabber, and then enable a secondary NZ 
+grabber (with a higher priority value) that corresponds to your region.
+
+**Tip**: Don't forget to set the *EIT time offset* for your network(s).
+
+---
diff --git a/docs/wizard/hello.md b/docs/wizard/hello.md
index 5960b976e..db4bf2fd1 100644
--- a/docs/wizard/hello.md
+++ b/docs/wizard/hello.md
@@ -8,14 +8,12 @@ you're not willing to touch the current configuration, as continuing in
 such cases can lead to misconfiguration and not all changes made thru 
 this wizard will take effect.**
 
-
 **Notes**:
 * If you cannot see your preferred language in the language list and would 
 like to help translate Tvheadend see 
 [here](https://tvheadend.org/projects/tvheadend/wiki/Internationalization). 
 * If you don't enter a preferred language, US English will be used as a default. 
-* Not selecting the correct EPG 
-language can result in garbled EPG text; if this happens, don't panic, 
-as you can easily change it later.
+* Not selecting the correct EPG language can result in garbled EPG 
+text; if this happens, don't panic, as you can easily change it later.
 
 **The interface will reload in your chosen language (if the translation is available).**
diff --git a/docs/wizard/mapping.md b/docs/wizard/mapping.md
index 86d51c682..f41c78251 100644
--- a/docs/wizard/mapping.md
+++ b/docs/wizard/mapping.md
@@ -18,3 +18,6 @@ map services to channels manually.**
 **Notes**:
 * Many providers include undesirable services - Teleshopping, Adult
   Entertainment, etc; using the 'Map all services' will include these.
+* You may need to enable specific EPG grabbers to receive OTA EPG data,
+See the *EPG Grabber Modules* Help doc for details.
+
diff --git a/src/input/mpegts/dvb_support.c b/src/input/mpegts/dvb_support.c
index 826cef54a..cde6bb024 100644
--- a/src/input/mpegts/dvb_support.c
+++ b/src/input/mpegts/dvb_support.c
@@ -513,6 +513,10 @@ static struct strtab dvb_timezone_strtab[] = {
   { N_("UTC+10"),     10*60 },
   { N_("UTC+10:30"),  10*60+30 },
   { N_("UTC+11"),     11*60 },
+  { N_("UTC+12"),     12*60 },
+  { N_("UTC+12:45"),  12*60+45 },
+  { N_("UTC+13"),     13*60 },
+  { N_("UTC+14"),     14*60 }
 };
 
 htsmsg_t *
diff --git a/src/webui/static/img/doc/epggrabmodules.png b/src/webui/static/img/doc/epggrabmodules.png
index 4766f944a..c86238780 100644
Binary files a/src/webui/static/img/doc/epggrabmodules.png and b/src/webui/static/img/doc/epggrabmodules.png differ