From 1d8cdc4e256cd8341a236a7121d98b285f1cd089 Mon Sep 17 00:00:00 2001
From: TheShermanTanker <32636402+TheShermanTanker@users.noreply.github.com>
Date: Fri, 25 Nov 2022 02:58:39 +0800
Subject: [PATCH 1/4] Built-in Languages in the should not be labelled as GNU
 dialects in the settings

---
 core/org.eclipse.cdt.core/plugin.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/org.eclipse.cdt.core/plugin.properties b/core/org.eclipse.cdt.core/plugin.properties
index b19f168c1a8..4ddcbbd585e 100644
--- a/core/org.eclipse.cdt.core/plugin.properties
+++ b/core/org.eclipse.cdt.core/plugin.properties
@@ -110,8 +110,8 @@ PDOMProviderName=PDOM Provider
 fastIndexer.name=Fast Indexer
 
 # Built-in languages
-language.name.gcc= GNU C
-language.name.gpp= GNU C++
+language.name.gcc= C
+language.name.gpp= C++
 language.name.asm= Assembly
 
 CConfigurationDataProvider.name = CConfigurationData provider

From 234fde2448dfcb7a0cf869358bac0c12effad341 Mon Sep 17 00:00:00 2001
From: TheShermanTanker <32636402+TheShermanTanker@users.noreply.github.com>
Date: Fri, 25 Nov 2022 16:55:54 +0800
Subject: [PATCH 2/4] Refactor SettingsImportExportTest to work with new name

---
 .../wizards/settingswizards/SettingsImportExportTest.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/SettingsImportExportTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/SettingsImportExportTest.java
index a168a126db4..a0bc09be854 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/SettingsImportExportTest.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/SettingsImportExportTest.java
@@ -246,7 +246,7 @@ private static void assertNoSettingsImported(IProject project) {
 	// {badXML6}
 	// <cdtprojectproperties>
 	// <section name="org.eclipse.cdt.internal.ui.wizards.settingswizards.Macros">
-	// <language name="GNU C++">
+	// <language name="C++">
 	// <macro>
 	// <name>aaaa</name>
 	// </macro>
@@ -257,7 +257,7 @@ private static void assertNoSettingsImported(IProject project) {
 	// {badXML7}
 	// <cdtprojectproperties>
 	// <section name="org.eclipse.cdt.internal.ui.wizards.settingswizards.Macros">
-	// <language name="GNU C++">
+	// <language name="C++">
 	// <macro>
 	// <name>aaaa</name><value></value><value></value>
 	// </macro>
@@ -268,7 +268,7 @@ private static void assertNoSettingsImported(IProject project) {
 	// {badXML8}
 	// <cdtprojectproperties>
 	// <section name="org.eclipse.cdt.internal.ui.wizards.settingswizards.IncludePaths">
-	// <language name="GNU C++">
+	// <language name="C++">
 	// <includepath>C:\WINDOWS</includepath><invalid></invalid>
 	// </language>
 	// </section>

From e763cbac8ac32d6a505db660436dad0c53613d01 Mon Sep 17 00:00:00 2001
From: TheShermanTanker <32636402+TheShermanTanker@users.noreply.github.com>
Date: Sun, 27 Nov 2022 02:43:39 +0800
Subject: [PATCH 3/4] Changes should be documented in New and Noteworthy

---
 NewAndNoteworthy/CDT-11.0.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/NewAndNoteworthy/CDT-11.0.md b/NewAndNoteworthy/CDT-11.0.md
index 80f7df252f7..1b8f7c3912b 100644
--- a/NewAndNoteworthy/CDT-11.0.md
+++ b/NewAndNoteworthy/CDT-11.0.md
@@ -34,6 +34,10 @@ Please see the corresponding issue for more details.
   - `org.eclipse.cdt.lsp.cquery`
   - `org.eclipse.cdt.lsp.ui`
 
+## GNU removed from display name language for C/C++
+
+C and C++ have been renamed from "GNU C" and "GNU C++" to just "C" and "C++". If you have exported settings with CDT prior to CDT 10.5 they may not import successfully with CDT 11. See #178
+
 # Build
 
 ## Scanner Discovery able to consider all flags

From df9c4326d4ef1492d855d87113f9f0542383212a Mon Sep 17 00:00:00 2001
From: TheShermanTanker <32636402+TheShermanTanker@users.noreply.github.com>
Date: Sun, 27 Nov 2022 02:45:25 +0800
Subject: [PATCH 4/4] Formatting

---
 NewAndNoteworthy/CDT-11.0.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/NewAndNoteworthy/CDT-11.0.md b/NewAndNoteworthy/CDT-11.0.md
index 1b8f7c3912b..6caaf27a456 100644
--- a/NewAndNoteworthy/CDT-11.0.md
+++ b/NewAndNoteworthy/CDT-11.0.md
@@ -36,7 +36,8 @@ Please see the corresponding issue for more details.
 
 ## GNU removed from display name language for C/C++
 
-C and C++ have been renamed from "GNU C" and "GNU C++" to just "C" and "C++". If you have exported settings with CDT prior to CDT 10.5 they may not import successfully with CDT 11. See #178
+C and C++ have been renamed from "GNU C" and "GNU C++" to just "C" and "C++". If you have exported settings with CDT prior to CDT 10.5 they may not import
+successfully with CDT 11. See #178
 
 # Build