1 files changed, 15 insertions, 9 deletions
diff --git a/Swift/Controllers/SettingConstants.h b/Swift/Controllers/SettingConstants.h
index fec2d27..68c22b7 100644
--- a/Swift/Controllers/SettingConstants.h
+++ b/Swift/Controllers/SettingConstants.h
@@ -1,3 +1,3 @@
 /*
- * Copyright (c) 2012-2017 Isode Limited.
+ * Copyright (c) 2012-2018 Isode Limited.
  * All rights reserved.
@@ -36,4 +36,2 @@ namespace Swift {
             static const SettingsProvider::Setting<bool> REMEMBER_RECENT_CHATS;
-            static const SettingsProvider::Setting<std::string> LAST_LOGIN_JID;
-            static const SettingsProvider::Setting<bool> LOGIN_AUTOMATICALLY;
             /**
@@ -87,10 +85,18 @@ namespace Swift {
             /**
-             * The #SINGLE_SIGN_ON setting
-             * specifies whether to log in using Single Sign On.
-             * This is currently supported on Windows.
+             * The #MUC_MARKING_ELISION setting
+             * specifies whether or not messages with the default muc
+             * marking display their marking, and whether unmarked messages
+             * are marked as such.
              *
-             * If set true Swift will use GSSAPI authentication to
-             * log in the user; else not.
+             * If set true, unmarked messages will be marked with the marking
+             * "unmarked", and messages with the room default marking will
+             * have their markings stripped.
              */
-            static const SettingsProvider::Setting<bool> SINGLE_SIGN_ON;
+            static const SettingsProvider::Setting<bool> MUC_MARKING_ELISION;
+
+            /**
+             * The #FUTURE setting enables use of experimental features
+             * planned for future releases.
+             */
+            static const SettingsProvider::Setting<bool> FUTURE;
     };