{"thread":{"id":"30877","subject":"[PATCH/RFC] Documentation and Code: Fix misspellings and grammar","startedAt":"2012-06-22T22:40:14Z","lastAt":"2012-06-22T23:24:56Z","messageCount":3,"participants":["Leila Muhtasib","Junio C Hamano","Leila"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"194115","messageId":"1340404814-29790-1-git-send-email-muhtasib@gmail.com","threadId":"30877","inReplyTo":null,"subject":"[PATCH/RFC] Documentation and Code: Fix misspellings and grammar","fromName":"Leila Muhtasib","fromEmail":"muhtasib@gmail.com","sentAt":"2012-06-22T22:40:14Z","receivedAt":"2012-06-22T22:40:14Z","isPatch":true,"sender":{"key":"muhtasib@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1618875?v=4"},"body":"\nSigned-off-by: Leila Muhtasib <muhtasib@gmail.com>\n---\nLet me know if you'd like me to break this up into separate patches.\nI ran 'git grep occured' to make sure I got all of them.\nDo you think it's a problem to fix misspellings in printf output?\n\n\n Documentation/git-diff.txt                  |    2 +-\n Documentation/technical/api-credentials.txt |    2 +-\n compat/regex/regcomp.c                      |    4 ++--\n compat/regex/regex_internal.c               |    6 +++---\n gitweb/gitweb.perl                          |    2 +-\n perl/Git/I18N.pm                            |    2 +-\n po/README                                   |    6 +++---\n sequencer.c                                 |    2 +-\n 8 files changed, 13 insertions(+), 13 deletions(-)\n\ndiff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt\nindex f8d0819..6ef3403 100644\n--- a/Documentation/git-diff.txt\n+++ b/Documentation/git-diff.txt\n@@ -38,7 +38,7 @@ directories. This behavior can be forced by --no-index.\n \tcommit relative to the named <commit>.  Typically you\n \twould want comparison with the latest commit, so if you\n \tdo not give <commit>, it defaults to HEAD.\n-\tIf HEAD does not exist (e.g. unborned branches) and\n+\tIf HEAD does not exist (e.g. unborn branches) and\n \t<commit> is not given, it shows all staged changes.\n \t--staged is a synonym of --cached.\n \ndiff --git a/Documentation/technical/api-credentials.txt b/Documentation/technical/api-credentials.txt\nindex 21ca6a2..9a3941a 100644\n--- a/Documentation/technical/api-credentials.txt\n+++ b/Documentation/technical/api-credentials.txt\n@@ -113,7 +113,7 @@ int foo_login(struct foo_connection *f)\n \t\tbreak;\n \tdefault:\n \t\t/*\n-\t\t * Some other error occured. We don't know if the\n+\t\t * Some other error occurred. We don't know if the\n \t\t * credential is good or bad, so report nothing to the\n \t\t * credential subsystem.\n \t\t */\ndiff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c\nindex 8c96ed9..8387f74 100644\n--- a/compat/regex/regcomp.c\n+++ b/compat/regex/regcomp.c\n@@ -2095,7 +2095,7 @@ peek_token_bracket (re_token_t *token, re_string_t *input, reg_syntax_t syntax)\n \n /* Entry point of the parser.\n    Parse the regular expression REGEXP and return the structure tree.\n-   If an error is occured, ERR is set by error code, and return NULL.\n+   If an error has occurred, ERR is set by error code, and return NULL.\n    This function build the following tree, from regular expression <reg_exp>:\n \t   CAT\n \t   / \\\n@@ -3715,7 +3715,7 @@ build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans,\n /* This is intended for the expressions like \"a{1,3}\".\n    Fetch a number from `input', and return the number.\n    Return -1, if the number field is empty like \"{,1}\".\n-   Return -2, If an error is occured.  */\n+   Return -2, If an error has occurred.  */\n \n static int\n fetch_number (re_string_t *input, re_token_t *token, reg_syntax_t syntax)\ndiff --git a/compat/regex/regex_internal.c b/compat/regex/regex_internal.c\nindex 193854c..d4121f2 100644\n--- a/compat/regex/regex_internal.c\n+++ b/compat/regex/regex_internal.c\n@@ -1284,7 +1284,7 @@ re_node_set_merge (re_node_set *dest, const re_node_set *src)\n \n /* Insert the new element ELEM to the re_node_set* SET.\n    SET should not already have ELEM.\n-   return -1 if an error is occured, return 1 otherwise.  */\n+   return -1 if an error has occurred, return 1 otherwise.  */\n \n static int\n internal_function\n@@ -1341,7 +1341,7 @@ re_node_set_insert (re_node_set *set, int elem)\n \n /* Insert the new element ELEM to the re_node_set* SET.\n    SET should not already have any element greater than or equal to ELEM.\n-   Return -1 if an error is occured, return 1 otherwise.  */\n+   Return -1 if an error has occurred, return 1 otherwise.  */\n \n static int\n internal_function\n@@ -1416,7 +1416,7 @@ re_node_set_remove_at (re_node_set *set, int idx)\n \f\n \n /* Add the token TOKEN to dfa->nodes, and return the index of the token.\n-   Or return -1, if an error will be occured.  */\n+   Or return -1, if an error has occurred.  */\n \n static int\n internal_function\ndiff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl\nindex 55e0e9e..0e92e0b 100755\n--- a/gitweb/gitweb.perl\n+++ b/gitweb/gitweb.perl\n@@ -1132,7 +1132,7 @@ sub handle_errors_html {\n \n \t# to avoid infinite loop where error occurs in die_error,\n \t# change handler to default handler, disabling handle_errors_html\n-\tset_message(\"Error occured when inside die_error:\\n$msg\");\n+\tset_message(\"Error occurred when inside die_error:\\n$msg\");\n \n \t# you cannot jump out of die_error when called as error handler;\n \t# the subroutine set via CGI::Carp::set_message is called _after_\ndiff --git a/perl/Git/I18N.pm b/perl/Git/I18N.pm\nindex 40dd897..f889fd6 100644\n--- a/perl/Git/I18N.pm\n+++ b/perl/Git/I18N.pm\n@@ -68,7 +68,7 @@ Git::I18N - Perl interface to Git's Gettext localizations\n \n \tprint __(\"Welcome to Git!\\n\");\n \n-\tprintf __(\"The following error occured: %s\\n\"), $error;\n+\tprintf __(\"The following error occurred: %s\\n\"), $error;\n \n =head1 DESCRIPTION\n \ndiff --git a/po/README b/po/README\nindex c1520e8..d8c9111 100644\n--- a/po/README\n+++ b/po/README\n@@ -232,7 +232,7 @@ Shell:\n \n        # To interpolate variables:\n        details=\"oh noes\"\n-       eval_gettext \"An error occured: \\$details\"; echo\n+       eval_gettext \"An error occurred: \\$details\"; echo\n \n    In addition we have wrappers for messages that end with a trailing\n    newline. I.e. you could write the above as:\n@@ -242,7 +242,7 @@ Shell:\n \n        # To interpolate variables:\n        details=\"oh noes\"\n-       eval_gettextln \"An error occured: \\$details\"\n+       eval_gettextln \"An error occurred: \\$details\"\n \n    More documentation about the interface is available in the GNU info\n    page: `info '(gettext)sh'`. Looking at git-am.sh (the first shell\n@@ -257,7 +257,7 @@ Perl:\n \n        use Git::I18N;\n        print __(\"Welcome to Git!\\n\");\n-       printf __(\"The following error occured: %s\\n\"), $error;\n+       printf __(\"The following error occurred: %s\\n\"), $error;\n \n    Run `perldoc perl/Git/I18N.pm` for more info.\n \ndiff --git a/sequencer.c b/sequencer.c\nindex bf078f2..17d5115 100644\n--- a/sequencer.c\n+++ b/sequencer.c\n@@ -131,7 +131,7 @@ static void print_advice(int show_hint, struct replay_opts *opts)\n \tif (msg) {\n \t\tfprintf(stderr, \"%s\\n\", msg);\n \t\t/*\n-\t\t * A conflict has occured but the porcelain\n+\t\t * A conflict has occurred but the porcelain\n \t\t * (typically rebase --interactive) wants to take care\n \t\t * of the commit itself so remove CHERRY_PICK_HEAD\n \t\t */\n-- \n1.7.7.5 (Apple Git-26)\n"},{"id":"194117","messageId":"7vd34rlzxk.fsf@alter.siamese.dyndns.org","threadId":"30877","inReplyTo":"1340404814-29790-1-git-send-email-muhtasib@gmail.com","subject":"Re: [PATCH/RFC] Documentation and Code: Fix misspellings and grammar","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-06-22T22:55:19Z","receivedAt":"2012-06-22T22:55:19Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Leila Muhtasib <muhtasib@gmail.com> writes:\n\n> Signed-off-by: Leila Muhtasib <muhtasib@gmail.com>\n> ---\n> Let me know if you'd like me to break this up into separate patches.\n> I ran 'git grep occured' to make sure I got all of them.\n\nI am tempted to suggest \"one word per patch\" ;-)\n\nAlso you might want to take a look at \n\n    http://thread.gmane.org/gmane.comp.version-control.git/199033\n\n> Do you think it's a problem to fix misspellings in printf output?\n\nIt depends, but in a sense, typos in comments are a lot lower\npriority (nobody is hurt if we do not fix them, and if such a fix\ninterferes with topics in flight, it is more nuisance than it is\nworth and it would be greatly appreciated if you hold off typofixes\nuntil the dust settles).\n\nProgram output affects the end user experience, so it is more\nimportant.\n\nChanges to strings marked with _() for l10n should come early in the\ndevelopment cycle so that translators have enough time to prepare\nfor it before the release.\n"},{"id":"194118","messageId":"CAA3EhHJx7N=T77CRb=SfqOmaEFf8bHN5NZdx1u=q6+0d-fQcpA@mail.gmail.com","threadId":"30877","inReplyTo":"7vd34rlzxk.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH/RFC] Documentation and Code: Fix misspellings and grammar","fromName":"Leila","fromEmail":"muhtasib@gmail.com","sentAt":"2012-06-22T23:24:56Z","receivedAt":"2012-06-22T23:24:56Z","isPatch":true,"sender":{"key":"muhtasib@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1618875?v=4"},"body":"On Fri, Jun 22, 2012 at 6:55 PM, Junio C Hamano <gitster@pobox.com> wrote:\n> I am tempted to suggest \"one word per patch\" ;-)\n\nI can do that, no problem. That's my preference too.\n\n>\n> Also you might want to take a look at\n>\n>    http://thread.gmane.org/gmane.comp.version-control.git/199033\n\nContext is important, I agree.\n\n>\n>> Do you think it's a problem to fix misspellings in printf output?\n>\n> It depends, but in a sense, typos in comments are a lot lower\n> priority (nobody is hurt if we do not fix them, and if such a fix\n> interferes with topics in flight, it is more nuisance than it is\n> worth and it would be greatly appreciated if you hold off typofixes\n> until the dust settles).\n>\n\nThat makes total sense. I'll hold off on typos in comments. Actually,\nthe only reason I included them was because they showed up when I did\na 'git grep <misspelled word>', so I went ahead and fixed everything.\nHow do I know when the dust has settled? Is that after you release a\nversion? 1.7.11 released on June 17, so that wasn't that long ago?\n\n\n> Program output affects the end user experience, so it is more\n> important.\n>\n> Changes to strings marked with _() for l10n should come early in the\n> development cycle so that translators have enough time to prepare\n> for it before the release.\n\nAre we early in the dev cycle? Should I prepare a separate patch with\njust the misspellings that affect end user experience?\n\nThanks!\nLeila\n"}]}