From 8e5353e8b289c3b24de89ee54d990121f5af5994 Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 23 Oct 2023 14:30:39 +0800 Subject: [PATCH] Update --- .../2022-04-09-SRS-Stack-Tutorial.md | 2 +- i18n/zh-cn/docusaurus-plugin-content-pages/license.md | 4 +--- src/pages/license.md | 5 +---- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/i18n/en-us/docusaurus-plugin-content-blog/2022-04-09-SRS-Stack-Tutorial.md b/i18n/en-us/docusaurus-plugin-content-blog/2022-04-09-SRS-Stack-Tutorial.md index 8cd92a07..cf2f2df0 100644 --- a/i18n/en-us/docusaurus-plugin-content-blog/2022-04-09-SRS-Stack-Tutorial.md +++ b/i18n/en-us/docusaurus-plugin-content-blog/2022-04-09-SRS-Stack-Tutorial.md @@ -44,7 +44,7 @@ After the droplet is created, open `http://your_public_ipv4/mgmt/` in the browse We have bellow services running in the SRS droplet: -* [SRS Server](https://github.com/ossrs/srs): SRS is a simple, high efficiency and realtime video server, supports RTMP, WebRTC, HLS, HTTP-FLV and SRT. We have both SRS 4.0 and 5.0 images installed. SRS is the media server engine, licensed under MIT or MulanPSL-2.0([compatible with Apache-2.0](https://www.apache.org/legal/resolved.html#category-a)). +* [SRS Server](https://github.com/ossrs/srs): SRS is a simple, high efficiency and realtime video server, supports RTMP, WebRTC, HLS, HTTP-FLV and SRT. We have both SRS 4.0 and 5.0 images installed. SRS is the media server engine, licensed under MIT. * [SRS Stack](https://github.com/ossrs/srs-stack): A lightweight open-source video cloud based on Nodejs, SRS, FFmpeg, WebRTC, etc. SRS-Stack acts as the framework of a video streaming service, it's also open source, licensed under MIT. * [FFmpeg](https://ffmpeg.org/): A complete, cross-platform solution to record, convert and stream audio and video. FFmpeg is used as restreaming or transcoding, and many other stream processing features. * Other infrastructure like [Docker](https://docker.io/), [Redis](https://redis.io/), [NGINX](https://nginx.org/), [Prometheus](https://prometheus.io/) and [Certbot](https://certbot.eff.org/), to run dependent services as docker container, allow checking and upgrading to stable versions. diff --git a/i18n/zh-cn/docusaurus-plugin-content-pages/license.md b/i18n/zh-cn/docusaurus-plugin-content-pages/license.md index addd78bf..9632b793 100644 --- a/i18n/zh-cn/docusaurus-plugin-content-pages/license.md +++ b/i18n/zh-cn/docusaurus-plugin-content-pages/license.md @@ -14,9 +14,7 @@ SRS用到了一些第三方库，可能是有自己的LICENSE，这个WIKI介绍 [SPDX](https://spdx.org/ids/)是Linux基金会的规范，被[POCO](https://github.com/pocoproject/poco/blob/master/LICENSE)和 [Linux Kernel](https://www.kernel.org/doc/html/latest/process/license-rules.html#license-identifier-syntax)等广泛使用。 -`SRS v5+`默认授权是[MIT](https://github.com/ossrs/srs/blob/develop/LICENSE)，你也可以选择[MIT](https://github.com/ossrs/srs/blob/develop/LICENSE) -或[MulanPSL-2.0](https://spdx.org/licenses/MulanPSL-2.0.html)协议。[MulanPSL-2.0](https://spdx.org/licenses/MulanPSL-2.0.html) -是兼容Apache-2.0协议，详细请看[这里](https://www.apache.org/legal/resolved.html#category-a)。 +`SRS v5+`授权是[MIT](https://github.com/ossrs/srs/blob/develop/LICENSE)。 ## Library diff --git a/src/pages/license.md b/src/pages/license.md index 3a15318d..d06e5bd8 100644 --- a/src/pages/license.md +++ b/src/pages/license.md @@ -15,10 +15,7 @@ This wiki describes the licenses about SRS and related libraries. to make it more simple, by following the specification of [SPDX](https://spdx.org/ids/), which is also used by [POCO](https://github.com/pocoproject/poco/blob/master/LICENSE) and [Linux Kernel](https://www.kernel.org/doc/html/latest/process/license-rules.html#license-identifier-syntax), etc. -`SRS v5+`, by default, uses the [MIT](https://github.com/ossrs/srs/blob/develop/LICENSE) license. You can choose either -the [MIT](https://github.com/ossrs/srs/blob/develop/LICENSE) or [MulanPSL-2.0](https://spdx.org/licenses/MulanPSL-2.0.html) -license. The [MulanPSL-2.0](https://spdx.org/licenses/MulanPSL-2.0.html) license is compatible with the Apache-2.0 -license. For more details, please see [here](https://www.apache.org/legal/resolved.html#category-a). +`SRS v5+` uses the [MIT](https://github.com/ossrs/srs/blob/develop/LICENSE) license. ## Library