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 50300dbd05e0d859953ac4ef277c0c50f925b48a..68b140a38a7c76dc4152e92f1971f0783c492f12 100644 (file)
--- 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 a81d84aa032647497ae879862908e99dc858146d..57196b7f7b00bea188bd126507f9dd65ae662041 100644 (file)
--- 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.