Merging upstream version 1.2.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 4 insertions, 3 deletions

diff --git a/README.md b/README.md
index 8cc7c16..54fe707 100644
--- a/README.md
+++ b/README.md
@@ -3,13 +3,14 @@
 Icinga DB is a set of components for publishing, synchronizing and
 visualizing monitoring data in the Icinga ecosystem, consisting of:
 
-* The Icinga DB daemon, which synchronizes monitoring data between a Redis server and a database
+* The Icinga DB daemon,
+  which synchronizes monitoring data between a Redis®[\*](doc/TRADEMARKS.md#redis) server and a database
 * Icinga 2 with its [Icinga DB feature](https://icinga.com/docs/icinga-2/latest/doc/14-features/#icinga-db) enabled,
-  responsible for publishing the data to the Redis server, i.e. configuration and its runtime updates, check results,
+  responsible for publishing the data to the Redis® server, i.e. configuration and its runtime updates, check results,
   state changes, downtimes, acknowledgements, notifications, and other events such as flapping
 * And Icinga Web with the
   [Icinga DB Web](https://icinga.com/docs/icinga-db-web) module enabled,
-  which connects to both Redis and the database to display and work with the most up-to-date data
+  which connects to both Redis® and the database to display and work with the most up-to-date data
 
 ![Icinga DB Architecture](doc/images/icingadb-architecture.png)