From: Mark Clarkstone <hello@markclarkstone.co.uk>
Date: Sat, 4 Jun 2016 05:14:12 +0000 (+0100)
Subject: mdhelp: add tab specific button table to bouquets doc for force scan mdhelp: slightly... 
X-Git-Tag: v4.2.1~436
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=189dcb6d039626c488a01e907aef55166f4dbc20;p=thirdparty%2Ftvheadend.git

mdhelp: add tab specific button table to bouquets doc for force scan mdhelp: slightly change new mux discovery option text mdhelp: hide list for autodiscovery property in mpegts_network_class replace with network_discovery markdown doc
---

diff --git a/docs/class/bouquet.md b/docs/class/bouquet.md
index 44a0311cf..c50e29064 100644
--- a/docs/class/bouquet.md
+++ b/docs/class/bouquet.md
@@ -21,6 +21,12 @@ listen to the specific MPEG-TS PIDs.
 
 <tvh_include>inc/common_button_table_end</tvh_include>
 
+The following tab specific buttons are available: 
+
+Button         | Function
+---------------|---------
+**Force Scan** | Rescan the selected mux for changes to the bouquet.
+
 ---
 
 <tvh_include>inc/add_grid_entry</tvh_include>
diff --git a/docs/property/network_discovery.md b/docs/property/network_discovery.md
new file mode 100644
index 000000000..1221d69e4
--- /dev/null
+++ b/docs/property/network_discovery.md
@@ -0,0 +1,7 @@
+:
+
+Option                         | Description
+-------------------------------|------------
+**Disable**                    | Disable mux discovery.
+**New muxes only**             | Discover new muxes only.
+**New muxes + changed muxes**  | Discover new muxes and changes to existing muxes.
diff --git a/src/input/mpegts/mpegts_network.c b/src/input/mpegts/mpegts_network.c
index 767c9108a..0e8373f5c 100644
--- a/src/input/mpegts/mpegts_network.c
+++ b/src/input/mpegts/mpegts_network.c
@@ -135,12 +135,13 @@ mpegts_network_discovery_enum ( void *o, const char *lang )
   static const struct strtab tab[] = {
     { N_("Disable"),                  MN_DISCOVERY_DISABLE },
     { N_("New muxes only"),           MN_DISCOVERY_NEW },
-    { N_("New muxes + change muxes"), MN_DISCOVERY_CHANGE },
+    { N_("New muxes + changed muxes"), MN_DISCOVERY_CHANGE },
   };
   return strtab2htsmsg(tab, 1, lang);
 }
 
 CLASS_DOC(mpegts_network)
+PROP_DOC(network_discovery)
 
 const idclass_t mpegts_network_class =
 {
@@ -182,9 +183,10 @@ const idclass_t mpegts_network_class =
       .name     = N_("Network discovery"),
       .desc     = N_("Discover more muxes using the Network "
                      "Information Table (if available)."),
+      .doc      = prop_doc_network_discovery,
       .off      = offsetof(mpegts_network_t, mn_autodiscovery),
       .list     = mpegts_network_discovery_enum,
-      .opts     = PO_ADVANCED,
+      .opts     = PO_ADVANCED | PO_DOC_NLIST,
       .def.i    = MN_DISCOVERY_NEW
     },
     {