summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorManos Pitsidianakis <el13635@mail.ntua.gr>2022-10-13 10:40:13 +0300
committerManos Pitsidianakis <el13635@mail.ntua.gr>2022-10-13 10:40:48 +0300
commit55ed962425ba25d2317946705ff6861a77eb770f (patch)
tree558deadac41d472c07a15960e6ebb72985da1e7d /docs
parent46a038dc68093b28b69c3af38de4dd09431efae2 (diff)
downloadmeli-55ed962425ba25d2317946705ff6861a77eb770f.zip
melib/jmap: use server_url instead of server_hostname + server_port in config
Diffstat (limited to 'docs')
-rw-r--r--docs/meli.conf.511
-rw-r--r--docs/samples/sample-config.toml10
2 files changed, 14 insertions, 7 deletions
diff --git a/docs/meli.conf.5 b/docs/meli.conf.5
index cd9dafe9..4e45c94c 100644
--- a/docs/meli.conf.5
+++ b/docs/meli.conf.5
@@ -303,18 +303,15 @@ On startup, meli should evaluate this command which if successful must only retu
.Ss JMAP only
JMAP specific options
.Bl -tag -width 36n
-.It Ic server_hostname Ar String
+.It Ic server_url Ar String
example:
-.Qq mail.example.com
+.Qq http://mail.example.com
+.Qq http://mail.example.com:8080
+.Qq https://mail.example.com
.It Ic server_username Ar String
Server username
.It Ic server_password Ar String
Server password
-.It Ic server_port Ar number
-.Pq Em optional
-The port to connect to
-.\" default value
-.Pq Em 443
.It Ic danger_accept_invalid_certs Ar boolean
.Pq Em optional
Do not validate TLS certificates.
diff --git a/docs/samples/sample-config.toml b/docs/samples/sample-config.toml
index 22a4675c..5498128d 100644
--- a/docs/samples/sample-config.toml
+++ b/docs/samples/sample-config.toml
@@ -77,6 +77,16 @@
### Gmail auto saves sent mail to Sent folder, so don't duplicate the effort:
#composing.store_sent_mail = false
#
+##[accounts."jmap account"]
+##root_mailbox = "INBOX"
+##format = "jmap"
+##server_url="http://localhost:8080"
+##server_username="user@hostname.local"
+##server_password="changeme"
+##listing.index_style = "Conversations"
+##identity = "user@hostname.local"
+##subscribed_mailboxes = ["*", ]
+##composing.send_mail = 'server_submission'
#
#[pager]
#filter = "COLUMNS=72 /usr/local/bin/pygmentize -l email"