summaryrefslogtreecommitdiffstats
path: root/matterbridge.toml.sample
diff options
context:
space:
mode:
authorPatrick Connolly <patrick.c.connolly@gmail.com>2017-10-20 14:58:39 -0400
committerWim <wim@42.be>2017-10-20 20:58:39 +0200
commit915a8fbad750622c8a08c1a0a5fa31bfd3e67ec2 (patch)
tree500fc0477c2b9ef32eb751f7a6a53922a5ce5b3f /matterbridge.toml.sample
parentd4d7fef313ab1f26779845dddebd881739a7e95a (diff)
downloadmatterbridge-msglm-915a8fbad750622c8a08c1a0a5fa31bfd3e67ec2.tar.gz
matterbridge-msglm-915a8fbad750622c8a08c1a0a5fa31bfd3e67ec2.tar.bz2
matterbridge-msglm-915a8fbad750622c8a08c1a0a5fa31bfd3e67ec2.zip
Make [general] settings default, not total override (specifically RemoteNickFormat) (#279)
* Use general settings as default, that specific protocols override. * Fixed tab formatting. * Clarified override precedence of [general] config.
Diffstat (limited to 'matterbridge.toml.sample')
-rw-r--r--matterbridge.toml.sample2
1 files changed, 1 insertions, 1 deletions
diff --git a/matterbridge.toml.sample b/matterbridge.toml.sample
index 81bf1cc9..3586977f 100644
--- a/matterbridge.toml.sample
+++ b/matterbridge.toml.sample
@@ -773,7 +773,7 @@ RemoteNickFormat="{NICK}"
###################################################################
#General configuration
###################################################################
-#Settings here override specific settings for each protocol
+# Settings here are defaults that each protocol can override
[general]
#RemoteNickFormat defines how remote users appear on this bridge
#The string "{NICK}" (case sensitive) will be replaced by the actual nick / username.