Merge branch '5.2' into 5.x

fabpot · fabpot · commit 0887a2c153b8 · 2021-03-06T09:05:19.000+01:00
* 5.2:
  Fix #36973: Command description consistency
  Render email once
diff --git a/Command/LintCommand.php b/Command/LintCommand.php
@@ -33,7 +33,7 @@
 class LintCommand extends Command
 {
     protected static $defaultName = 'lint:yaml';
-    protected static $defaultDescription = 'Lints a YAML file and outputs encountered errors';
+    protected static $defaultDescription = 'Lint a YAML file and outputs encountered errors';
 
     private $parser;
     private $format;

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`class LintCommand extends Command`
`34`	`34`	`{`
`35`	`35`	`protected static $defaultName = 'lint:yaml';`
`36`		`- protected static $defaultDescription = 'Lints a YAML file and outputs encountered errors';`
	`36`	`+ protected static $defaultDescription = 'Lint a YAML file and outputs encountered errors';`
`37`	`37`
`38`	`38`	`private $parser;`
`39`	`39`	`private $format;`