diff --git a/src/vs/editor/common/config/commonEditorConfig.ts b/src/vs/editor/common/config/commonEditorConfig.ts
index e8bc9eb88829100ca033265cf01f9c6f0c965a6f..1f950ef778dad30bef69ddacc382f9e94912b443 100644
--- a/src/vs/editor/common/config/commonEditorConfig.ts
+++ b/src/vs/editor/common/config/commonEditorConfig.ts
@@ -436,7 +436,7 @@ const editorConfiguration: IConfigurationNode = {
 		'editor.multiCursorModifier': {
 			'type': 'string',
 			'enum': ['ctrlCmd', 'alt'],
-			'enumDescriptions': [
+			'markdownEnumDescriptions': [
 				nls.localize('multiCursorModifier.ctrlCmd', "Maps to `Control` on Windows and Linux and to `Command` on macOS."),
 				nls.localize('multiCursorModifier.alt', "Maps to `Alt` on Windows and Linux and to `Option` on macOS.")
 			],
diff --git a/src/vs/workbench/parts/preferences/browser/settingsLayout.ts b/src/vs/workbench/parts/preferences/browser/settingsLayout.ts
index 5f1c8d11a0e42b27ee0ece34cd8c6c203a18b0c1..e98adfcb7bb97a6bde7f2da5881bcd85f0a88c2f 100644
--- a/src/vs/workbench/parts/preferences/browser/settingsLayout.ts
+++ b/src/vs/workbench/parts/preferences/browser/settingsLayout.ts
@@ -197,4 +197,5 @@ export const knownAcronyms = new Set();
 	'ts',
 	'ie',
 	'id',
+	'php',
 ].forEach(str => knownAcronyms.add(str));
diff --git a/src/vs/workbench/parts/preferences/browser/settingsTree.ts b/src/vs/workbench/parts/preferences/browser/settingsTree.ts
index 6c2afb9be3ef9b375de096d35953aa8a0a2eef3e..196d1b81b81b0ce631296e4b46e44c115f708200 100644
--- a/src/vs/workbench/parts/preferences/browser/settingsTree.ts
+++ b/src/vs/workbench/parts/preferences/browser/settingsTree.ts
@@ -1106,12 +1106,12 @@ export class SettingsRenderer implements ITreeRenderer {
 	private renderEnum(dataElement: SettingsTreeSettingElement, template: ISettingEnumItemTemplate, onChange: (value: string) => void): void {
 		const displayOptions = getDisplayEnumOptions(dataElement.setting);
 		template.selectBox.setOptions(displayOptions);
-		const descriptions = dataElement.setting.enumDescriptions;
-		const descriptionsAreMarkdown = dataElement.setting.descriptionIsMarkdown;
+		const enumDescriptions = dataElement.setting.enumDescriptions;
+		const enumDescriptionsAreMarkdown = dataElement.setting.enumDescriptionsAreMarkdown;
 		template.selectBox.setDetailsProvider(index =>
 			({
-				details: descriptions && descriptions[index] && (descriptionsAreMarkdown ? fixSettingLinks(descriptions[index]) : descriptions[index]),
-				isMarkdown: descriptionsAreMarkdown
+				details: enumDescriptions && enumDescriptions[index] && (enumDescriptionsAreMarkdown ? fixSettingLinks(enumDescriptions[index], false) : enumDescriptions[index]),
+				isMarkdown: enumDescriptionsAreMarkdown
 			}));
 
 		const modifiedText = dataElement.isConfigured ? 'Modified' : '';
@@ -1236,11 +1236,13 @@ function cleanRenderedMarkdown(element: Node): void {
 	}
 }
 
-function fixSettingLinks(text: string): string {
-	return text.replace(/`#([^#]*)#`/g, (match, settingName) => {
-		const targetDisplayFormat = settingKeyToDisplayFormat(settingName);
+function fixSettingLinks(text: string, linkify = true): string {
+	return text.replace(/`#([^#]*)#`/g, (match, settingKey) => {
+		const targetDisplayFormat = settingKeyToDisplayFormat(settingKey);
 		const targetName = `${targetDisplayFormat.category}: ${targetDisplayFormat.label}`;
-		return `[${targetName}](#${settingName})`;
+		return linkify ?
+			`[${targetName}](#${settingKey})` :
+			`"${targetName}"`;
 	});
 }