From 163b1a297ef65f2157765170c1ef277ec93e2913 Mon Sep 17 00:00:00 2001 From: jvolkenant Date: Sat, 23 Mar 2024 05:49:24 -0700 Subject: [PATCH 1/2] Silence "wal" output on setup using hide_output (#2368) --- setup/webmail.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/webmail.sh b/setup/webmail.sh index 68042789..3cff1416 100755 --- a/setup/webmail.sh +++ b/setup/webmail.sh @@ -217,7 +217,7 @@ sed -i.miabold 's/^[^#]\+.\+PRAGMA journal_mode = WAL.\+$/#&/' \ # Because Roundcube wants to set the PRAGMA we just deleted from the source, we apply it here # to the roundcube database (see https://github.com/roundcube/roundcubemail/issues/8035) # Database should exist, created by migration script -sqlite3 $STORAGE_ROOT/mail/roundcube/roundcube.sqlite 'PRAGMA journal_mode=WAL;' | 2>&1 +hide_output sqlite3 $STORAGE_ROOT/mail/roundcube/roundcube.sqlite 'PRAGMA journal_mode=WAL;' # Enable PHP modules. phpenmod -v $PHP_VER imap From 9b450469eb8ff912ed9e909d869e3e9cb61b9646 Mon Sep 17 00:00:00 2001 From: Gio Date: Sat, 23 Mar 2024 21:04:43 +0800 Subject: [PATCH 2/2] Mail guide: OS X -> macOS (#2306) --- management/templates/mail-guide.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/management/templates/mail-guide.html b/management/templates/mail-guide.html index 0ffadbdf..5e3dc1ec 100644 --- a/management/templates/mail-guide.html +++ b/management/templates/mail-guide.html @@ -16,7 +16,7 @@

Automatic configuration

-

iOS and OS X only: Open this configuration link on your iOS device or on your Mac desktop to easily set up mail (IMAP/SMTP), Contacts, and Calendar. Your username is your whole email address.

+

iOS and macOS only: Open this configuration link on your iOS device or on your Mac desktop to easily set up mail (IMAP/SMTP), Contacts, and Calendar. Your username is your whole email address.

Manual configuration