diff --git a/data/settings.js b/data/settings.js
index 17d75d7f8..d68b6e4f3 100644
--- a/data/settings.js
+++ b/data/settings.js
@@ -249,7 +249,7 @@ cache fetch.
Also, attempting to fetch a specific aliased header will succeed even if
the header does not actually exist (this does NOT happen when the feature
-is disable with explicitly with [[setting,mail_cache_max_header_name_length,0]])
+is disabled with explicitly with [[setting,mail_cache_max_header_name_length,unlimited]])
Example: ([[setting,mail_cache_max_header_name_length,5]])
@@ -975,23 +975,18 @@ this setting is not configured. Options are:
tags: [ 'sieve', 'managesieve_quota' ],
plugin: 'sieve',
values: setting_types.UINT,
- default: 0,
+ default: 'unlimited',
text: `
-The maximum number of personal Sieve scripts a single user can have.
-
-Default is \`0\`, which is unlimited.`
+The maximum number of personal Sieve scripts a single user can have.`
},
sieve_quota_storage_size: {
tags: [ 'sieve', 'managesieve_storage' ],
plugin: 'sieve',
values: setting_types.SIZE,
- default: 0,
+ default: 'unlimited',
text: `
-The maximum amount of disk storage a single user's scripts may
-occupy.
-
-Default is \`0\`, which is unlimited.`
+The maximum amount of disk storage a single user's scripts may occupy.`
},
sieve_user_email: {
@@ -2148,13 +2143,13 @@ A value of \`0\` means no timeout.`
},
fts_message_max_size: {
- default: 0,
+ default: 'unlimited',
added: {
settings_fts_message_max_size_added: false,
},
plugin: 'fts',
values: setting_types.SIZE,
- text: `Maximum body size that is processed by fts. \`0\` means unlimited.`
+ text: `Maximum body size that is processed by fts.`
},
fts_decoder_tika: {
@@ -3305,7 +3300,7 @@ Maximum number of messages that can be created in a single mailbox.`
Maximum number of messages for the [[link,quota_root]]. This value is still
multiplied by [[setting,quota_message_percentage]] to get the final value
(in this mailbox or namespace). This is reported as the MESSAGE limit in IMAP
-GETQUOTA commands. Using \`0\` as the value means the same as \`unlimited\`.`
+GETQUOTA commands.`
},
quota_message_percentage: {
@@ -3523,8 +3518,7 @@ namespace inbox {
Quota storage size limit for the [[link,quota_root]]. This value is still
multiplied by [[setting,quota_storage_percentage]] and then increased by
[[setting,quota_storage_extra]] to get the final value (in this mailbox or
-namespace). This is reported as the STORAGE limit in IMAP GETQUOTA commands.
-Using \`0\` as the value means the same as \`unlimited\`.`
+namespace). This is reported as the STORAGE limit in IMAP GETQUOTA commands.`
},
quota_warning: {
@@ -6871,15 +6865,13 @@ name.`
last_valid_gid: {
seealso: [ 'first_valid_gid' ],
values: setting_types.UINT,
- default: 0,
+ default: 'unlimited',
text: `
This setting and [[setting,first_valid_gid]] specify the valid GID
range for users.
A user whose primary GID is outside this range is not allowed to log in.
-\`0\` means there is no explicit last GID.
-
If the user belongs to any supplementary groups, the corresponding IDs are
not set.`
},
@@ -6887,13 +6879,11 @@ not set.`
last_valid_uid: {
seealso: [ 'first_valid_uid' ],
values: setting_types.UINT,
- default: 0,
+ default: 'unlimited',
text: `
This setting and [[setting,first_valid_uid]] specify the valid UID
range for users.
-\`0\` means there is no explicit last UID.
-
A user whose UID is outside this range is not allowed to log in.`
},
@@ -7876,7 +7866,7 @@ This setting determines whether a shared INBOX should be visible as
mail_sort_max_read_count: {
values: setting_types.UINT,
- default: 0,
+ default: 'unlimited',
text: `
The number of slow mail accesses an IMAP SORT can perform before it returns
failure to the client.
@@ -7954,7 +7944,7 @@ enable SMTPUTF8 for LMTP and Submission sessions, and UTF8=ACCEPT for IMAP sessi
mail_vsize_bg_after_count: {
seealso: [ '[[plugin,quota]]' ],
values: setting_types.UINT,
- default: 0,
+ default: 'unlimited',
text: `
Controls transitioning mail size determination to the background instead of
synchronously during the delivery process.
@@ -10876,11 +10866,9 @@ unknown limit exists there, which will be passed back to the client.`
submission_max_recipients: {
tags: [ 'submission' ],
values: setting_types.UINT,
- default: 0,
+ default: 'unlimited',
text: `
-Maximum number of recipients accepted per connection.
-
-\`0\` means unlimited.`
+Maximum number of recipients accepted per connection.`
},
submission_relay_command_timeout: {
diff --git a/docs/installation/upgrade/2.4-to-2.4.x.md b/docs/installation/upgrade/2.4-to-2.4.x.md
index 3ded0817e..e37d7375d 100644
--- a/docs/installation/upgrade/2.4-to-2.4.x.md
+++ b/docs/installation/upgrade/2.4-to-2.4.x.md
@@ -51,9 +51,21 @@ changed to `2.4.3`.
| Setting | Old Default Value | New Default Value |
| ------- | ----------------- | ----------------- |
+| [[setting,fts_message_max_size]] | | 0 is not allowed anymore to mean unlimited
use `unlimited` instead |
+| [[setting,last_valid_gid]] | | 0 is not allowed anymore to mean unlimited
use `unlimited` instead |
+| [[setting,last_valid_uid]] | | 0 is not allowed anymore to mean unlimited
use `unlimited` instead |
| [[setting,lazy_expunge_only_last_instance]] | `no` | `yes` |
| [[setting,mail_access_groups]] | | [[setting,default_internal_group]] |
+| [[setting,mail_cache_max_header_name_length]] | | 0 is not allowed anymore to mean unlimited
use `unlimited` instead |
+| [[setting,mail_cache_max_headers_count]] | | 0 is not allowed anymore to mean unlimited
use `unlimited` instead |
+| [[setting,mail_sort_max_read_count]] | | 0 is not allowed anymore to mean unlimited
use `unlimited` instead |
+| [[setting,mail_vsize_bg_after_count]] | | 0 is not allowed anymore to mean unlimited
use `unlimited` instead |
| [[setting,passdb_default_password_scheme]] | `PLAIN` | `CRYPT` |
+| [[setting,quota_message_count]] | | 0 is not allowed anymore to mean unlimited
use `unlimited` instead |
+| [[setting,quota_storage_size]] | | 0 is not allowed anymore to mean unlimited
use `unlimited` instead |
+| [[setting,sieve_quota_script_count]] | | 0 is not allowed anymore to mean unlimited
use `unlimited` instead |
+| [[setting,sieve_quota_storage_size]] | | 0 is not allowed anymore to mean unlimited
use `unlimited` instead |
+| [[setting,submission_max_recipients]] | | 0 is not allowed anymore to mean unlimited
use `unlimited` instead |
| `maildir/mail_attachment_detection_options` | `add-flags content-type=!application/signature` | |
| `passdb_passwd_file/passdb_default_password_scheme` | `PLAIN` | `CRYPT` |
| `passdb_sql/passdb_default_password_scheme` | `PLAIN` | `CRYPT` |