Merge branch 'sp/maint-describe-all-tag-warning' into maint

diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
index d2a0a76e6cfb275080f3b66309591888f5302850..f628c1f3b7b706f9d585b96041e5a4b12bc0f62c 100644 (file)
--- a/Documentation/CodingGuidelines
+++ b/Documentation/CodingGuidelines
@@ -105,7 +105,7 @@ For C programs:
 
  - Use the API.  No, really.  We have a strbuf (variable length
    string), several arrays with the ALLOC_GROW() macro, a
-   path_list for sorted string lists, a hash map (mapping struct
+   string_list for sorted string lists, a hash map (mapping struct
    objects) named "struct decorate", amongst other things.
 
  - When you come up with an API, document it.