diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-18 18:25:23 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-18 18:25:23 +0100 |
| commit | beed1ba089fa4aa0aca6ac9ef9c560508197baa4 (patch) | |
| tree | 51b4105de45a5dea15013b90b2692d772599e302 /webclient/settings/settings.html | |
| parent | Remove lie from change log. (diff) | |
| parent | fix SYWEB-41 (hopefully) (diff) | |
| download | synapse-beed1ba089fa4aa0aca6ac9ef9c560508197baa4.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse
Diffstat (limited to 'webclient/settings/settings.html')
| -rw-r--r-- | webclient/settings/settings.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webclient/settings/settings.html b/webclient/settings/settings.html index 0a5a3db51f..094c846f8b 100644 --- a/webclient/settings/settings.html +++ b/webclient/settings/settings.html @@ -51,10 +51,10 @@ <h3>Desktop notifications</h3> <div class="section" ng-switch="settings.notifications"> <div ng-switch-when="granted"> - Notifications are enabled. You will be alerted when a message contains your user ID or display name. + Notifications are enabled. <div class="section"> - <h4>Additional words to alert on:</h4> - <p>Leave blank to alert on all messages.</p> + <h4>Specific words to alert on:</h4> + <p>Leave blank to alert on all messages. 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> |