Merge to 2.4.0

.versionrc.js

@@ -0,0 +1,27 @@
+const tracker = {
+  filename: "Version",
+  updater: require("./Scripts/standard-version-updater.js")
+}
+
+module.exports = {
+  tagPrefix: "SOGo-",
+  issueUrlFormat: "https://www.sogo.nu/bugs/view.php?id={{id}}",
+  compareUrlFormat: "{{host}}/{{owner}}/{{repository}}/compare/{{previousTag}}...{{currentTag}}",
+  types: [
+    {type: "feat",     section: "Features"},
+    {type: "refactor", section: "Enhancements"},
+    {type: "perf",     section: "Enhancements"},
+    {type: "i18n",     section: "Localization"},
+    {type: "fix",      section: "Bug Fixes"},
+    {type: "chore",    hidden:  true},
+    {type: "docs",     hidden:  true},
+    {type: "style",    hidden:  true},
+    {type: "test",     hidden:  true}
+  ],
+  skip: {
+    commit: true,
+    tag: true
+  },
+  packageFiles: [tracker],
+  bumpFiles: [tracker]
+}

Documentation/SOGoInstallationGuide.asciidoc

@@ -1642,10 +1642,16 @@ are:
 |D |SOGoSMTPServer
 |The DNS name or IP address of the SMTP server used when
 _SOGoMailingMechanism_ is set to `smtp`.
+Supported formats are: `smtp://domain:port`, `smtps://domain`,
+`domain:port`, `smtp://domain:port/?tls=YES`. Using the option
+`tls=YES` will enforce using STARTTLS smtp connections. Thus,
+`smtp://localhost:587/?tls=YES` would use the default MUA port
+on localhost with STARTTLS enforced.
 
 |D |SOGoSMTPAuthenticationType
 |Activate SMTP authentication and specifies which type is in use.
-Current, only `PLAIN` is supported and other values will be ignored.
+Current, only `PLAIN` is supported and other values will cause
+the authentication to fail.
 
 |S |WOSendMail
 |The path of the sendmail binary.
@@ -2214,7 +2220,7 @@ like this:
     SOGoTrashFolderName = Trash;
     SOGoJunkFolderName = Junk;
     SOGoMailingMechanism = smtp;
-    SOGoSMTPServer = 127.0.0.1;
+    SOGoSMTPServer = "smtp://127.0.0.1";
     SOGoUserSources = (
         {
             type = ldap;

Documentation/docinfo.xml

@@ -1,7 +1,7 @@
 <!-- TODO have the build system take care of this  -->
-<releaseinfo>Version 2.3.23 - October 2017</releaseinfo>
-<subtitle>for version 2.3.23</subtitle>
-<date>2017-10-18</date>
+<releaseinfo>Version 2.4.0 - March 2021</releaseinfo>
+<subtitle>for version 2.4.0</subtitle>
+<date>2021-03-31</date>
 
 <legalnotice>
   <para>Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License".</para>

Documentation/includes/global-attributes.asciidoc

@@ -13,6 +13,6 @@
 
 // TODO have the build system take care of this
 
-:release_version: 2.3.23
+:release_version: 2.4.0
 
 // vim: set syntax=asciidoc tabstop=2 shiftwidth=2 expandtab: