Merge pull request #5215 from matrix-org/t3chguy/fix/15179

UI Feature Flag: Disable advanced options and tidy up some copy

src/settings/Settings.ts

@@ -660,4 +660,8 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         supportedLevels: LEVELS_UI_FEATURE,
         default: true,
     },
+    [UIFeature.AdvancedSettings]: {
+        supportedLevels: LEVELS_UI_FEATURE,
+        default: true,
+    },
 };

src/settings/UIFeature.ts

@@ -28,4 +28,5 @@ export enum UIFeature {
     IdentityServer = "UIFeature.identityServer",
     ThirdPartyID = "UIFeature.thirdPartyId",
     Flair = "UIFeature.flair",
+    AdvancedSettings = "UIFeature.advancedSettings",
 }