Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox

# Conflicts:
#	README.md
#	management/mailconfig.py
#	setup/mail-users.sh

management/backup.py

@@ -25,7 +25,7 @@ from exclusiveprocess import Lock
 from utils import load_environment, shell, wait_for_service
 
 def backup_status(env):
-	# If backups are dissbled, return no status.
+	# If backups are disabled, return no status.
 	config = get_backup_config(env)
 	if config["target"] == "off":
 		return { }

management/dns_update.py

@@ -24,7 +24,7 @@ from ssl_certificates import get_ssl_certificates, check_certificate
 
 # From https://stackoverflow.com/questions/3026957/how-to-validate-a-domain-name-using-regex-php/16491074#16491074
 # This regular expression matches domain names according to RFCs, it also accepts fqdn with an leading dot,
-# underscores, as well as asteriks which are allowed in domain names but not hostnames (i.e. allowed in
+# underscores, as well as asterisks which are allowed in domain names but not hostnames (i.e. allowed in
 # DNS but not in URLs), which are common in certain record types like for DKIM.
 DOMAIN_RE = r"^(?!\-)(?:[*][.])?(?:[a-zA-Z\d\-_]{0,62}[a-zA-Z\d_]\.){1,126}(?!\d+)[a-zA-Z\d_]{1,63}(\.?)$"
 
@@ -458,7 +458,7 @@ def build_sshfp_records():
 
 	# Get our local fingerprints by running ssh-keyscan. The output looks
 	# like the known_hosts file: hostname, keytype, fingerprint. The order
-	# of the output is arbitrary, so sort it to prevent spurrious updates
+	# of the output is arbitrary, so sort it to prevent spurious updates
 	# to the zone file (that trigger bumping the serial number). However,
 	# if SSH has been configured to listen on a nonstandard port, we must
 	# specify that port to sshkeyscan.

management/mail_log.py

@@ -330,7 +330,7 @@ def scan_mail_log(env):
 
     if collector["other-services"] and VERBOSE and False:
         print_header("Other services")
-        print("The following unkown services were found in the log file.")
+        print("The following unknown services were found in the log file.")
         print(" ", *sorted(collector["other-services"]), sep='\n│ ')
 
 

management/ssl_certificates.py

@@ -446,7 +446,7 @@ def install_cert(domain, ssl_cert, ssl_chain, env, raw=False):
 			cert_status += " " + cert_status_details
 		return cert_status
 
-	# Copy certifiate into ssl directory.
+	# Copy certificate into ssl directory.
 	install_cert_copy_file(fn, env)
 
 	# Run post-install steps.

management/templates/index.html

@@ -73,7 +73,7 @@
           filter: invert(100%) hue-rotate(180deg);
         }
 
-        /* Override Boostrap theme here to give more contrast. The black turns to white by the filter. */
+        /* Override Bootstrap theme here to give more contrast. The black turns to white by the filter. */
         .form-control {
           color: black !important;
         }

management/templates/system-backup.html

@@ -361,7 +361,7 @@ function init_inputs(target_type) {
 }
 
 // Return a two-element array of the substring preceding and the substring following
-// the first occurence of separator in string. Return [undefined, string] if the
+// the first occurrence of separator in string. Return [undefined, string] if the
 // separator does not appear in string.
 const split1_rest = (string, separator) => {
     const index = string.indexOf(separator);