From 5a7c4f48dc2e8c03ced40b476f1cf3a9383b28e6 Mon Sep 17 00:00:00 2001 From: Diego <5572928+sguinetti@users.noreply.github.com> Date: Sun, 16 Oct 2022 14:52:49 -0500 Subject: [PATCH 1/6] Update FAQ.md --- FAQ.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/FAQ.md b/FAQ.md index e34436c5e..8001e7f10 100644 --- a/FAQ.md +++ b/FAQ.md @@ -111,11 +111,12 @@ We are a community initiative and you don't need to pay anything to stay on this * A PC with Internet, video editor and recording/broadcasting app under RTMP protocol (e.g. OBS). * And a live streaming service with multibitrate (if possible). -After you have your m3u8 link, add your channel information onto the [Database](https://github.com/iptv-org/database) repository, and submit an [issue](https://github.com/iptv-org/iptv/issues/new/choose) to propose it to us. +After you have your m3u8 link, add your channel information creating or editing the id onto the [Database](https://github.com/iptv-org/database) repository. Then, submit an [issue](https://github.com/iptv-org/iptv/issues/new/choose) to propose it to us. -Note: Because this is an community repository, we need some approvals from the administrators to continue. See [discussion](https://github.com/iptv-org/iptv/discussions/8412). - -Note 2: If your television station broadcasts from other television stations, please read the *[Can I safely add an FTA channel that broadcasts PPV events or pay programming?](#Can-i-safely-add-an-fta-channel-that-broadcasts-ppv-events-or-pay-programming)* section. +Notes: +* Because this is an community repository, we need some approvals from the administrators to continue. See [discussion](https://github.com/iptv-org/iptv/discussions/8412). +* If your television station broadcasts from other television stations, please read the *[Can I safely add an FTA channel that broadcasts PPV events or pay programming?](#Can-i-safely-add-an-fta-channel-that-broadcasts-ppv-events-or-pay-programming)* section. +* You can only use the same id if you propose a mirror stream. Please do not set the same id for two different channels. See [issue](https://github.com/iptv-org/iptv/discussions/8412). Based on [#650](https://github.com/iptv-org/iptv/issues/650) and [#6654](https://github.com/iptv-org/iptv/discussions/6654) (basic information). From 590c49169d12bda1431280860d81b9aacf859c2b Mon Sep 17 00:00:00 2001 From: Diego <5572928+sguinetti@users.noreply.github.com> Date: Sun, 16 Oct 2022 14:58:12 -0500 Subject: [PATCH 2/6] Update FAQ.md --- FAQ.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/FAQ.md b/FAQ.md index 8001e7f10..7cab8cb5f 100644 --- a/FAQ.md +++ b/FAQ.md @@ -111,12 +111,12 @@ We are a community initiative and you don't need to pay anything to stay on this * A PC with Internet, video editor and recording/broadcasting app under RTMP protocol (e.g. OBS). * And a live streaming service with multibitrate (if possible). -After you have your m3u8 link, add your channel information creating or editing the id onto the [Database](https://github.com/iptv-org/database) repository. Then, submit an [issue](https://github.com/iptv-org/iptv/issues/new/choose) to propose it to us. +After you have your m3u8 link, add your channel information creating or editing the id (identifier) onto the [Database](https://github.com/iptv-org/database) repository. Then, submit an [issue](https://github.com/iptv-org/iptv/issues/new/choose) to propose it to us. -Notes: +Notes: * Because this is an community repository, we need some approvals from the administrators to continue. See [discussion](https://github.com/iptv-org/iptv/discussions/8412). * If your television station broadcasts from other television stations, please read the *[Can I safely add an FTA channel that broadcasts PPV events or pay programming?](#Can-i-safely-add-an-fta-channel-that-broadcasts-ppv-events-or-pay-programming)* section. -* You can only use the same id if you propose a mirror stream. Please do not set the same id for two different channels. See [issue](https://github.com/iptv-org/iptv/discussions/8412). +* The same id can only be used if a mirror flow is also proposed. Please do not set the same id for two different channels. See [issue](https://github.com/iptv-org/iptv/discussions/8412). Based on [#650](https://github.com/iptv-org/iptv/issues/650) and [#6654](https://github.com/iptv-org/iptv/discussions/6654) (basic information). From 980eda358b599c68b32623c07dd2a81b98f23e71 Mon Sep 17 00:00:00 2001 From: Diego <5572928+sguinetti@users.noreply.github.com> Date: Sun, 16 Oct 2022 15:11:20 -0500 Subject: [PATCH 3/6] Update FAQ.md --- FAQ.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FAQ.md b/FAQ.md index 7cab8cb5f..6d94dc77f 100644 --- a/FAQ.md +++ b/FAQ.md @@ -116,7 +116,7 @@ After you have your m3u8 link, add your channel information creating or editing Notes: * Because this is an community repository, we need some approvals from the administrators to continue. See [discussion](https://github.com/iptv-org/iptv/discussions/8412). * If your television station broadcasts from other television stations, please read the *[Can I safely add an FTA channel that broadcasts PPV events or pay programming?](#Can-i-safely-add-an-fta-channel-that-broadcasts-ppv-events-or-pay-programming)* section. -* The same id can only be used if a mirror flow is also proposed. Please do not set the same id for two different channels. See [issue](https://github.com/iptv-org/iptv/discussions/8412). +* The same id can only be used if a mirror stream is also proposed. Please do not set the same id for two different channels. See [issue](https://github.com/iptv-org/iptv/discussions/8412). Based on [#650](https://github.com/iptv-org/iptv/issues/650) and [#6654](https://github.com/iptv-org/iptv/discussions/6654) (basic information). From 54bf09527203e0cf062f2198f79bf3d8686dc73d Mon Sep 17 00:00:00 2001 From: Diego <5572928+sguinetti@users.noreply.github.com> Date: Mon, 17 Oct 2022 10:20:48 -0500 Subject: [PATCH 4/6] Update FAQ.md Co-authored-by: LaneSh4d0w --- FAQ.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FAQ.md b/FAQ.md index 6d94dc77f..57fdf3115 100644 --- a/FAQ.md +++ b/FAQ.md @@ -111,7 +111,7 @@ We are a community initiative and you don't need to pay anything to stay on this * A PC with Internet, video editor and recording/broadcasting app under RTMP protocol (e.g. OBS). * And a live streaming service with multibitrate (if possible). -After you have your m3u8 link, add your channel information creating or editing the id (identifier) onto the [Database](https://github.com/iptv-org/database) repository. Then, submit an [issue](https://github.com/iptv-org/iptv/issues/new/choose) to propose it to us. +After you have your m3u8 link, add your channel information by creating or editing the id (identifier) onto the [Database](https://github.com/iptv-org/database) repository. Then, submit an [issue](https://github.com/iptv-org/iptv/issues/new/choose) to propose it to us. Notes: * Because this is an community repository, we need some approvals from the administrators to continue. See [discussion](https://github.com/iptv-org/iptv/discussions/8412). From 9673884628c2198b8274d17bace0e195c9fbd709 Mon Sep 17 00:00:00 2001 From: Diego <5572928+sguinetti@users.noreply.github.com> Date: Mon, 17 Oct 2022 10:21:48 -0500 Subject: [PATCH 5/6] Update FAQ.md Co-authored-by: LaneSh4d0w --- FAQ.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FAQ.md b/FAQ.md index 57fdf3115..ad30c12b2 100644 --- a/FAQ.md +++ b/FAQ.md @@ -114,7 +114,7 @@ We are a community initiative and you don't need to pay anything to stay on this After you have your m3u8 link, add your channel information by creating or editing the id (identifier) onto the [Database](https://github.com/iptv-org/database) repository. Then, submit an [issue](https://github.com/iptv-org/iptv/issues/new/choose) to propose it to us. Notes: -* Because this is an community repository, we need some approvals from the administrators to continue. See [discussion](https://github.com/iptv-org/iptv/discussions/8412). +* Because this is an community repository, we need the approval from two maintainers to accept your new additions. See [discussion](https://github.com/iptv-org/iptv/discussions/8412) for further explanations. * If your television station broadcasts from other television stations, please read the *[Can I safely add an FTA channel that broadcasts PPV events or pay programming?](#Can-i-safely-add-an-fta-channel-that-broadcasts-ppv-events-or-pay-programming)* section. * The same id can only be used if a mirror stream is also proposed. Please do not set the same id for two different channels. See [issue](https://github.com/iptv-org/iptv/discussions/8412). From a8047c7f7c8b17b5ea7e2a9ed56154f274bb0ae5 Mon Sep 17 00:00:00 2001 From: Diego <5572928+sguinetti@users.noreply.github.com> Date: Mon, 17 Oct 2022 10:22:28 -0500 Subject: [PATCH 6/6] Update FAQ.md --- FAQ.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FAQ.md b/FAQ.md index ad30c12b2..188a6f679 100644 --- a/FAQ.md +++ b/FAQ.md @@ -116,7 +116,7 @@ After you have your m3u8 link, add your channel information by creating or editi Notes: * Because this is an community repository, we need the approval from two maintainers to accept your new additions. See [discussion](https://github.com/iptv-org/iptv/discussions/8412) for further explanations. * If your television station broadcasts from other television stations, please read the *[Can I safely add an FTA channel that broadcasts PPV events or pay programming?](#Can-i-safely-add-an-fta-channel-that-broadcasts-ppv-events-or-pay-programming)* section. -* The same id can only be used if a mirror stream is also proposed. Please do not set the same id for two different channels. See [issue](https://github.com/iptv-org/iptv/discussions/8412). +* The same id can only be used if a mirror stream is also proposed. Please do not set the same id for two different channels. See [PR](https://github.com/iptv-org/iptv/pull/9572). Based on [#650](https://github.com/iptv-org/iptv/issues/650) and [#6654](https://github.com/iptv-org/iptv/discussions/6654) (basic information).