diff options
| author | Maxime Buquet <pep@bouah.net> | 2018-12-16 17:59:59 +0100 |
|---|---|---|
| committer | Maxime Buquet <pep@bouah.net> | 2018-12-16 17:59:59 +0100 |
| commit | 8a23706b72a0f19405581e20c132fb442a960250 (patch) | |
| tree | 6c8cc5297ed16f5f348825b85f9e7d6ac504ed00 /doc/source | |
| parent | c3e9130d7d8bb290118b95deba2b7168c0dc8647 (diff) | |
| parent | 9b25abf9fbe8781dffa054d6483725c13df74a16 (diff) | |
| download | poezio-8a23706b72a0f19405581e20c132fb442a960250.tar.gz poezio-8a23706b72a0f19405581e20c132fb442a960250.tar.bz2 poezio-8a23706b72a0f19405581e20c132fb442a960250.tar.xz poezio-8a23706b72a0f19405581e20c132fb442a960250.zip | |
Merge branch 'invite_impromptu' into 'master'
Invite impromptu
See merge request poezio/poezio!2
Diffstat (limited to 'doc/source')
| -rw-r--r-- | doc/source/commands.rst | 15 | ||||
| -rw-r--r-- | doc/source/configuration.rst | 9 |
2 files changed, 24 insertions, 0 deletions
diff --git a/doc/source/commands.rst b/doc/source/commands.rst index f28f992f..054f6ccd 100644 --- a/doc/source/commands.rst +++ b/doc/source/commands.rst @@ -218,6 +218,13 @@ These commands work in *any* tab. /invitations Show the pending invitations. + /impromptu + **Usage:** ``/impromptu <jid> [jid ..]`` + + Invite specified JIDs into a newly created room. + + .. versionadded:: 0.13 + /activity **Usage:** ``/activity [<general> [specific] [comment]]`` @@ -472,6 +479,14 @@ Normal Conversation tab commands Get the software version of the current interlocutor (usually its XMPP client and Operating System). + /invite + **Usage:** ``/invite <jid> [jid ..]`` + + Invite specified JIDs, with this contact, into a newly + created room. + + .. versionadded:: 0.13 + .. _rostertab-commands: Contact list tab commands diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst index 6baa6a27..da6d7954 100644 --- a/doc/source/configuration.rst +++ b/doc/source/configuration.rst @@ -81,6 +81,15 @@ and certificate validation. you know what you are doing, see the :ref:`ciphers` dedicated section for more details. + default_muc_service + + **Default value:** ``[empty]`` + + If specified, will be used instead of the MUC service provided by + the user domain. + + .. versionadded:: 0.13 + force_encryption **Default value:** ``true`` |