Skip to content

Commit dc68337

Browse files
committed
upgrading: Fix various formatting nits on config-rewrite upgrading page
1 parent 793bcb8 commit dc68337

File tree

4 files changed

+26
-26
lines changed

4 files changed

+26
-26
lines changed

docs/installation/upgrade/include/2.4-converted-settings.inc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
| `event_exporter_transport` | Renamed to [[setting,event_exporter_driver]]. |
1616
| `event_exporter_transport_args` | Split off to driver-specific settings, see [[link,event_export]]. |
1717
| `event_exporter_transport_timeout` | Replaced by [[setting,http_client_request_timeout]] and [[setting,event_exporter_unix_connect_timeout]]. |
18-
| `imap_capability = +CAPA1` | Use [[setting,imap_capability]] { CAPA1 = yes } instead. |
18+
| `imap_capability = +CAPA1` | Use [[setting,imap_capability]] `{ CAPA1 = yes }` instead. |
1919
| `inet_listener { address }` | Replaced by [[setting,listen]] setting. |
2020
| `push_notification_backend` | Use [[setting,push_notification_driver]] instead. |
2121
| `mail_crypt_require_encrypted_user_key` | Replaced by [[setting,crypt_user_key_require_encrypted]], [[setting,crypt_user_key_password]] and [[setting,crypt_user_key_encryption_key]]. |
@@ -32,7 +32,7 @@
3232
| `fts` | Replaced by [[setting,fts]] named filter. |
3333
| `fts_autoindex_exclude` | Replaced by boolean property [[setting,fts_autoindex]], nested inside [[setting,mailbox]] blocks. Note that the values are inverted as compared to those in the old `fts_autoindex_exclude`. |
3434
| `fts_decoder` | Replaced by [[setting,fts_decoder_driver]] and [[setting,fts_decoder_script_socket_path]]. |
35-
| `fts_enforced` | Replaced by [[setting,fts_search_add_missing]] and [[setting,fts_search_read_fallback]] |
35+
| `fts_enforced` | Replaced by [[setting,fts_search_add_missing]] and [[setting,fts_search_read_fallback]]. |
3636
| `fts_index_timeout` | Renamed to [[setting,fts_search_timeout]]. The default value is set to `30 secs`. |
3737
| `fts_solr` | Replaced by [[setting,fts_solr_url]], [[setting,fts_solr_batch_size]], [[setting,fts_solr_soft_commit]], and [[setting,http_client_rawlog_dir]] settings. |
3838
| `fts_tika` | Replaced by [[setting,fts_decoder_driver]] and [[setting,fts_decoder_tika_url]]. |
@@ -49,10 +49,10 @@
4949
| oauth2 `timeout_msecs`, `max_idle_time_msecs`, `max_parallel_connections`, `max_pipelined_requests`, `rawlog_dir` | Replaced by `http_client_*` settings inside [[setting,oauth2]] named filter. |
5050
| oauth2 `tls_*` | Replaced by `ssl_client_*` settings inside [[setting,oauth2]] named filter. |
5151
| oauth2 `debug` | Use [[setting,log_debug]] filter instead. Example: `log_debug=category=oauth2`. |
52-
| oauth `use_grant_password` | Replaced by [[link,auth_oauth2,passdb oauth2]] `
53-
| passdb/userdb `:protected` | Renamed to `:default` |
54-
| `passdb { default_fields`, `override_fields` } | Replaced by [[setting,passdb_fields]] |
55-
| `userdb { default_fields`, `override_fields` } | Replaced by [[setting,userdb_fields]] |
52+
| oauth `use_grant_password` | Replaced by [[link,auth_oauth2,passdb oauth2]]. |
53+
| passdb/userdb `:protected` | Renamed to `:default`. |
54+
| `passdb { default_fields`, `override_fields` } | Replaced by [[setting,passdb_fields]]. |
55+
| `userdb { default_fields`, `override_fields` } | Replaced by [[setting,userdb_fields]]. |
5656
| `plugin` | All plugin settings are now global settings. |
5757
| `quota`, `quota_rule` | Split into separate [[plugin,quota,quota settings]]. |
5858
| `quota_grace` | Renamed to [[setting,quota_storage_grace]]. |

docs/installation/upgrade/include/2.4-default-settings.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
| `service/anvil/chroot` | empty | \<no value\> | Anvil is no longer chrooted. |
77
| `service/anvil/user` | $default_internal_user | \<no value\> | Anvil runs as root. |
88
| `service/auth-worker/process_limit` | 1 | 30 | |
9-
| [[setting,protocols]] | `imap pop3 lmtp` | `` | No protocols are enabled by default. |
9+
| [[setting,protocols]] | `imap pop3 lmtp` | | No protocols are enabled by default. |
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11

2-
#### Directory hashing
2+
#### Directory Hashing
33

44
If you have been using `/home/%2.256N/%u` or similar constructs:
55

66
* How to replace `%N` in new format:
77

8-
* `%2.256Nu` becomes `%{ user | md5 | substr(0, 8) % 256 | hex(2)}` to return maximum 256 different hashes in range `00..ff`.
8+
* `%2.256Nu` becomes `%{user | md5 | substr(0, 8) % 256 | hex(2)}` to return maximum 256 different hashes in range `00..ff`.
99

10-
* `%256Nu` becomes `%{ user | md5 | substr(0, 8) % 256 | hex}` to return maximum 256 different hashes in range `0..ff` (without 0-padding in the front).
10+
* `%256Nu` becomes `%{user | md5 | substr(0, 8) % 256 | hex}` to return maximum 256 different hashes in range `0..ff` (without 0-padding in the front).
1111

12-
* How to replace '%M' in new format:
12+
* How to replace `%M` in new format:
1313

1414
* `%1Mu/%2.1Mu/%u` becomes `%{user | md5 | hexlify(1)}/%{user | md5 | hexlify | substr(2,1)}/%{user}` to returns directories from `0/0/user` to
1515
`f/f/user`.
1616

17-
* There is no way to use '%H' anymore.
17+
* There is no way to use `%H` anymore.

docs/installation/upgrade/include/2.4-var-expand.inc

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ the "user" variable and applies the "domain" filter for it.
1616
| `%a` | `%{local_port}` |
1717
| `%b` | `%{remote_port}` |
1818
| `%c` | `%{secured}` |
19-
| `%d` | `%{user \| domain }` |
19+
| `%d` | `%{user \| domain}` |
2020
| `%h` | `%{home}` |
21-
| `%l` | `%{local_ip }` |
21+
| `%l` | `%{local_ip}` |
2222
| `%m` | `%{mechanism}` |
23-
| `%n` | `%{user \| username }` |
24-
| `%p` | `%{client_pid }` |
25-
| `%r` | `%{remote_ip }` |
23+
| `%n` | `%{user \| username}` |
24+
| `%p` | `%{client_pid}` |
25+
| `%r` | `%{remote_ip}` |
2626
| `%s` | `%{protocol}` |
2727
| `%u` | `%{user}` |
2828
| `%w` | `%{password}` |
@@ -33,11 +33,11 @@ the "user" variable and applies the "domain" filter for it.
3333
| ---------- | ---------- |
3434
| `%1Mu` | `%{user \| md5 \| hexlify(1)}` |
3535
| `%2.1Mu` | `%{user \| md5 \| hexlify \| substr(2,1)}` |
36-
| `%2.256N` | `%{ user \| md5 \| substr(0, 8) % 256 \| hex(2)}` |
37-
| `%256Nu` | `%{ user \| md5 \| substr(0, 8) % 256 \| hex}` |
36+
| `%2.256N` | `%{user \| md5 \| substr(0, 8) % 256 \| hex(2)}` |
37+
| `%256Nu` | `%{user \| md5 \| substr(0, 8) % 256 \| hex}` |
3838
| `%Hu` | No conversion available, use one of the syntaxes. |
39-
| `%Ln` | `%{user \| username \| lower }` |
40-
| `%Lu` | `%{user \| lower }` |
39+
| `%Ln` | `%{user \| username \| lower}` |
40+
| `%Lu` | `%{user \| lower}` |
4141
| `%Mu` | `%{user \| md5}` |
4242

4343
##### Common long variables and their replacements.
@@ -49,15 +49,15 @@ the "user" variable and applies the "domain" filter for it.
4949
| `%{lip}` | `%{local_ip}` |
5050
| `%{lport}` | `%{local_port}` |
5151
| `%{mech}` | `%{mechanism}` |
52-
| `%{orig_domain }` | `%{original_user \| domain }` |
53-
| `%{orig_username}` | `%{original_user \| username }` |
52+
| `%{orig_domain}` | `%{original_user \| domain}` |
53+
| `%{orig_username}` | `%{original_user \| username}` |
5454
| `%{orig_user}` | `%{original_user}` |
5555
| `%{real_lip}` | `%{real_local_ip}` |
56-
| `%{real_lport}` | `%{real_local_port }` |
57-
| `%{real_rip}` | `%{real_remote_ip }` |
56+
| `%{real_lport}` | `%{real_local_port}` |
57+
| `%{real_rip}` | `%{real_remote_ip}` |
5858
| `%{real_rport}` | `%{real_remote_port}` |
5959
| `%{rip}` | `%{remote_ip}` |
60-
| `%{rport}` | `%{remote_port }` |
60+
| `%{rport}` | `%{remote_port}` |
6161
| `%{service}` | `%{protocol}` |
6262

6363
##### Shared namespace variables

0 commit comments

Comments
 (0)