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

1 files changed, 12 insertions, 1 deletions

diff --git a/data/default_config.cfg b/data/default_config.cfg
index e870941d..4188851b 100644
--- a/data/default_config.cfg
+++ b/data/default_config.cfg
@@ -10,6 +10,10 @@ server = anon.louiz.org
 # the port you'll use to connect
 port = 5222
 
+# Auto-reconnects you when you get disconnected from the server
+# defaults to false because it should not be necessary
+auto_reconnect = false
+
 # 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
@@ -174,7 +178,8 @@ show_inactive_tabs = true
 # - private (when a new private message is received, from your contacts or
 #            someone from a MUC)
 # - message (any message from a MUC)
-beep_on = highlight private
+# - invite (when you receive an invitation for joining a MUC)
+beep_on = highlight private invite
 
 
 # Theme
@@ -197,6 +202,12 @@ vertical_tab_list_size = 20
 
 vertical_tab_list_sort = desc
 
+# Show the user list at the bottom when in a MUC
+# (useful when you want to look at the bottom of the screen only)
+# possible values: desc, asc
+user_list_sort = desc
+
+
 # The nick of people who join, part, change their status, etc. in a MUC will
 # be displayed using their nick color if true.
 display_user_color_in_join_part = false