summary refs log tree commit diff
path: root/syweb/webclient/settings
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-11-17 10:21:51 +0000
committerMark Haines <mark.haines@matrix.org>2014-11-17 10:21:51 +0000
commit1d3ef8734cea9a1ce8befdf27db297ca70cfeee3 (patch)
tree12c7ac945749c68b81e3ae55c39dfd58ae824bf0 /syweb/webclient/settings
parentMerge PDUs and Events into one object (diff)
parentMove getLastMessage to modelService. (diff)
downloadsynapse-1d3ef8734cea9a1ce8befdf27db297ca70cfeee3.tar.xz
Merge remote-tracking branch 'origin/develop' into merge_pdu_event_objects
Diffstat (limited to 'syweb/webclient/settings')
-rw-r--r--syweb/webclient/settings/settings.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/syweb/webclient/settings/settings.html b/syweb/webclient/settings/settings.html

index 094c846f8b..4c20634a76 100644 --- a/syweb/webclient/settings/settings.html +++ b/syweb/webclient/settings/settings.html
@@ -54,7 +54,7 @@ Notifications are enabled. <div class="section"> <h4>Specific words to alert on:</h4> - <p>Leave blank to alert on all messages. Your username & display name always alerts.</p> + <p>If blank, all messages will trigger an alert. Your username & display name always alerts.</p> <input size=40 name="bingWords" ng-model="settings.bingWords" ng-list placeholder="Enter words separated with , (supports regex)" ng-blur="saveBingWords()"/> <ul>