summaryrefslogtreecommitdiff
path: root/doc/source/configuration.rst
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2016-10-08 22:40:03 +0100
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2016-10-08 22:40:03 +0100
commit5369778bb9141da4e94ff400d66a924f9298c43f (patch)
tree4f1da4b627e8a5bf70c026ebe903612184b451df /doc/source/configuration.rst
parent3a608c191f0eb35993e2a672adbdd5ac883f4dca (diff)
downloadpoezio-5369778bb9141da4e94ff400d66a924f9298c43f.tar.gz
poezio-5369778bb9141da4e94ff400d66a924f9298c43f.tar.bz2
poezio-5369778bb9141da4e94ff400d66a924f9298c43f.tar.xz
poezio-5369778bb9141da4e94ff400d66a924f9298c43f.zip
Remove the resource option from the configuration.no-resource
It’s considered bad practice nowadays to force a specific resource, it can lead to presence leaks or reconnection loops so should be avoided. Moreover this was already possible in the jid option, by setting it to user@domain/resource, setting it would append it a second time in that case.
Diffstat (limited to 'doc/source/configuration.rst')
-rw-r--r--doc/source/configuration.rst10
1 files changed, 1 insertions, 9 deletions
diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst
index 4a1af1eb..131915c9 100644
--- a/doc/source/configuration.rst
+++ b/doc/source/configuration.rst
@@ -110,7 +110,7 @@ Options related to account configuration, nickname…
account on a server. This is optional and useful only for some features,
like room administration or nickname registration.
The :term:`server` option will be ignored if you specify a JID (Jabber id)
- It should be in the form nickname@server.tld
+ It should be in the form nickname@server.tld or nickname@server.tld/resource
custom_host
@@ -172,14 +172,6 @@ Options related to account configuration, nickname…
through SASL External. If set, :term:`keyfile` **MUST** be set as well
in order to login.
- resource
-
- **Default value:** ``[empty]``
-
- The resource you will use. If it's empty, your resource will be chosen
- (most likely randomly) by the server. It is not recommended to use a
- resource that is easy to guess, because it can lead to presence leak.
-
rooms
**Default value:** ``[empty]``