summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2011-11-03 00:09:09 +0100
committerFlorent Le Coz <louiz@louiz.org>2011-11-03 00:09:09 +0100
commitaf64505feb73592053beeb13e784379e6626b376 (patch)
tree378a70af661a498589c63ba4f9ded067aea8cedc /data
parent0872d69eb4180d8266e12299bccd08f813807bd7 (diff)
parent027b2e2148eb79b314bb9b632c823b6d814e07f3 (diff)
downloadpoezio-af64505feb73592053beeb13e784379e6626b376.tar.gz
poezio-af64505feb73592053beeb13e784379e6626b376.tar.bz2
poezio-af64505feb73592053beeb13e784379e6626b376.tar.xz
poezio-af64505feb73592053beeb13e784379e6626b376.zip
Merge remote-tracking branch 'myrtille/doc' into doc
Conflicts: doc/en/configure.txt
Diffstat (limited to 'data')
-rw-r--r--data/default_config.cfg8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/default_config.cfg b/data/default_config.cfg
index d2fe7f87..77ae34ac 100644
--- a/data/default_config.cfg
+++ b/data/default_config.cfg
@@ -112,9 +112,9 @@ alternative_nickname =
# Limit the number of messages you want to receive when the
# multiuserchat rooms send you recent history
# 0: You won't receive any
-# -1: You will receive the maximum (default)
+# -1: You will receive the maximum
# n: You will receive at most n messages
-muc_history_length = -1
+muc_history_length = 50
# set to 'true' if you want to save logs of all the messages
# in files.
@@ -149,7 +149,7 @@ beep_on = highlight private
# Theme
# If themes_dir is not set, logs will searched for in $XDG_DATA_HOME/poezio/themes,
-# i.e. in ~/.local/share/poezio/themes/. Si you should specify the directory you
+# i.e. in ~/.local/share/poezio/themes/. So you should specify the directory you
# want to use instead. This directory will be created at startup if it doesn't
# exist
themes_dir =
@@ -158,7 +158,7 @@ themes_dir =
# in the theme_dir directory.
# If the file is not found (or no filename is specified) the default
# theme will be used instead
-theme = poezio
+theme =
# if true, chat states will be sent to the people you are talking to.
# Chat states are, for example, messages informing that you are composing