diff options
author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2016-10-08 22:40:03 +0100 |
---|---|---|
committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2016-10-08 22:40:03 +0100 |
commit | 5369778bb9141da4e94ff400d66a924f9298c43f (patch) | |
tree | 4f1da4b627e8a5bf70c026ebe903612184b451df /doc | |
parent | 3a608c191f0eb35993e2a672adbdd5ac883f4dca (diff) | |
download | poezio-no-resource.tar.gz poezio-no-resource.tar.bz2 poezio-no-resource.tar.xz poezio-no-resource.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')
-rw-r--r-- | doc/source/commands.rst | 4 | ||||
-rw-r--r-- | doc/source/configuration.rst | 10 |
2 files changed, 3 insertions, 11 deletions
diff --git a/doc/source/commands.rst b/doc/source/commands.rst index 8c0e0d5b..64a2f033 100644 --- a/doc/source/commands.rst +++ b/doc/source/commands.rst @@ -138,7 +138,7 @@ These commands work in *any* tab. Set the value to the option in your configuration file. You can, for example, change your default nickname - by doing "/set default_nick toto" or your resource with "/set resource + by doing "/set default_nick toto" or your password with "/set password blabla". Doing so will write in the main config file, and in the main section ([Poezio]). But you can also write to another section, with ``/set bindings M-i ^i``, to a plugin configuration with ``/set mpd_client| host @@ -152,7 +152,7 @@ These commands work in *any* tab. **Usage:** ``/set_default [section] <option>`` Set the value of an option back to the default. For example, - ``/set_default resource`` will reset the ``resource`` option. + ``/set_default password`` will reset the ``password`` option. /toggle **Usage:** ``/toggle <option>`` 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]`` |