Merge branch 'jk/config-path-include-fix' into maint

diff --git a/Documentation/date-formats.txt b/Documentation/date-formats.txt
index c000f08a9d51bc5101f22e62586bb580ff3a9e51..ccd1fc8122a74be4ac04fd7be905ebf881f7413b 100644 (file)
--- a/Documentation/date-formats.txt
+++ b/Documentation/date-formats.txt
@@ -8,9 +8,9 @@ endif::git-commit[]
 support the following date formats:
 
 Git internal format::
-       It is `<unix timestamp> <timezone offset>`, where `<unix
+       It is `<unix timestamp> <time zone offset>`, where `<unix
        timestamp>` is the number of seconds since the UNIX epoch.
-       `<timezone offset>` is a positive or negative offset from UTC.
+       `<time zone offset>` is a positive or negative offset from UTC.
        For example CET (which is 2 hours ahead UTC) is `+0200`.
 
 RFC 2822::