{"thread":{"id":"30079","subject":"[PATCH] correct a few doubled-word nits in comments and documentation","startedAt":"2012-03-28T08:45:36Z","lastAt":"2012-03-28T17:41:33Z","messageCount":4,"participants":["Jim Meyering","Junio C Hamano","Jonathan Nieder"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"187919","messageId":"87d37xun9r.fsf@rho.meyering.net","threadId":"30079","inReplyTo":null,"subject":"[PATCH] correct a few doubled-word nits in comments and documentation","fromName":"Jim Meyering","fromEmail":"jim@meyering.net","sentAt":"2012-03-28T08:45:36Z","receivedAt":"2012-03-28T08:45:36Z","isPatch":true,"sender":{"key":"jim@meyering.net","avatar":"https://avatars.githubusercontent.com/u/710630?v=4"},"body":"\nFound by running this command:\n$ git ls-files -z|xargs -0 perl -0777 -n \\\n -e 'while (/\\b(then?|[iao]n|i[fst]|but|f?or|at|and|[dt]o)\\s+\\1\\b/gims)' \\\n -e '  {' \\\n -e '    $n = ($` =~ tr/\\n/\\n/ + 1);' \\\n -e '    ($v = $&) =~ s/\\n/\\\\n/g;' \\\n -e '    print \"$ARGV:$n:$v\\n\";' \\\n -e '  }'\n\nWhy not just git grep -E ...?\nThat wouldn't work then the doubled words are separated by a newline.\nThis is derived from a Makefile syntax-check rule in gnulib's maint.mk:\n  http://git.sv.gnu.org/cgit/gnulib.git/tree/top/maint.mk\n\nSigned-off-by: Jim Meyering <meyering@redhat.com>\n---\n Documentation/git-sh-i18n--envsubst.txt |    2 +-\n attr.h                                  |    2 +-\n gitweb/static/js/lib/cookies.js         |    2 +-\n po/README                               |    2 +-\n 4 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/git-sh-i18n--envsubst.txt b/Documentation/git-sh-i18n--envsubst.txt\nindex 5c3ec32..2ffaf93 100644\n--- a/Documentation/git-sh-i18n--envsubst.txt\n+++ b/Documentation/git-sh-i18n--envsubst.txt\n@@ -25,7 +25,7 @@ plumbing scripts and/or are writing new ones.\n 'git sh-i18n{litdd}envsubst' is Git's stripped-down copy of the GNU\n `envsubst(1)` program that comes with the GNU gettext package. It's\n used internally by linkgit:git-sh-i18n[1] to interpolate the variables\n-passed to the the `eval_gettext` function.\n+passed to the `eval_gettext` function.\n\n No promises are made about the interface, or that this\n program won't disappear without warning in the next version\ndiff --git a/attr.h b/attr.h\nindex eb8ca0d..dea590a 100644\n--- a/attr.h\n+++ b/attr.h\n@@ -40,7 +40,7 @@ int git_check_attr(const char *path, int, struct git_attr_check *);\n\n /*\n  * Retrieve all attributes that apply to the specified path.  *num\n- * will be set the the number of attributes on the path; **check will\n+ * will be set the number of attributes on the path; **check will\n  * be set to point at a newly-allocated array of git_attr_check\n  * objects describing the attributes and their values.  *check must be\n  * free()ed by the caller.\ndiff --git a/gitweb/static/js/lib/cookies.js b/gitweb/static/js/lib/cookies.js\nindex 72b51cd..66b9a07 100644\n--- a/gitweb/static/js/lib/cookies.js\n+++ b/gitweb/static/js/lib/cookies.js\n@@ -30,7 +30,7 @@\n  *                            If a negative value is specified or a date in the past),\n  *                            the cookie will be deleted.\n  *                            If set to null or omitted, the cookie will be a session cookie\n- *                            and will not be retained when the the browser exits.\n+ *                            and will not be retained when the browser exits.\n  * @param {String} [options.path] Restrict access of a cookie to particular directory\n  *                               (default: path of page that created the cookie).\n  * @param {String} [options.domain] Override what web sites are allowed to access cookie\ndiff --git a/po/README b/po/README\nindex 188ea2c..c1520e8 100644\n--- a/po/README\n+++ b/po/README\n@@ -178,7 +178,7 @@ used:\n\n C:\n\n- - Include builtin.h at the top, it'll pull in in gettext.h, which\n+ - Include builtin.h at the top, it'll pull in gettext.h, which\n    defines the gettext interface. Consult with the list if you need to\n    use gettext.h directly.\n\n--\n1.7.9.3\n\n\n>From e887bda34232bd3cfb63f6a65e534fa14cfa42ca Mon Sep 17 00:00:00 2001\nFrom: Jim Meyering <meyering@redhat.com>\nDate: Wed, 28 Mar 2012 10:34:28 +0200\nSubject: [PATCH 2/2] correct spelling: an URL -> a URL\n\n\nSigned-off-by: Jim Meyering <meyering@redhat.com>\n---\n Documentation/git-submodule.txt             |    2 +-\n Documentation/gitmodules.txt                |    4 ++--\n Documentation/howto/using-merge-subtree.txt |    2 +-\n contrib/svn-fe/svn-fe.txt                   |    2 +-\n http.c                                      |    2 +-\n http.h                                      |    2 +-\n perl/Git.pm                                 |    2 +-\n transport.c                                 |    2 +-\n 8 files changed, 9 insertions(+), 9 deletions(-)\n\ndiff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt\nindex b729649..c243ee5 100644\n--- a/Documentation/git-submodule.txt\n+++ b/Documentation/git-submodule.txt\n@@ -190,7 +190,7 @@ commit for each submodule.\n sync::\n \tSynchronizes submodules' remote URL configuration setting\n \tto the value specified in .gitmodules. It will only affect those\n-\tsubmodules which already have an url entry in .git/config (that is the\n+\tsubmodules which already have a URL entry in .git/config (that is the\n \tcase when they are initialized or freshly added). This is useful when\n \tsubmodule URLs change upstream and you need to update your local\n \trepositories accordingly.\ndiff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt\nindex 4040941..4e1fd52 100644\n--- a/Documentation/gitmodules.txt\n+++ b/Documentation/gitmodules.txt\n@@ -28,7 +28,7 @@ submodule.<name>.path::\n \tbe unique within the .gitmodules file.\n\n submodule.<name>.url::\n-\tDefines an url from where the submodule repository can be cloned.\n+\tDefines a URL from which the submodule repository can be cloned.\n \tThis may be either an absolute URL ready to be passed to\n \tlinkgit:git-clone[1] or (if it begins with ./ or ../) a location\n \trelative to the superproject's origin repository.\n@@ -84,7 +84,7 @@ Consider the following .gitmodules file:\n\n This defines two submodules, `libfoo` and `libbar`. These are expected to\n be checked out in the paths 'include/foo' and 'include/bar', and for both\n-submodules an url is specified which can be used for cloning the submodules.\n+submodules a URL is specified which can be used for cloning the submodules.\n\n SEE ALSO\n --------\ndiff --git a/Documentation/howto/using-merge-subtree.txt b/Documentation/howto/using-merge-subtree.txt\nindex 2933056..1ae8d12 100644\n--- a/Documentation/howto/using-merge-subtree.txt\n+++ b/Documentation/howto/using-merge-subtree.txt\n@@ -25,7 +25,7 @@ What you want is the 'subtree' merge strategy, which helps you in such a\n situation.\n\n In this example, let's say you have the repository at `/path/to/B` (but\n-it can be an URL as well, if you want). You want to merge the 'master'\n+it can be a URL as well, if you want). You want to merge the 'master'\n branch of that repository to the `dir-B` subdirectory in your current\n branch.\n\ndiff --git a/contrib/svn-fe/svn-fe.txt b/contrib/svn-fe/svn-fe.txt\nindex 2dd27ce..1128ab2 100644\n--- a/contrib/svn-fe/svn-fe.txt\n+++ b/contrib/svn-fe/svn-fe.txt\n@@ -51,7 +51,7 @@ as committer, where 'user' is the value of the `svn:author` property\n and 'UUID' the repository's identifier.\n\n To support incremental imports, 'svn-fe' puts a `git-svn-id` line at\n-the end of each commit log message if passed an url on the command\n+the end of each commit log message if passed a URL on the command\n line.  This line has the form `git-svn-id: URL@REVNO UUID`.\n\n The resulting repository will generally require further processing\ndiff --git a/http.c b/http.c\nindex 8ac8eb6..f3f83d7 100644\n--- a/http.c\n+++ b/http.c\n@@ -829,7 +829,7 @@ int http_get_strbuf(const char *url, struct strbuf *result, int options)\n }\n\n /*\n- * Downloads an url and stores the result in the given file.\n+ * Downloads a URL and stores the result in the given file.\n  *\n  * If a previous interrupted download is detected (i.e. a previous temporary\n  * file is still around) the download is resumed.\ndiff --git a/http.h b/http.h\nindex 0b61653..915c286 100644\n--- a/http.h\n+++ b/http.h\n@@ -127,7 +127,7 @@ extern char *get_remote_object_url(const char *url, const char *hex,\n #define HTTP_NOAUTH\t5\n\n /*\n- * Requests an url and stores the result in a strbuf.\n+ * Requests a URL and stores the result in a strbuf.\n  *\n  * If the result pointer is NULL, a HTTP HEAD request is made instead of GET.\n  */\ndiff --git a/perl/Git.pm b/perl/Git.pm\nindex f7ce511..497f420 100644\n--- a/perl/Git.pm\n+++ b/perl/Git.pm\n@@ -691,7 +691,7 @@ The hash is in the format C<refname =\\> hash>. For tags, the C<refname> entry\n contains the tag object while a C<refname^{}> entry gives the tagged objects.\n\n C<REPOSITORY> has the same meaning as the appropriate C<git-ls-remote>\n-argument; either an URL or a remote name (if called on a repository instance).\n+argument; either a URL or a remote name (if called on a repository instance).\n C<GROUPS> is an optional arrayref that can contain 'tags' to return all the\n tags and/or 'heads' to return all the heads. C<REFGLOB> is an optional array\n of strings containing a shell-like glob to further limit the refs returned in\ndiff --git a/transport.c b/transport.c\nindex 181f8f2..ea9dcb6 100644\n--- a/transport.c\n+++ b/transport.c\n@@ -1154,7 +1154,7 @@ int transport_disconnect(struct transport *transport)\n }\n\n /*\n- * Strip username (and password) from an url and return\n+ * Strip username (and password) from a URL and return\n  * it in a newly allocated string.\n  */\n char *transport_anonymize_url(const char *url)\n--\n1.7.9.3\n"},{"id":"187948","messageId":"7vty18wweh.fsf@alter.siamese.dyndns.org","threadId":"30079","inReplyTo":"87d37xun9r.fsf@rho.meyering.net","subject":"Re: [PATCH] correct a few doubled-word nits in comments and documentation","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-03-28T15:57:42Z","receivedAt":"2012-03-28T15:57:42Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks; by the way, you have an extra patch message concatenated after\nthe main one.\n"},{"id":"187950","messageId":"878viku26e.fsf@rho.meyering.net","threadId":"30079","inReplyTo":"7vty18wweh.fsf@alter.siamese.dyndns.org","subject":"[PATCH] correct a few doubled-word nits in comments and documentation","fromName":"Jim Meyering","fromEmail":"jim@meyering.net","sentAt":"2012-03-28T16:21:13Z","receivedAt":"2012-03-28T16:21:13Z","isPatch":true,"sender":{"key":"jim@meyering.net","avatar":"https://avatars.githubusercontent.com/u/710630?v=4"},"body":"\nFound by running this command:\n$ git ls-files -z|xargs -0 perl -0777 -n \\\n -e 'while (/\\b(then?|[iao]n|i[fst]|but|f?or|at|and|[dt]o)\\s+\\1\\b/gims)' \\\n -e '  {' \\\n -e '    $n = ($` =~ tr/\\n/\\n/ + 1);' \\\n -e '    ($v = $&) =~ s/\\n/\\\\n/g;' \\\n -e '    print \"$ARGV:$n:$v\\n\";' \\\n -e '  }'\n\nSigned-off-by: Jim Meyering <meyering@redhat.com>\n---\n> Thanks; by the way, you have an extra patch message concatenated after\n> the main one.\n\nSorry about that.  In case it helps, here's a better version.\n\n\n Documentation/git-sh-i18n--envsubst.txt |    2 +-\n attr.h                                  |    2 +-\n gitweb/static/js/lib/cookies.js         |    2 +-\n po/README                               |    2 +-\n 4 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/git-sh-i18n--envsubst.txt b/Documentation/git-sh-i18n--envsubst.txt\nindex 5c3ec32..2ffaf93 100644\n--- a/Documentation/git-sh-i18n--envsubst.txt\n+++ b/Documentation/git-sh-i18n--envsubst.txt\n@@ -25,7 +25,7 @@ plumbing scripts and/or are writing new ones.\n 'git sh-i18n{litdd}envsubst' is Git's stripped-down copy of the GNU\n `envsubst(1)` program that comes with the GNU gettext package. It's\n used internally by linkgit:git-sh-i18n[1] to interpolate the variables\n-passed to the the `eval_gettext` function.\n+passed to the `eval_gettext` function.\n\n No promises are made about the interface, or that this\n program won't disappear without warning in the next version\ndiff --git a/attr.h b/attr.h\nindex eb8ca0d..dea590a 100644\n--- a/attr.h\n+++ b/attr.h\n@@ -40,7 +40,7 @@ int git_check_attr(const char *path, int, struct git_attr_check *);\n\n /*\n  * Retrieve all attributes that apply to the specified path.  *num\n- * will be set the the number of attributes on the path; **check will\n+ * will be set the number of attributes on the path; **check will\n  * be set to point at a newly-allocated array of git_attr_check\n  * objects describing the attributes and their values.  *check must be\n  * free()ed by the caller.\ndiff --git a/gitweb/static/js/lib/cookies.js b/gitweb/static/js/lib/cookies.js\nindex 72b51cd..66b9a07 100644\n--- a/gitweb/static/js/lib/cookies.js\n+++ b/gitweb/static/js/lib/cookies.js\n@@ -30,7 +30,7 @@\n  *                            If a negative value is specified or a date in the past),\n  *                            the cookie will be deleted.\n  *                            If set to null or omitted, the cookie will be a session cookie\n- *                            and will not be retained when the the browser exits.\n+ *                            and will not be retained when the browser exits.\n  * @param {String} [options.path] Restrict access of a cookie to particular directory\n  *                               (default: path of page that created the cookie).\n  * @param {String} [options.domain] Override what web sites are allowed to access cookie\ndiff --git a/po/README b/po/README\nindex 188ea2c..c1520e8 100644\n--- a/po/README\n+++ b/po/README\n@@ -178,7 +178,7 @@ used:\n\n C:\n\n- - Include builtin.h at the top, it'll pull in in gettext.h, which\n+ - Include builtin.h at the top, it'll pull in gettext.h, which\n    defines the gettext interface. Consult with the list if you need to\n    use gettext.h directly.\n\n--\n1.7.9.3\n"},{"id":"187954","messageId":"20120328174133.GA8732@burratino","threadId":"30079","inReplyTo":"878viku26e.fsf@rho.meyering.net","subject":"Re: [PATCH] correct a few doubled-word nits in comments and documentation","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2012-03-28T17:41:33Z","receivedAt":"2012-03-28T17:41:33Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"(+cc: Ævar for a side note marked with (*) below)\nHi,\n\nJim Meyering wrote:\n\n> Found by running this command:\n> $ git ls-files -z|xargs -0 perl -0777 -n \\\n>  -e 'while (/\\b(then?|[iao]n|i[fst]|but|f?or|at|and|[dt]o)\\s+\\1\\b/gims)' \\\n>  -e '  {' \\\n>  -e '    $n = ($` =~ tr/\\n/\\n/ + 1);' \\\n>  -e '    ($v = $&) =~ s/\\n/\\\\n/g;' \\\n>  -e '    print \"$ARGV:$n:$v\\n\";' \\\n>  -e '  }'\n\nYeah, this often happens when a person returns to writing after being\ninterrupted in the middle of a train of thought.\n\n[...]\n> +++ b/Documentation/git-sh-i18n--envsubst.txt\n> @@ -25,7 +25,7 @@ plumbing scripts and/or are writing new ones.\n[...]\n>  used internally by linkgit:git-sh-i18n[1] to interpolate the variables\n> -passed to the the `eval_gettext` function.\n> +passed to the `eval_gettext` function.\n\nGood catch.\n\n[...]\n> +++ b/attr.h\n> @@ -40,7 +40,7 @@ int git_check_attr(const char *path, int, struct git_attr_check *);\n> \n>  /*\n>   * Retrieve all attributes that apply to the specified path.  *num\n> - * will be set the the number of attributes on the path; **check will\n> + * will be set the number of attributes on the path; **check will\n\nShouldn't this say \"to the\"?\n\n[...]\n> +++ b/gitweb/static/js/lib/cookies.js\n> @@ -30,7 +30,7 @@\n>   *                            If set to null or omitted, the cookie will be a session cookie\n> - *                            and will not be retained when the the browser exits.\n> + *                            and will not be retained when the browser exits.\n\nLooks good.\n\n[...]\n> +++ b/po/README\n> @@ -178,7 +178,7 @@ used:\n> \n>  C:\n> \n> - - Include builtin.h at the top, it'll pull in in gettext.h, which\n> + - Include builtin.h at the top, it'll pull in gettext.h, which\n>     defines the gettext interface. Consult with the list if you need to\n>     use gettext.h directly.\n\nNot related to this patch, but the sentence is a comma splice.  I'm\nalso not convinced that #include-ing builtin.h is actually a good idea\nwhen you are not defining or using functions declared in that header. (*)\n\nBut that's all orthogonal to your patch, so looks good.\n\nPatch for squashing in follows.\n\nThanks,\nJonathan\n\ndiff --git i/attr.h w/attr.h\nindex dea590a7..8b08d33a 100644\n--- i/attr.h\n+++ w/attr.h\n@@ -40,7 +40,7 @@ int git_check_attr(const char *path, int, struct git_attr_check *);\n \n /*\n  * Retrieve all attributes that apply to the specified path.  *num\n- * will be set the number of attributes on the path; **check will\n+ * will be set to the number of attributes on the path; **check will\n  * be set to point at a newly-allocated array of git_attr_check\n  * objects describing the attributes and their values.  *check must be\n  * free()ed by the caller.\n"}]}