Merge branch 'master' of https://git.louiz.org/poezio

1 files changed, 51 insertions, 0 deletions

diff --git a/doc/en/configure.txt b/doc/en/configure.txt
index 36a49206..e5098da1 100644
--- a/doc/en/configure.txt
+++ b/doc/en/configure.txt
@@ -275,6 +275,10 @@ section of this documentation.
   the contact names). If there is no contact name, the JID will still be
   displayed.
 
+*roster_show_offline*:: false
+
+  Set this to true if you want to display the offline contacts too.
+
 *beep_on*:: highlight private
 
   The terminal can beep on various event. Put the event you want in a list
@@ -387,6 +391,17 @@ section of this documentation.
   You can specify another directory to use. It will be created if it does not
   exist.
 
+*exec_remote*:: false
+
+  If this is set to true, poezio will try to send the commands to a FIFO
+  instead of executing them locally. This is to be used in conjunction with
+  ssh and the daemon.py file. See the /link documentation for details.
+
+*remote_fifo_path*:: ./poezio.fifo
+
+  The path of the FIFO used to send the commands (see the exec_remote option).
+
+
 Optional section options
 ~~~~~~~~~~~~~~~~~~~~~~~~
 These option can appear in optional sections. These section are named
@@ -420,8 +435,44 @@ foo = true
 
 *display_user_color_in_join_part*:: false
 
+  If set to true, the color of the nick will be used in MUCs information
+  messages, instead of the default color from the theme.
+
+*show_useless_separator*:: false
+
+  If true, show the separator in a chat room, even if no one spoke.
+
 *hide_exit_join*:: -1
 
+  Exact same thing than hide_status_change, except that it concerns
+  the quit message, and that it will be hidden only if the value is 0.
+  Default setting means:
+   - all quit and join notices will be displayed
+
 *hide_status_change*:: 120
 
+  Set a number for this setting.
+  The join OR status-change notices will be
+  displayed according to this number.
+  -1: the notices will ALWAYS be displayed
+   0: the notices will NEVER be displayed
+   n: On any other number, the notices will only be displayed
+      if the user involved has talked since the last n seconds
+  if the value is incorrect, -1 is assumed
+  Default setting means :
+   - status changes won't be displayed unless
+     the user talked in the last 2 minutes
+
 *highlight_on*:: [empty]
+
+  a list of words (separated by a colon (:)) that will be
+  highlighted if said by someone on a room
+
+*ignore_private*:: false
+
+    Ignore private messages sent from this room.
+
+*private_auto_response*:: "Not in private, please."
+
+    The message you want to be sent when someone tries to message you.
+