SAT>IP Server: clean/extend the doc

diff --git a/docs/html/config_misc.html b/docs/html/config_misc.html
index 6d3b37b256cb16a0794cbc8bc73cdb64278879fa..7df28ead2aecd43cea77610f1a04ce69aebfc920 100644 (file)
--- a/docs/html/config_misc.html
+++ b/docs/html/config_misc.html
@@ -133,23 +133,33 @@
 
   <br><br>
   <hr>
-  <b>SAT>IP Server</b>
+  <b>SAT&gt;IP Server</b>
   <hr>
 
-  <dd>SAT>IP Server is something like DVB network tuner. TVHeadend can
-  forward mpegts input streams including on-the-fly descramling to SAT>IP
+  <dd>SAT&gt;IP Server is something like DVB network tuner. TVHeadend can
+  forward mpegts input streams including on-the-fly descramling to SAT&gt;IP
   clients.</dd>
 
+  <dd>Only networks with the "SAT>IP Source" field set are exported
+  through the SAT&gt;IP protocol. This field is matched through the "src"
+  parameter asked from the SAT>IP client. Usually (and by default) this value is 1.
+  For satellite tuners, this value determines the satellite source (dish).
+  By specification position 1 = DiseqC AA, 2 = DiseqC AB, 3 = DiseqC BA,
+  4 = DiseqC BB, but any numbers may be used - depends on the SAT&gt;IP client.
+  Note that if you use a similar number for multiple networks, the first matched
+  network containing the mux with requested parameters will win
+  (also for unknown mux).</dd>
+
   <dl>
 
   <dt>RTSP Port
   <dd>
-  Select RTSP port (TCP) for realtime commands from SAT>IP clients. Usually
+  Select RTSP port (TCP) for realtime commands from SAT&gt;IP clients. Usually
   (as defined in the specification) this port is 554. But as extension,
   TVHeadend can use any TCP port value (which is default 9983 for non-root
-  users). But the SAT>IP client must allow to set this value (TVHeadend
+  users). But the SAT&gt;IP client must allow to set this value (TVHeadend
   client will obtain the RTSP port number automatically using the XML
-  description). If the RTSP port value is zero, the SAT>IP server
+  description). If the RTSP port value is zero, the SAT&gt;IP server
   functionality is not enabled.
 
   <dt>Subscription Weight
@@ -157,26 +167,35 @@
   Subscription weight value. Default value is 100 (standard streaming). Note
   that the default value for DVR is 300 (normal priority).
 
-  <dt>Exported DVB-T Tuners
-  <dd>
-  Exported DVB-T tuners - streaming instances.
-
-  <dt>Exported DVB-S2 Tuners
+  <dt>Descramble Services
   <dd>
-  Exported DVB-S2 tuners - streaming instances.
-
-  <dt>Exported DVB-C Tuners
-  <dd>
-  Exported DVB-C tuners - streaming instances.
+  The maximum limit of services descrambled per a mux. If zero, the
+  descrambling functionality is disabled.
 
   <dt>Muxes Handling
   <dd>
-  When SAT>IP client requests new mux configuration, tvheadend can handle it
+  When SAT&gt;IP client requests new mux configuration, tvheadend can handle it
   in three ways. The auto (0) configuration means that if the mux does not exists,
   a temporary mux is created and removed when the client closes the
   connection. The keep (1) configuration will remember all successfuly scanned muxes.
   The reject (2) configuration will reject unknown muxes.
 
+  <dt>Exported DVB-T/T2 Tuners
+  <dd>
+  Exported DVB-T/T2 tuners - streaming instances.
+
+  <dt>Exported DVB-S/S2 Tuners
+  <dd>
+  Exported DVB-S/S2 tuners - streaming instances.
+
+  <dt>Exported DVB-C/C2 Tuners
+  <dd>
+  Exported DVB-C/C2 tuners - streaming instances.
+
+  <dt>Exported ATSC/DVB-C(AnnexB) Tuners
+  <dd>
+  Exported ATSC/DVB-C(AnnexB) - streaming instances.
+
   </dl>
 
  </dl>  

diff --git a/docs/html/config_networks.html b/docs/html/config_networks.html
index 1c1221ee56295d790325b58f9c660bbd2c73452d..633c00948f2a7001efc4bd854fe9b6485d605598 100644 (file)
--- a/docs/html/config_networks.html
+++ b/docs/html/config_networks.html
@@ -87,10 +87,16 @@ Buttons have the following functions:
                <dt><b>Ignore Provider's Channel Numbers</b>
                <dd>Do not use the local channel numbers defined by provider.
 <p>
-               <dt><b>SAT>IP Source Number</b>
-               <dd>For DVB-S SAT>IP source means the LNB selection. 0 = do not use; 1 = AA; 2 = AB; 3 = BA; 4 = BB.
-                   Other values are allowed too (but clients have to support them).
-                   For other network types (DVB-T, DVB-C), use value 1 to enable SAT>IP for this network.
+               <dt><b>SAT&gt;IP Source Number</b>
+               <dd>This field is matched through the "src" parameter asked from the
+                   SAT&gt;IP client. Usually (and by default) this value is 1.
+                    For satellite tuners, this value determines the satellite source (dish).
+                    By specification position 1 = DiseqC AA, 2 = DiseqC AB, 3 = DiseqC BA,
+                    4 = DiseqC BB, but any numbers may be used - depends on the SAT&gt;IP
+                    client. Note that if you use same number for multiple networks,
+                    the first matched network containing the mux with requested parameters
+                    will win (also for unknown mux). If this field is set to zero,
+                    the network cannot be used by the SAT&gt;IP server.</dd>
 <p>
                <dt><b>EIT Local Time</b>
                <dd>EPG (EIT) events uses local time instead UTC.