Merge branch 'jn/plug-empty-tree-leak'

diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
index 1b1c45df5ce3ef30e588555bbd5ab404c2b7397c..fe1c1e5bc26e683540cb9fe5f43320192be9185d 100644 (file)
--- a/Documentation/CodingGuidelines
+++ b/Documentation/CodingGuidelines
@@ -152,12 +152,12 @@ Writing Documentation:
  when writing or modifying command usage strings and synopsis sections
  in the manual pages:
 
- Placeholders are enclosed in angle brackets:
+ Placeholders are spelled in lowercase and enclosed in angle brackets:
    <file>
    --sort=<key>
    --abbrev[=<n>]
 
- Possibility of multiple occurences is indicated by three dots:
+ Possibility of multiple occurrences is indicated by three dots:
    <file>...
    (One or more of <file>.)