From 1ede5dc3011c72a57e9b3086bf0769c40846e57f Mon Sep 17 00:00:00 2001 From: Leigh Morresi Date: Sun, 8 Mar 2020 00:42:38 +0100 Subject: [PATCH 1/3] Grammatical and spelling mistake fixes. --- setup/templates/steps/compose/02_services.html | 2 +- setup/templates/steps/config.html | 10 +++++----- setup/templates/steps/flavor.html | 4 ++-- setup/templates/steps/stack/02_services.html | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/setup/templates/steps/compose/02_services.html b/setup/templates/steps/compose/02_services.html index a78a3f62..13502b8d 100644 --- a/setup/templates/steps/compose/02_services.html +++ b/setup/templates/steps/compose/02_services.html @@ -1,4 +1,4 @@ -{% call macros.panel("info", "Step 3 - pick some features") %} +{% call macros.panel("info", "Step 3 - Pick some features") %}

Mailu comes with multiple base features, including a specific admin interface, Web email clients, antispam, antivirus, etc. In this section you can enable the services to you liking.

diff --git a/setup/templates/steps/config.html b/setup/templates/steps/config.html index b3e57e22..d6526eeb 100644 --- a/setup/templates/steps/config.html +++ b/setup/templates/steps/config.html @@ -8,7 +8,7 @@ have been Before starting some variables must be set

+

Before starting, some variables must be set.

@@ -16,8 +16,8 @@ have been
-

In the next sections we need to set the postmaster address. This is a combination from the postmaster local part and the main mail domain. -The main mail domain is also used as "server display name". This is the way the SMTP server identifies himself when connecting to others. +

In the following sections we need to set the postmaster address. This is a combination of the postmaster local part and the main mail domain. +The main mail domain is also used as "server display name". This is the way the SMTP server identifies itself when connecting to others. The Postmaster will get an e-mail address <postmaster>@<main_domain>. This address will receive the DMARC "rua" and "ruf" reports. Or in plain english: if receivers start to classify your mail as spam, this postmaster will be informed.

@@ -26,7 +26,7 @@ Or in plain english: if receivers start to classify your mail as spam, this post Main mail domain and server display name. - @@ -48,7 +48,7 @@ Or in plain english: if receivers start to classify your mail as spam, this post
-

/ minute

diff --git a/setup/templates/steps/flavor.html b/setup/templates/steps/flavor.html index a77b0215..9ef16aa0 100644 --- a/setup/templates/steps/flavor.html +++ b/setup/templates/steps/flavor.html @@ -1,9 +1,9 @@ -{% call macros.panel("info", "Step 1 - pick a flavor") %} +{% call macros.panel("info", "Step 1 - Pick a flavor") %}

Mailu comes in multiple "flavors". It was originally designed to run on top of Docker Compose but now offers multiple options including Docker Stack, Rancher, Kubernetes.

Please note that "official" support, that is provided by the most active -developpers, will mostly cover Compose and Stack, while other flavors are +developers will mostly cover Compose and Stack, while other flavors are maintained by specific contributors.

diff --git a/setup/templates/steps/stack/02_services.html b/setup/templates/steps/stack/02_services.html index 4f50bb40..e5f0866c 100644 --- a/setup/templates/steps/stack/02_services.html +++ b/setup/templates/steps/stack/02_services.html @@ -1,4 +1,4 @@ -{% call macros.panel("info", "Step 3 - pick some features") %} +{% call macros.panel("info", "Step 3 - Pick some features") %}

Mailu comes with multiple base features, including a specific admin interface, Web email clients, antispam, antivirus, etc. In this section you can enable the services to you liking.

