{"thread":{"id":"11458","subject":"[PATCH] Fix grammar nits in documentation and in code comments.","startedAt":"2008-01-03T14:18:07Z","lastAt":"2008-01-03T14:18:07Z","messageCount":1,"participants":["Jim Meyering"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"64386","messageId":"87wsqr802o.fsf@rho.meyering.net","threadId":"11458","inReplyTo":null,"subject":"[PATCH] Fix grammar nits in documentation and in code comments.","fromName":"Jim Meyering","fromEmail":"jim@meyering.net","sentAt":"2008-01-03T14:18:07Z","receivedAt":"2008-01-03T14:18:07Z","isPatch":true,"sender":{"key":"jim@meyering.net","avatar":"https://avatars.githubusercontent.com/u/710630?v=4"},"body":"\nSigned-off-by: Jim Meyering <meyering@redhat.com>\n---\n Documentation/i18n.txt |    2 +-\n builtin-blame.c        |    2 +-\n ident.c                |    2 +-\n merge-recursive.c      |    2 +-\n setup.c                |    2 +-\n sha1_file.c            |    2 +-\n 6 files changed, 6 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/i18n.txt b/Documentation/i18n.txt\nindex b95f99b..1e188e6 100644\n--- a/Documentation/i18n.txt\n+++ b/Documentation/i18n.txt\n@@ -22,7 +22,7 @@ does not forbid it.  However, there are a few things to keep in\n mind.\n\n . `git-commit-tree` (hence, `git-commit` which uses it) issues\n-  an warning if the commit log message given to it does not look\n+  a warning if the commit log message given to it does not look\n   like a valid UTF-8 string, unless you explicitly say your\n   project uses a legacy encoding.  The way to say this is to\n   have i18n.commitencoding in `.git/config` file, like this:\ndiff --git a/builtin-blame.c b/builtin-blame.c\nindex d98caaf..9b4c02e 100644\n--- a/builtin-blame.c\n+++ b/builtin-blame.c\n@@ -606,7 +606,7 @@ static void add_blame_entry(struct scoreboard *sb, struct blame_entry *e)\n\n /*\n  * src typically is on-stack; we want to copy the information in it to\n- * an malloced blame_entry that is already on the linked list of the\n+ * a malloced blame_entry that is already on the linked list of the\n  * scoreboard.  The origin of dst loses a refcnt while the origin of src\n  * gains one.\n  */\ndiff --git a/ident.c b/ident.c\nindex 892d77a..b839dcf 100644\n--- a/ident.c\n+++ b/ident.c\n@@ -152,7 +152,7 @@ static int copy(char *buf, size_t size, int offset, const char *src)\n \t/*\n \t * Copy the rest to the buffer, but avoid the special\n \t * characters '\\n' '<' and '>' that act as delimiters on\n-\t * a identification line\n+\t * an identification line\n \t */\n \tfor (i = 0; i < len; i++) {\n \t\tc = *src++;\ndiff --git a/merge-recursive.c b/merge-recursive.c\nindex 33ccc40..b34177d 100644\n--- a/merge-recursive.c\n+++ b/merge-recursive.c\n@@ -289,7 +289,7 @@ static int get_files_dirs(struct tree *tree)\n }\n\n /*\n- * Returns a index_entry instance which doesn't have to correspond to\n+ * Returns an index_entry instance which doesn't have to correspond to\n  * a real cache entry in Git's index.\n  */\n static struct stage_data *insert_stage_data(const char *path,\ndiff --git a/setup.c b/setup.c\nindex b59dbe7..adede16 100644\n--- a/setup.c\n+++ b/setup.c\n@@ -140,7 +140,7 @@ const char **get_pathspec(const char *prefix, const char **pathspec)\n  * Test if it looks like we're at a git directory.\n  * We want to see:\n  *\n- *  - either a objects/ directory _or_ the proper\n+ *  - either an objects/ directory _or_ the proper\n  *    GIT_OBJECT_DIRECTORY environment variable\n  *  - a refs/ directory\n  *  - either a HEAD symlink or a HEAD file that is formatted as\ndiff --git a/sha1_file.c b/sha1_file.c\nindex b0c2435..6583797 100644\n--- a/sha1_file.c\n+++ b/sha1_file.c\n@@ -148,7 +148,7 @@ static void fill_sha1_path(char *pathbuf, const unsigned char *sha1)\n\n /*\n  * NOTE! This returns a statically allocated buffer, so you have to be\n- * careful about using it. Do a \"xstrdup()\" if you need to save the\n+ * careful about using it. Do an \"xstrdup()\" if you need to save the\n  * filename.\n  *\n  * Also note that this returns the location for creating.  Reading\n--\n1.5.4.rc2.7.gcb27\n"}]}