From: Jaroslav Kysela <perex@perex.cz>
Date: Sun, 22 Mar 2015 16:18:48 +0000 (+0100)
Subject: docs: access - add network separator; channels - add streaming URLs, fixes #2697
X-Git-Tag: v4.1~236
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a7445b1f2d2c26bb29dcffc8cd5beccaa9a78907;p=thirdparty%2Ftvheadend.git

docs: access - add network separator; channels - add streaming URLs, fixes #2697
---

diff --git a/docs/html/config_access.html b/docs/html/config_access.html
index 50300dbd0..68b140a38 100644
--- a/docs/html/config_access.html
+++ b/docs/html/config_access.html
@@ -55,6 +55,7 @@ The columns have the following functions:
   <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
index a81d84aa0..57196b7f7 100644
--- 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.