From 83b51e6597e1d318a3e13d464ae13905cacb978e Mon Sep 17 00:00:00 2001 From: Leigh Morresi <275001+dgtlmoon@users.noreply.github.com> Date: Sun, 8 Mar 2020 00:57:28 +0100 Subject: [PATCH 2/3] Place checkbox descriptions after checkboxes and labels, set italic for readability. --- setup/templates/steps/compose/02_services.html | 15 +++++++++------ setup/templates/steps/stack/02_services.html | 15 +++++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/setup/templates/steps/compose/02_services.html b/setup/templates/steps/compose/02_services.html index 13502b8d..d89ab32b 100644 --- a/setup/templates/steps/compose/02_services.html +++ b/setup/templates/steps/compose/02_services.html @@ -26,34 +26,37 @@ the security implications caused by such an increase of attack surface.

-

An antivirus server helps fighting large scale virus spreading campaigns that leverage -e-mail for initial infection. Make sure that you have at least 1GB of memory for ClamAV to -load its signature database.

+ + An antivirus server helps fighting large scale virus spreading campaigns that leverage + e-mail for initial infection. Make sure that you have at least 1GB of memory for ClamAV to + load its signature database.
-

A Webdav server exposes a Dav interface over HTTP so that clients can store -contacts or calendars using the mail account.

+ + A Webdav server exposes a Dav interface over HTTP so that clients can store + contacts or calendars using the mail account.
-

Fetchmail allows to download mails over IMAP/POP3 and uploads it your Mailu mailbox.

+ + Fetchmail allows to download mails over IMAP/POP3 and uploads it your Mailu mailbox.
diff --git a/setup/templates/steps/stack/02_services.html b/setup/templates/steps/stack/02_services.html index e5f0866c..4f515601 100644 --- a/setup/templates/steps/stack/02_services.html +++ b/setup/templates/steps/stack/02_services.html @@ -22,34 +22,37 @@ the security implications caused by such an increase of attack surface.

-

An antivirus server helps fighting large scale virus spreading campaigns that leverage -e-mail for initial infection. Make sure that you have at least 1GB of memory for ClamAV to -load its signature database.

+ + An antivirus server helps fighting large scale virus spreading campaigns that leverage + e-mail for initial infection. Make sure that you have at least 1GB of memory for ClamAV to + load its signature database.
-

A Webdav server exposes a Dav interface over HTTP so that clients can store -contacts or calendars using the mail account.

+ + A Webdav server exposes a Dav interface over HTTP so that clients can store + contacts or calendars using the mail account.
-

Fetchmail allows to download mails over IMAP/POP3 and uploads it your Mailu mailbox.

+ + Fetchmail allows to download mails over IMAP/POP3 and uploads it your Mailu mailbox.
From 5ab47864e78fd976bc32fd943cc1a171005492da Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Thu, 12 Mar 2020 19:43:57 +0100 Subject: [PATCH 3/3] Clarify fetchmail description text in setup --- setup/templates/steps/compose/02_services.html | 2 +- setup/templates/steps/stack/02_services.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/templates/steps/compose/02_services.html b/setup/templates/steps/compose/02_services.html index d89ab32b..20d4d7cb 100644 --- a/setup/templates/steps/compose/02_services.html +++ b/setup/templates/steps/compose/02_services.html @@ -56,7 +56,7 @@ the security implications caused by such an increase of attack surface.

Enable fetchmail - Fetchmail allows to download mails over IMAP/POP3 and uploads it your Mailu mailbox. + Fetchmail allows users to retrieve mail from an external mail-server via IMAP/POP3 and puts it in their inbox. diff --git a/setup/templates/steps/stack/02_services.html b/setup/templates/steps/stack/02_services.html index 4f515601..3f5186b0 100644 --- a/setup/templates/steps/stack/02_services.html +++ b/setup/templates/steps/stack/02_services.html @@ -52,7 +52,7 @@ the security implications caused by such an increase of attack surface.

Enable fetchmail - Fetchmail allows to download mails over IMAP/POP3 and uploads it your Mailu mailbox. + Fetchmail allows users to retrieve mail from an external mail-server via IMAP/POP3 and puts it in their inbox.