self-hosted/Mailu
1
0
Fork 0
mirror of https://github.com/Mailu/Mailu.git synced 2025-06-04 23:27:34 +02:00
Code Issues Releases Activity

Merge #1397

Browse Source 
1397: Minor doc fixes r=Nebukadneza a=dgtlmoon

## What type of PR?

Documentation cleanup for the 'Mailu' setup at https://setup.mailu.io/1.7/

## What does this PR do?

Fixes spelling errors, grammatical mistakes and minor relocation of checkbox description text and styling, overall big readability improvement in the setup helper.


Co-authored-by: Leigh Morresi <dgtlmoon@gmail.com>
Co-authored-by: Leigh Morresi <275001+dgtlmoon@users.noreply.github.com>
Co-authored-by: Dario Ernst <dario@kanojo.de>
This commit is contained in:
bors[bot] 2020-03-13 11:55:46 +00:00 committed by GitHub
commit 0a9f27a962
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
setup/templates/steps/compose/02_services.html
View File

@ -1,4 +1,4 @@
{% call macros.panel("info", "Step 3 - pick some features") %}
{% call macros.panel("info", "Step 3 - Pick some features") %}
<p>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.</p>
@ -26,34 +26,37 @@ the security implications caused by such an increase of attack surface.<p>
</div>
</div>
<p>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.</p>
<div class="form-check form-check-inline">
<label class="form-check-label">
<input class="form-check-input" type="checkbox" name="antivirus_enabled" value="clamav">
Enable the antivirus service
</label>
<i>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.</i>
</div>
<p>A Webdav server exposes a Dav interface over HTTP so that clients can store
contacts or calendars using the mail account.</p>
<div class="form-check form-check-inline">
<label class="form-check-label">
<input class="form-check-input" type="checkbox" name="webdav_enabled" value="radicale">
Enable the webdav service
</label>
<i>A Webdav server exposes a Dav interface over HTTP so that clients can store
contacts or calendars using the mail account.</i>
</div>
<p>Fetchmail allows to download mails over IMAP/POP3 and uploads it your Mailu mailbox.</p>
<div class="form-check form-check-inline">
<label class="form-check-label">
<input class="form-check-input" type="checkbox" name="fetchmail_enabled" value="true">
Enable fetchmail
</label>
<i>Fetchmail allows users to retrieve mail from an external mail-server via IMAP/POP3 and puts it in their inbox.</i>
</div>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>

10
setup/templates/steps/config.html
View File

@ -8,7 +8,7 @@ have been <a href="https://github.com/Mailu/Mailu/blob/master/docs/swarm/master/
{% endif %}
{% call macros.panel("info", "Step 2 - Initial configuration") %}
<p>Before starting some variables must be set</p>
<p>Before starting, some variables must be set.</p>
<div class="form-group">
<label>Mailu storage path: </label>
@ -16,8 +16,8 @@ have been <a href="https://github.com/Mailu/Mailu/blob/master/docs/swarm/master/
<input class="form-control" type="text" name="root" value="/mailu" required pattern="^/[-_A-Za-z0-9]+(/[-_A-Za-z0-9]*)*">
</div>
<p>In the next sections we need to set the postmaster address. This is a combination from the <i>postmaster</i> local part and the <i>main mail domain</i>.
The <i>main mail domain</i> is also used as </i>"server display name"</i>. This is the way the SMTP server identifies himself when connecting to others.
<p>In the following sections we need to set the postmaster address. This is a combination of the <i>postmaster</i> local part and the <i>main mail domain</i>.
The <i>main mail domain</i> is also used as </i>"server display name"</i>. This is the way the SMTP server identifies itself when connecting to others.
The Postmaster will get an e-mail address &lt;postmaster&gt;@&lt;main_domain&gt;. 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.</p>
@ -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.
</label>
<!-- Validates domain name -->
<input class="form-control" type="text" name="domain" placeholder="e.g. mailu.io"
<input class="form-control" type="text" name="domain" placeholder="e.g. mailu.io"
required pattern="^([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,}$">
</div>
@ -48,7 +48,7 @@ Or in plain english: if receivers start to classify your mail as spam, this post
<div class="form-group">
<label>Authentication rate limit (per source IP address)</label>
<!-- Validates number input only -->
<p><input class="form-control" style="width: 7%; display: inline;" type="number" name="auth_ratelimit_pm"
<p><input class="form-control" style="width: 7%; display: inline;" type="number" name="auth_ratelimit_pm"
value="10" required > / minute
</p>
</div>

4
setup/templates/steps/flavor.html
View File

@ -1,9 +1,9 @@
{% call macros.panel("info", "Step 1 - pick a flavor") %}
{% call macros.panel("info", "Step 1 - Pick a flavor") %}
<p>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.</p>
<p>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.</p>
<div class="radio">

17
setup/templates/steps/stack/02_services.html
View File

@ -1,4 +1,4 @@
{% call macros.panel("info", "Step 3 - pick some features") %}
{% call macros.panel("info", "Step 3 - Pick some features") %}
<p>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.</p>
@ -22,34 +22,37 @@ the security implications caused by such an increase of attack surface.<p>
</div>
</div>
<p>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.</p>
<div class="form-check form-check-inline">
<label class="form-check-label">
<input class="form-check-input" type="checkbox" name="antivirus_enabled" value="clamav">
Enable the antivirus service
</label>
<i>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.</i>
</div>
<p>A Webdav server exposes a Dav interface over HTTP so that clients can store
contacts or calendars using the mail account.</p>
<div class="form-check form-check-inline">
<label class="form-check-label">
<input class="form-check-input" type="checkbox" name="webdav_enabled" value="radicale">
Enable the webdav service
</label>
<i>A Webdav server exposes a Dav interface over HTTP so that clients can store
contacts or calendars using the mail account.</i>
</div>
<p>Fetchmail allows to download mails over IMAP/POP3 and uploads it your Mailu mailbox.</p>
<div class="form-check form-check-inline">
<label class="form-check-label">
<input class="form-check-input" type="checkbox" name="fetchmail_enabled" value="true">
Enable fetchmail
</label>
<i>Fetchmail allows users to retrieve mail from an external mail-server via IMAP/POP3 and puts it in their inbox.</i>
</div>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>