Documentation: "advice" is uncountable

gnprice · gitster · commit 4f021b34f2d5 · 2013-02-25T07:31:28.000-08:00
"Advice" is a mass noun, not a count noun; it's not ordinarily
pluralized.

Signed-off-by: Greg Price &lt;price@mit.edu&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/Documentation/config.txt b/Documentation/config.txt
@@ -168,7 +168,7 @@ advice.*::
 		Advice shown when linkgit:git-merge[1] refuses to
 		merge to avoid overwriting local changes.
 	resolveConflict::
-		Advices shown by various commands when conflicts
+		Advice shown by various commands when conflicts
 		prevent the operation from being performed.
 	implicitIdentity::
 		Advice on how to set your identity configuration when
diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh
@@ -5,7 +5,7 @@
 #		     Grenoble INP Ensimag
 #
 
-test_description='git status advices'
+test_description='git status advice'
 
 . ./test-lib.sh
 

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`# Grenoble INP Ensimag`
`6`	`6`	`#`
`7`	`7`
`8`		`-test_description='git status advices'`
	`8`	`+test_description='git status advice'`
`9`	`9`
`10`	`10`	`. ./test-lib.sh`
`11`	`11`