Polish configuration section labels & add link

extensions/css/package.json

@@ -33,10 +33,10 @@
 			"path": "./snippets/css.json"
 		}],
 		"configuration": {
+			"order": 20,
 			"allOf": [{
 				"id": "css",
-				"order": 20,
-				"title": "CSS configuration",
+				"title": "CSS",
 				"allOf": [
 					{
 						"title": "Controls CSS validation and problem severities.",
@@ -161,7 +161,7 @@
 			{
 				"id": "scss",
 				"order": 24,
-				"title": "SCSS (Sass) configuration",
+				"title": "SCSS (Sass)",
 				"allOf": [
 					{
 						"title": "Controls SCSS validation and problem severities.",
@@ -359,7 +359,7 @@
 				"id": "less",
 				"order": 22,
 				"type": "object",
-				"title": "LESS configuration",
+				"title": "LESS",
 				"allOf": [
 					{
 						"title": "Controls LESS validation and problem severities.",

extensions/json/package.json

@@ -95,7 +95,7 @@
 			"id": "json",
 			"order": 20,
 			"type": "object",
-			"title": "JSON configuration",
+			"title": "JSON",
 			"properties" : {
 				"json.schemas" : {
 					"type": "array",

extensions/markdown/package.json

@@ -111,7 +111,8 @@
 		],
 		"configuration": {
 			"type": "object",
-			"title": "Markdown preview configuration",
+			"title": "Markdown",
+			"order": 20,
 			"properties": {
 				"markdown.styles": {
 					"type": "array",

extensions/php/package.json

@@ -28,6 +28,7 @@
 		"configuration": {
 			"title": "%configuration.title%",
 			"type": "object",
+			"order": 20,
 			"properties": {
 				"php.validate.enable": {
 					"type": "boolean",

extensions/php/package.nls.json

@@ -2,5 +2,5 @@
 	"configuration.validate.enable": "Whether php validation is enabled or not.",
 	"configuration.validate.executablePath": "Points to the php executable.",
 	"configuration.validate.run": "Whether the linter is run on save or on type.",
-	"configuration.title": "PHP Configuration options"
+	"configuration.title": "PHP"
 }
\ No newline at end of file

extensions/typescript/package.json

@@ -65,6 +65,7 @@
 		"configuration": {
 			"type": "object",
 			"title": "%configuration.typescript%",
+			"order": 20,
 			"properties": {
 				"typescript.tsdk": {
 					"type": ["string", "null"],

extensions/typescript/package.nls.json

 {
 	"typescript.reloadProjects.title": "Reload TypeScript Project",
 	"javascript.reloadProjects.title": "Reload JavaScript Project",
-	"configuration.typescript": "TypeScript configuration",
+	"configuration.typescript": "TypeScript",
 	"typescript.useCodeSnippetsOnMethodSuggest.dec": "Complete functions with their parameter signature.",
 	"typescript.tsdk.desc": "Specifies the folder path containing the tsserver and lib*.d.ts files to use.",
 	"typescript.tsserver.trace": "Enables tracing of messages send to the TS server",

src/vs/editor/common/config/commonEditorConfig.ts

@@ -529,7 +529,7 @@ let editorConfiguration:IConfigurationNode = {
 	'id': 'editor',
 	'order': 5,
 	'type': 'object',
-	'title': nls.localize('editorConfigurationTitle', "Editor configuration"),
+	'title': nls.localize('editorConfigurationTitle', "Editor"),
 	'properties' : {
 		'editor.fontFamily' : {
 			'type': 'string',

src/vs/languages/html/common/html.contribution.ts

@@ -25,7 +25,7 @@ configurationRegistry.registerConfiguration({
 	'id': 'html',
 	'order': 20,
 	'type': 'object',
-	'title': nls.localize('htmlConfigurationTitle', "HTML configuration"),
+	'title': nls.localize('htmlConfigurationTitle', "HTML"),
 	'properties': {
 		'html.format.wrapLineLength': {
 			'type': 'integer',

src/vs/platform/configuration/common/model.ts

@@ -140,7 +140,11 @@ function processDefaultValues(withConfig: (config: configurationRegistry.IConfig
 		if (typeof c2.order !== 'number') {
 			return -1;
 		}
-
+		if (c1.order === c2.order) {
+			let title1 = c1.title || '';
+			let title2 = c2.title || '';
+			return title1.localeCompare(title2);
+		}
 		return c1.order - c2.order;
 	}).forEach((config) => {
 		visit(config, 0);
@@ -182,7 +186,7 @@ export function getDefaultValuesContent(indent: string): string {
 			handled = true;
 			if (isTop) {
 				result.push('');
-				result.push('//-------- ' + config.title + ' --------');
+				result.push('// ' + config.title);
 			} else {
 				result.push(indent + '// ' + config.title);
 			}

src/vs/platform/telemetry/common/telemetryService.ts

@@ -158,9 +158,9 @@ const TELEMETRY_SECTION_ID = 'telemetry';
 
 Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfiguration({
 	'id': TELEMETRY_SECTION_ID,
-	'order': 20,
+	'order': 110,
 	'type': 'object',
-	'title': localize('telemetryConfigurationTitle', "Telemetry configuration"),
+	'title': localize('telemetryConfigurationTitle', "Telemetry"),
 	'properties': {
 		'telemetry.enableTelemetry': {
 			'type': 'boolean',

src/vs/workbench/browser/actions/openSettings.ts

@@ -211,6 +211,7 @@ class DefaultSettingsInput extends StringEditorInput {
 			let defaults = getDefaultValuesContent(editorConfig.editor.insertSpaces ? strings.repeat(' ', editorConfig.editor.tabSize) : '\t');
 
 			let defaultsHeader = '// ' + nls.localize('defaultSettingsHeader', "Overwrite settings by placing them into your settings file.");
+			defaultsHeader += '\n// ' + nls.localize('defaultSettingsHeader2', "See http://go.microsoft.com/fwlink/?LinkId=808995 for the most commonly used settings.");
 			DefaultSettingsInput.INSTANCE = instantiationService.createInstance(DefaultSettingsInput, nls.localize('defaultName', "Default Settings"), null, defaultsHeader + '\n' + defaults, 'application/json', false);
 		}
 

src/vs/workbench/browser/parts/editor/editor.contribution.ts

@@ -378,7 +378,7 @@ let configurationRegistry = <IConfigurationRegistry>Registry.as(ConfigurationExt
 configurationRegistry.registerConfiguration({
 	'id': 'workbench',
 	'order': 7,
-	'title': nls.localize('workbenchConfigurationTitle', "Workbench configuration"),
+	'title': nls.localize('workbenchConfigurationTitle', "Workbench"),
 	'type': 'object',
 	'properties': {
 		'workbench.editor.showTabs': {

src/vs/workbench/electron-browser/crashReporter.ts

@@ -19,9 +19,8 @@ let TELEMETRY_SECTION_ID = 'telemetry';
 let configurationRegistry = <IConfigurationRegistry>Registry.as(Extensions.Configuration);
 configurationRegistry.registerConfiguration({
 	'id': TELEMETRY_SECTION_ID,
-	'order': 20,
+	'order': 110.5,
 	'type': 'object',
-	'title': nls.localize('telemetryConfigurationTitle', "Telemetry configuration"),
 	'properties': {
 		'telemetry.enableCrashReporter': {
 			'type': 'boolean',

src/vs/workbench/electron-browser/main.contribution.ts

@@ -42,7 +42,7 @@ const configurationRegistry = <IConfigurationRegistry>Registry.as(ConfigurationE
 configurationRegistry.registerConfiguration({
 	'id': 'window',
 	'order': 8,
-	'title': nls.localize('windowConfigurationTitle', "Window configuration"),
+	'title': nls.localize('windowConfigurationTitle', "Window"),
 	'type': 'object',
 	'properties': {
 		'window.openFilesInNewWindow': {
@@ -73,7 +73,7 @@ configurationRegistry.registerConfiguration({
 configurationRegistry.registerConfiguration({
 	'id': 'update',
 	'order': 15,
-	'title': nls.localize('updateConfigurationTitle', "Update configuration"),
+	'title': nls.localize('updateConfigurationTitle', "Update"),
 	'type': 'object',
 	'properties': {
 		'update.channel': {

src/vs/workbench/parts/debug/node/debugConfigurationManager.ts

@@ -130,7 +130,7 @@ export var schemaId = 'vscode://schemas/launch';
 const schema: IJSONSchema = {
 	id: schemaId,
 	type: 'object',
-	title: nls.localize('app.launch.json.title', "Launch configuration"),
+	title: nls.localize('app.launch.json.title', "Launch"),
 	required: ['version', 'configurations'],
 	properties: {
 		version: {

src/vs/workbench/parts/emmet/node/emmet.contribution.ts

@@ -31,7 +31,7 @@ const configurationRegistry = <IConfigurationRegistry>Registry.as(ConfigurationE
 configurationRegistry.registerConfiguration({
 	'id': 'emmet',
 	'order': 6,
-	'title': nls.localize('emmetConfigurationTitle', "Emmet configuration"),
+	'title': nls.localize('emmetConfigurationTitle', "Emmet"),
 	'type': 'object',
 	'properties': {
 		'emmet.triggerExpansionOnTab': {

src/vs/workbench/parts/execution/electron-browser/terminal.contribution.ts

@@ -28,7 +28,7 @@ let configurationRegistry = <IConfigurationRegistry>Registry.as(Extensions.Confi
 configurationRegistry.registerConfiguration({
 	'id': 'externalTerminal',
 	'order': 100,
-	'title': nls.localize('terminalConfigurationTitle', "External terminal configuration"),
+	'title': nls.localize('terminalConfigurationTitle', "External Terminal"),
 	'type': 'object',
 	'properties': {
 		'terminal.external.windowsExec': {

src/vs/workbench/parts/files/browser/files.contribution.ts

@@ -162,7 +162,7 @@ let configurationRegistry = <IConfigurationRegistry>Registry.as(ConfigurationExt
 configurationRegistry.registerConfiguration({
 	'id': 'files',
 	'order': 9,
-	'title': nls.localize('filesConfigurationTitle', "Files configuration"),
+	'title': nls.localize('filesConfigurationTitle', "Files"),
 	'type': 'object',
 	'properties': {
 		'files.exclude': {
@@ -235,7 +235,7 @@ configurationRegistry.registerConfiguration({
 configurationRegistry.registerConfiguration({
 	'id': 'explorer',
 	'order': 10,
-	'title': nls.localize('explorerConfigurationTitle', "File Explorer configuration"),
+	'title': nls.localize('explorerConfigurationTitle', "File Explorer"),
 	'type': 'object',
 	'properties': {
 		'explorer.openEditors.visible': {

src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts

@@ -510,7 +510,7 @@ export function registerContributions(): void {
 	configurationRegistry.registerConfiguration({
 		id: 'git',
 		order: 15,
-		title: nls.localize('gitConfigurationTitle', "Git configuration"),
+		title: nls.localize('gitConfigurationTitle', "Git"),
 		type: 'object',
 		properties: {
 			'git.enabled': {

src/vs/workbench/parts/markers/common/messages.ts

@@ -13,7 +13,7 @@ export default class Messages {
 	public static MARKERS_PANEL_VIEW_CATEGORY:string= nls.localize('viewCategory', "View");
 	public static MARKERS_PANEL_TOGGLE_LABEL:string= nls.localize('problems.view.show.label', "Show Problems");
 
-	public static PROBLEMS_PANEL_CONFIGURATION_TITLE:string= nls.localize('problems.panel.configuration.title', "Problems view configuration");
+	public static PROBLEMS_PANEL_CONFIGURATION_TITLE:string= nls.localize('problems.panel.configuration.title', "Problems View");
 	public static PROBLEMS_PANEL_CONFIGURATION_AUTO_REVEAL:string= nls.localize('problems.panel.configuration.autoreveal', "Controls if Problems view should automatically reveal files when opening them");
 
 	public static MARKERS_PANEL_TITLE_NO_PROBLEMS:string= nls.localize('markers.panel.title.no.problems', "No problems");

src/vs/workbench/parts/search/browser/search.contribution.ts

@@ -160,7 +160,7 @@ const configurationRegistry = <IConfigurationRegistry>Registry.as(ConfigurationE
 configurationRegistry.registerConfiguration({
 	'id': 'search',
 	'order': 13,
-	'title': nls.localize('searchConfigurationTitle', "Search configuration"),
+	'title': nls.localize('searchConfigurationTitle', "Search"),
 	'type': 'object',
 	'properties': {
 		'search.exclude': {

src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts

@@ -21,7 +21,7 @@ let configurationRegistry = <IConfigurationRegistry>Registry.as(Extensions.Confi
 configurationRegistry.registerConfiguration({
 	'id': 'terminal',
 	'order': 100,
-	'title': nls.localize('terminalIntegratedConfigurationTitle', "Integrated terminal configuration"),
+	'title': nls.localize('terminalIntegratedConfigurationTitle', "Integrated Terminal"),
 	'type': 'object',
 	'properties': {
 		'terminal.integrated.shell.linux': {

src/vs/workbench/services/request/node/requestService.ts

@@ -146,7 +146,7 @@ let confRegistry = <IConfigurationRegistry>platform.Registry.as(Extensions.Confi
 confRegistry.registerConfiguration({
 	id: 'http',
 	order: 15,
-	title: nls.localize('httpConfigurationTitle', "HTTP configuration"),
+	title: nls.localize('httpConfigurationTitle', "HTTP"),
 	type: 'object',
 	properties: {
 		'http.proxy': {