From: Mark Clarkstone <hello@markclarkstone.co.uk>
Date: Sun, 8 May 2016 11:56:23 +0000 (+0100)
Subject: mdhelp: Clean up tv_adapters a little, add satip info.
X-Git-Tag: v4.2.1~537
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6058e16987dc142f39fee0d5bac1bd290f89f30d;p=thirdparty%2Ftvheadend.git

mdhelp: Clean up tv_adapters a little, add satip info.

Remove unnecessary links to other types (frontends, satconf)
from many of the device/satconf docs.

Give dvbtfrontendparams.png a trim.
---

diff --git a/docs/class/linuxdvb_frontend_dvbc.md b/docs/class/linuxdvb_frontend_dvbc.md
index 54443c3bc..778cf25cd 100644
--- a/docs/class/linuxdvb_frontend_dvbc.md
+++ b/docs/class/linuxdvb_frontend_dvbc.md
@@ -5,14 +5,6 @@ parameters.
 
 ---
 
-* Other Frontends
-  - [DVB-C](class/linuxdvb_frontend_dvbc)
-  - [ATSC-C](class/linuxdvb_frontend_atsc_c)
-  - [ISDB-C](class/linuxdvb_frontend_isdb_c)
-* Back to [TV Adapters](tv_adapters) 
-
----
-
 ###Buttons
 
 The following buttons are available:
diff --git a/docs/class/linuxdvb_frontend_dvbs.md b/docs/class/linuxdvb_frontend_dvbs.md
index cab5173f9..98992086e 100644
--- a/docs/class/linuxdvb_frontend_dvbs.md
+++ b/docs/class/linuxdvb_frontend_dvbs.md
@@ -5,14 +5,6 @@ parameters.
 
 ---
 
-* Other Frontends
-  - [Master](class/linuxdvb_frontend_dvbs)
-  - [Master (ISDB-S)](class/linuxdvb_frontend_isdb_s)
-  - [Slave](class/linuxdvb_frontend_dvbs_slave)
-* Back to [TV Adapters](tv_adapters) 
-
----
-
 ###Buttons
 
 The following buttons are available:
diff --git a/docs/class/linuxdvb_frontend_dvbt.md b/docs/class/linuxdvb_frontend_dvbt.md
index 936d18fd9..0e32f2a70 100644
--- a/docs/class/linuxdvb_frontend_dvbt.md
+++ b/docs/class/linuxdvb_frontend_dvbt.md
@@ -5,14 +5,6 @@ parameters.
 
 ---
 
-* Other Frontends
-  - [DVB-T/DVB-T2](class/linuxdvb_frontend_dvbt)
-  - [ATSC-T](class/linuxdvb_frontend_atsc_t)
-  - [ISDB-T](class/linuxdvb_frontend_isdb_t)
-* Back to [TV Adapters](tv_adapters) 
-
----
-
 ###Buttons
 
 The following buttons are available:
diff --git a/docs/class/linuxdvb_satconf.md b/docs/class/linuxdvb_satconf.md
index 20665e436..f8d60bbc0 100644
--- a/docs/class/linuxdvb_satconf.md
+++ b/docs/class/linuxdvb_satconf.md
@@ -1,8 +1,6 @@
 This panel tab lists all the available satellite (DVB-S/ISDB-S) configuration 
 parameters.
 
-!['Example Configuration'](static/img/doc/dvbsatconf.png)
-
 ---
 
 ###Buttons
@@ -15,18 +13,3 @@ Button         | Function
 <tvh_include>inc/common_button_table_end</tvh_include>
 
 ---
-
-* Satellite Configuration
-  - [Universal LNB](class/linuxdvb_satconf_lnbonly)
-  - [2 Port](class/linuxdvb_satconf_2port)
-  - [4 Port](class/linuxdvb_satconf_4port)
-* Satellite Configuration (Advanced)
-  - [Advanced LNB](class/linuxdvb_satconf_advanced)
-  - [Unicable EN50494 (experimental)](class/linuxdvb_satconf_en50494)
-  - [DiseqC Rotor](class/linuxdvb_rotor)
-  - [DiSEqC Switch](class/linuxdvb_switch)
-  - [Rotor (GOTOX)](class/linuxdvb_rotor_gotox)
-  - [Rotor (USALS)](class/linuxdvb_rotor_usals)
-* Back to [TV Adapters](tv_adapters) 
-  
----
diff --git a/docs/markdown/tv_adapters.md b/docs/markdown/tv_adapters.md
index bb098fbbe..7b974be9a 100644
--- a/docs/markdown/tv_adapters.md
+++ b/docs/markdown/tv_adapters.md
@@ -21,7 +21,7 @@ Button         | Function
 
 The device tree lists the available frontends, LNB configuration and 
 so on related to your device(s) in sections. Clicking on these sections 
-will display all available parameters and various device information.
+will display available parameters and device information.
 
 !['TV Adapter params'](static/img/doc/tvadapterparams.png)
 
@@ -29,20 +29,11 @@ will display all available parameters and various device information.
 
 ---
 
-##Device Configuration Options
+###Device Configuration
 
-You will generally see the following parameters for your device(s), however 
-there are device-specific parameters too, see 
-[Device-specific Parameters](#device-specific-parameters) for a full 
-list.
+Click on an item to display more information.
 
-<tvh_class_items>linuxdvb_frontend</tvh_class_items>
-
----
-
-##Device-specific Parameters
-
-###Satellite (DVB-S/ISDB-S)
+####Satellite (DVB-S/ISDB-S)
 
 * Frontend
   - [Master](class/linuxdvb_frontend_dvbs)
@@ -60,20 +51,31 @@ list.
   - [Rotor (GOTOX)](class/linuxdvb_rotor_gotox)
   - [Rotor (USALS)](class/linuxdvb_rotor_usals)
   
----
-
-###Terrestrial (DVB-T/ATSC-T/ISDB-T)
+####Terrestrial (DVB-T/ATSC-T/ISDB-T)
 
 * Frontend
   - [DVB-T/DVB-T2](class/linuxdvb_frontend_dvbt)
   - [ATSC-T](class/linuxdvb_frontend_atsc_t)
   - [ISDB-T](class/linuxdvb_frontend_isdb_t)
-  
----
 
-###Cable (DVB-C/ATSC-C/ISDB-C)
+####Cable (DVB-C/ATSC-C/ISDB-C)
 
 * Frontend
   - [DVB-C](class/linuxdvb_frontend_dvbc)
   - [ATSC-C](class/linuxdvb_frontend_atsc_c)
   - [ISDB-C](class/linuxdvb_frontend_isdb_c)
+
+####SAT>IP (DVB-T/ATSC-T/ATSC-C/DVB-S)
+
+* [Client](class/satip_client)
+   
+* Frontend
+   - [ATSC-T](class/satip_frontend_atsc_t)
+   - [ATSC-C](class/satip_frontend_atsc_c)
+   - [DVB-T](class/satip_frontend_dvbt)
+   - [DVB-S (Master)](class/satip_frontend_dvbs)
+   - [DVB-S (Slave)](class/satip_frontend_dvbs_slave)
+   
+* [Satellite Configuration](class/satip_satconf)
+
+---
diff --git a/src/webui/static/img/doc/dvbtfrontendparams.png b/src/webui/static/img/doc/dvbtfrontendparams.png
index b0af7d8f2..cc12758d1 100644
Binary files a/src/webui/static/img/doc/dvbtfrontendparams.png and b/src/webui/static/img/doc/dvbtfrontendparams.png differ