docs: access - add network separator; channels - add streaming URLs, …

…fixes #2697
tvheadend · Mar 22, 2015 · a7445b1 · a7445b1 · EricV · Mar 22, 2015
1 parent e247500
commit a7445b1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/docs/html/config_access.html b/docs/html/config_access.html
@@ -55,6 +55,7 @@
   <dd>
   IPv4 prefix for matching based on source IP address.
   If set to 0.0.0.0/0 it will match everything.
+  The multiple networks can be delimited using comma or semicolon.
 
   <dt><b>Web interface</b>
   <dd>

diff --git a/docs/html/config_channels.html b/docs/html/config_channels.html
@@ -24,6 +24,13 @@
   <dt>Play
   <dd>Direct play link using the HTTP streaming.
 
+   <dl>
+    <dt>URL to the stream using a channel name
+    <dd>http://<i>host:port</i>/play/stream/channelname/<i>channel_name</i>
+    <dt>URL to the stream using a channel number
+    <dd>http://<i>host:port</i>/play/stream/channelnumber/<i>channel_number</i>
+   </dl>
+
   <dt>Enabled
   <dd>Whether or not the mux is enabled and thus available.