summaryrefslogtreecommitdiff
path: root/Documentation/i18n.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-12-19 19:32:29 -0800
committerJunio C Hamano <gitster@pobox.com>2008-12-19 19:35:55 -0800
commitefe05b019ca19328d27c07ef32b4698a7f36166f (patch)
treea38d3c5713d39370e881c148ff0f5c9d4db59c67 /Documentation/i18n.txt
parentec9f0ea3e6ecf1237223dec8428e7bb73d339320 (diff)
parent718258e256b74622aa55f5ee0cb9cff4cce6bf9f (diff)
downloadgit-efe05b019ca19328d27c07ef32b4698a7f36166f.tar.gz
Merge branch 'maint' to sync with GIT 1.6.0.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/i18n.txt')
-rw-r--r--Documentation/i18n.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/i18n.txt b/Documentation/i18n.txt
index 2cdacd94cd..708da6ca31 100644
--- a/Documentation/i18n.txt
+++ b/Documentation/i18n.txt
@@ -7,11 +7,11 @@ At the core level, git is character encoding agnostic.
to be what lstat(2) and creat(2) accepts. There is no such
thing as pathname encoding translation.
- - The contents of the blob objects are uninterpreted sequence
+ - The contents of the blob objects are uninterpreted sequences
of bytes. There is no encoding translation at the core
level.
- - The commit log messages are uninterpreted sequence of non-NUL
+ - The commit log messages are uninterpreted sequences of non-NUL
bytes.
Although we encourage that the commit log messages are encoded