Mercurial > hg > nginx-site
changeset 1477:ad8a1fae0b72
Corrected example in the hls module.
author | Yaroslav Zhuravlev <yar@nginx.com> |
---|---|
date | Fri, 15 May 2015 16:13:01 +0300 |
parents | c20c2b945f8c |
children | 002216d96931 |
files | xml/en/docs/http/ngx_http_hls_module.xml xml/ru/docs/http/ngx_http_hls_module.xml |
diffstat | 2 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_hls_module.xml +++ b/xml/en/docs/http/ngx_http_hls_module.xml @@ -9,7 +9,7 @@ <module name="Module ngx_http_hls_module" link="/en/docs/http/ngx_http_hls_module.html" lang="en" - rev="5"> + rev="6"> <section id="summary"> @@ -74,21 +74,21 @@ This module is available as part of our <para> <example> -location /video/ { +location / { hls; hls_fragment 5s; hls_buffers 10 10m; hls_mp4_buffer_size 1m; hls_mp4_max_buffer_size 5m; - alias /var/video/; + root /var/video/; } </example> With this configuration, the following URIs are supported for the “<path>/var/video/test.mp4</path>” file: <example> -http://hls.example.com/video/test.mp4.m3u8?offset=1.000&start=1.000&end=2.200 -http://hls.example.com/video/test.mp4.m3u8?len=8.000 -http://hls.example.com/video/test.mp4.ts?start=1.000&end=2.200 +http://hls.example.com/test.mp4.m3u8?offset=1.000&start=1.000&end=2.200 +http://hls.example.com/test.mp4.m3u8?len=8.000 +http://hls.example.com/test.mp4.ts?start=1.000&end=2.200 </example> </para>
--- a/xml/ru/docs/http/ngx_http_hls_module.xml +++ b/xml/ru/docs/http/ngx_http_hls_module.xml @@ -9,7 +9,7 @@ <module name="Module ngx_http_hls_module" link="/ru/docs/http/ngx_http_hls_module.html" lang="ru" - rev="5"> + rev="6"> <section id="summary"> @@ -74,21 +74,21 @@ URI может принимать необязательные <para> <example> -location /video/ { +location / { hls; hls_fragment 5s; hls_buffers 10 10m; hls_mp4_buffer_size 1m; hls_mp4_max_buffer_size 5m; - alias /var/video/; + root /var/video/; } </example> В такой конфигурации для файла “<path>/var/video/test.mp4</path>” будут поддерживаться следующие URI: <example> -http://hls.example.com/video/test.mp4.m3u8?offset=1.000&start=1.000&end=2.200 -http://hls.example.com/video/test.mp4.m3u8?len=8.000 -http://hls.example.com/video/test.mp4.ts?start=1.000&end=2.200 +http://hls.example.com/test.mp4.m3u8?offset=1.000&start=1.000&end=2.200 +http://hls.example.com/test.mp4.m3u8?len=8.000 +http://hls.example.com/test.mp4.ts?start=1.000&end=2.200 </example> </para>