From 7a09069247e36c1fa3d600e6566488ad3ad582d1 Mon Sep 17 00:00:00 2001 From: ccErrors Date: Thu, 29 Jun 2023 12:35:06 +0200 Subject: [PATCH 1/3] fix #64 --- .../1.astra/2.admin-guide/3.settings/1.general.md | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/content/1.astra/2.admin-guide/3.settings/1.general.md b/content/1.astra/2.admin-guide/3.settings/1.general.md index 43eec8d2..37a34d04 100644 --- a/content/1.astra/2.admin-guide/3.settings/1.general.md +++ b/content/1.astra/2.admin-guide/3.settings/1.general.md @@ -2,7 +2,6 @@ title: "General Settings" date: 2023-03-23 --- - General Settings in Astra encompass a collection of essential configuration options that allow you to customize and optimize your software setup. These settings ensure a seamless streaming experience by managing aspects like InfluxDB integration, HTTP Server Settings, and Default Stream Options. ## InfluxDB Integration @@ -55,6 +54,14 @@ These settings are global for all streams (unless overridden in the stream setti - **Use multithreading for UDP receiving and transmitting** - launch separate threads for processing UDP sockets, turned on by the default - **Bind DVB adapters by MAC** - use DVB MAC addresses to bind configured adapters to the system device +## Import + +![Image](https://cdn.cesbo.com/help/astra/admin-guide/settings/general/import.png) + +This tab is used to import scripts or configuration files to Astra. +You can also import an m3u file. Copy its contents to the window and click 'import` + ::alert -After saving the general settings, Astra restarts -:: + +| After saving the general settings, Astra restarts | +| :-----------------------------------------------: | From 15f9b6181630fb60fb3985535c6b817385b2b923 Mon Sep 17 00:00:00 2001 From: ccErrors Date: Thu, 29 Jun 2023 12:36:37 +0200 Subject: [PATCH 2/3] add line --- content/1.astra/2.admin-guide/3.settings/1.general.md | 1 + 1 file changed, 1 insertion(+) diff --git a/content/1.astra/2.admin-guide/3.settings/1.general.md b/content/1.astra/2.admin-guide/3.settings/1.general.md index 37a34d04..1bc22956 100644 --- a/content/1.astra/2.admin-guide/3.settings/1.general.md +++ b/content/1.astra/2.admin-guide/3.settings/1.general.md @@ -2,6 +2,7 @@ title: "General Settings" date: 2023-03-23 --- + General Settings in Astra encompass a collection of essential configuration options that allow you to customize and optimize your software setup. These settings ensure a seamless streaming experience by managing aspects like InfluxDB integration, HTTP Server Settings, and Default Stream Options. ## InfluxDB Integration From 66204f918ff4c6a7a46eab7b62715a795fc98457 Mon Sep 17 00:00:00 2001 From: ccErrors Date: Thu, 29 Jun 2023 12:37:48 +0200 Subject: [PATCH 3/3] return alert --- content/1.astra/2.admin-guide/3.settings/1.general.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/content/1.astra/2.admin-guide/3.settings/1.general.md b/content/1.astra/2.admin-guide/3.settings/1.general.md index 1bc22956..5ba894e6 100644 --- a/content/1.astra/2.admin-guide/3.settings/1.general.md +++ b/content/1.astra/2.admin-guide/3.settings/1.general.md @@ -63,6 +63,5 @@ This tab is used to import scripts or configuration files to Astra. You can also import an m3u file. Copy its contents to the window and click 'import` ::alert - -| After saving the general settings, Astra restarts | -| :-----------------------------------------------: | +After saving the general settings, Astra restarts +::