Merge branch 'jc/diff-no-index-d-f'

diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
index 376d5ec4f8dbbc0034416192fc13a1a527c7ca4b..c6e536f180275c1112e50b3fbd42638c8cae1581 100644 (file)
--- a/Documentation/CodingGuidelines
+++ b/Documentation/CodingGuidelines
@@ -1,5 +1,5 @@
 Like other projects, we also have some guidelines to keep to the
-code.  For Git in general, three rough rules are:
+code.  For Git in general, a few rough rules are:
 
  - Most importantly, we never say "It's in POSIX; we'll happily
    ignore your needs should your system not conform to it."