From 83da5e60043645a1aa2823db626ea0f2f278a81f Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 25 Jul 2019 14:53:53 -0600 Subject: [PATCH] Update references to features --- config.sample.json | 6 ++++-- docs/config.md | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/config.sample.json b/config.sample.json index 751e2839c6..1a26289f88 100644 --- a/config.sample.json +++ b/config.sample.json @@ -20,8 +20,10 @@ "defaultCountryCode": "GB", "showLabsSettings": false, "features": { - "feature_groups": "labs", - "feature_pinning": "labs" + "feature_pinning": "labs", + "feature_custom_status": "labs", + "feature_custom_tags": "labs", + "feature_state_counters": "labs" }, "default_federate": true, "default_theme": "light", diff --git a/docs/config.md b/docs/config.md index d0667a1473..1e06c9d264 100644 --- a/docs/config.md +++ b/docs/config.md @@ -29,8 +29,7 @@ For a good example, see https://riot.im/develop/config.json. which should take priority and therefore the application cannot continue. 1. `features`: Lookup of optional features that may be `enable`d, `disable`d, or exposed to the user in the `labs` section of settings. The available optional experimental features vary from - release to release. Some of the available features are described in the Labs Feature section - of this README. + release to release. The available features are described in [labs.md](labs.md). 1. `showLabsSettings`: Shows the "labs" tab of user settings even when no `features` are enabled or present. Useful for getting at settings which may be otherwise hidden. 1. `brand`: String to pass to your homeserver when configuring email notifications, to let the