{"thread":{"id":"33483","subject":"[PATCH] Various typofixes","startedAt":"2013-04-11T20:55:59Z","lastAt":"2013-04-18T01:44:27Z","messageCount":34,"participants":["Stefano Lattarini","Eric Sunshine","Junio C Hamano","Jonathan Nieder","Sebastian Schuberth","Matthieu Moy","Jakub Narębski","Drew Northup"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"214005","messageId":"4cb23e38819d620f53be032d0765fbe374ddb717.1365712583.git.stefano.lattarini@gmail.com","threadId":"33483","inReplyTo":null,"subject":"[PATCH] Various typofixes","fromName":"Stefano Lattarini","fromEmail":"stefano.lattarini@gmail.com","sentAt":"2013-04-11T20:55:59Z","receivedAt":"2013-04-11T20:55:59Z","isPatch":true,"sender":{"key":"stefano.lattarini@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1429199?v=4"},"body":"Mostly suggested by codespell \n\nSigned-off-by: Stefano Lattarini \n---\n Documentation/git-credential.txt | 2 +-\n Documentation/git-remote-ext.txt | 2 +-\n Documentation/git-svn.txt | 4 ++--\n Documentation/git-tools.txt | 2 +-\n Documentation/revisions.txt | 2 +-\n Documentation/technical/api-argv-array.txt | 2 +-\n Documentation/technical/api-credentials.txt | 2 +-\n Documentation/technical/api-ref-iteration.txt | 2 +-\n builtin/apply.c | 6 +++---\n commit.c | 2 +-\n commit.h | 2 +-\n compat/nedmalloc/Readme.txt | 2 +-\n compat/nedmalloc/malloc.c.h | 6 +++---\n compat/obstack.h | 2 +-\n compat/precompose_utf8.c | 2 +-\n compat/regex/regcomp.c | 4 ++--\n compat/regex/regex.c | 2 +-\n compat/regex/regex_internal.c | 6 +++---\n contrib/mw-to-git/git-remote-mediawiki.perl | 6 +++---\n contrib/mw-to-git/t/README | 6 +++---\n contrib/mw-to-git/t/install-wiki/LocalSettings.php | 2 +-\n contrib/mw-to-git/t/t9360-mw-to-git-clone.sh | 2 +-\n contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh | 10 +++++-----\n contrib/subtree/t/t7900-subtree.sh | 2 +-\n diff.c | 2 +-\n git-add--interactive.perl | 2 +-\n git-cvsserver.perl | 4 ++--\n git-gui/lib/blame.tcl | 2 +-\n git-gui/lib/index.tcl | 2 +-\n git-gui/lib/spellcheck.tcl | 4 ++--\n git-quiltimport.sh | 2 +-\n gitweb/INSTALL | 2 +-\n gitweb/gitweb.perl | 6 +++---\n kwset.c | 4 ++--\n perl/Git.pm | 2 +-\n perl/Git/I18N.pm | 2 +-\n perl/private-Error.pm | 2 +-\n po/README | 6 +++---\n sequencer.c | 2 +-\n t/t1006-cat-file.sh | 2 +-\n t/t3511-cherry-pick-x.sh | 4 ++--\n t/t3701-add-interactive.sh | 2 +-\n t/t4014-format-patch.sh | 6 +++---\n t/t4124-apply-ws-rule.sh | 2 +-\n t/t6030-bisect-porcelain.sh | 2 +-\n t/t7601-merge-pull-config.sh | 2 +-\n t/t7610-mergetool.sh | 2 +-\n t/t9001-send-email.sh | 4 ++--\n transport-helper.c | 2 +-\n transport.h | 2 +-\n xdiff/xdiffi.c | 2 +-\n xdiff/xhistogram.c | 2 +-\n 52 files changed, 79 insertions(+), 79 deletions(-)\n\ndiff --git a/Documentation/git-credential.txt b/Documentation/git-credential.txt\nindex 472f00f..7da0f13 100644\n--- a/Documentation/git-credential.txt\n+++ b/Documentation/git-credential.txt\n@@ -56,7 +56,7 @@ For example, if we want a password for\n `https://example.com/foo.git`, we might generate the following\n credential description (don't forget the blank line at the end; it\n tells `git credential` that the application finished feeding all the\n-infomation it has):\n+information it has):\n \n \t protocol=https\n \t host=example.com\ndiff --git a/Documentation/git-remote-ext.txt b/Documentation/git-remote-ext.txt\nindex 58b7fac..8cfc748 100644\n--- a/Documentation/git-remote-ext.txt\n+++ b/Documentation/git-remote-ext.txt\n@@ -86,7 +86,7 @@ begins with `ext::`. Examples:\n \tedit .ssh/config.\n \n \"ext::socat -t3600 - ABSTRACT-CONNECT:/git-server %G/somerepo\"::\n-\tRepresents repository with path /somerepo accessable over\n+\tRepresents repository with path /somerepo accessible over\n \tgit protocol at abstract namespace address /git-server.\n \n \"ext::git-server-alias foo %G/repo\"::\ndiff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt\nindex 1b8b649..7706d41 100644\n--- a/Documentation/git-svn.txt\n+++ b/Documentation/git-svn.txt\n@@ -245,7 +245,7 @@ first have already been pushed into SVN.\n \tpatch), \"all\" (accept all patches), or \"quit\".\n \t+\n \t'git svn dcommit' returns immediately if answer if \"no\" or \"quit\", without\n-\tcommiting anything to SVN.\n+\tcommitting anything to SVN.\n \n 'branch'::\n \tCreate a branch in the SVN repository.\n@@ -856,7 +856,7 @@ HANDLING OF SVN BRANCHES\n ------------------------\n If 'git svn' is configured to fetch branches (and --follow-branches\n is in effect), it sometimes creates multiple Git branches for one\n-SVN branch, where the addtional branches have names of the form\n+SVN branch, where the additional branches have names of the form\n 'branchname@nnn' (with nnn an SVN revision number). These additional\n branches are created if 'git svn' cannot find a parent commit for the\n first commit in an SVN branch, to connect the branch to the history of\ndiff --git a/Documentation/git-tools.txt b/Documentation/git-tools.txt\nindex ad8b823..78a0d95 100644\n--- a/Documentation/git-tools.txt\n+++ b/Documentation/git-tools.txt\n@@ -109,7 +109,7 @@ Others\n \n - *git.el* (contrib/)\n \n- This is an Emacs interface for Git. The user interface is modeled on\n+ This is an Emacs interface for Git. The user interface is modelled on\n pcl-cvs. It has been developed on Emacs 21 and will probably need some\n tweaking to work on XEmacs.\n \ndiff --git a/Documentation/revisions.txt b/Documentation/revisions.txt\nindex 1707d45..8855b1a 100644\n--- a/Documentation/revisions.txt\n+++ b/Documentation/revisions.txt\n@@ -55,7 +55,7 @@ when you run `git cherry-pick`.\n +\n Note that any of the 'refs/*' cases above may come either from\n the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n-While the ref name encoding is unspecified, UTF-8 is prefered as\n+While the ref name encoding is unspecified, UTF-8 is preferred as\n some output processing may assume ref names in UTF-8.\n \n '@\\{\\}', e.g. 'master@\\{yesterday\\}', 'HEAD@\\{5 minutes ago\\}'::\ndiff --git a/Documentation/technical/api-argv-array.txt b/Documentation/technical/api-argv-array.txt\nindex a959517..a6b7d83 100644\n--- a/Documentation/technical/api-argv-array.txt\n+++ b/Documentation/technical/api-argv-array.txt\n@@ -55,7 +55,7 @@ Functions\n \tinitial, empty state.\n \n `argv_array_detach`::\n-\tDetach the argv array from the `struct argv_array`, transfering\n+\tDetach the argv array from the `struct argv_array`, transferring\n \townership of the allocated array and strings.\n \n `argv_array_free_detached`::\ndiff --git a/Documentation/technical/api-credentials.txt b/Documentation/technical/api-credentials.txt\nindex 516fda7..c1b42a4 100644\n--- a/Documentation/technical/api-credentials.txt\n+++ b/Documentation/technical/api-credentials.txt\n@@ -160,7 +160,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/Documentation/technical/api-ref-iteration.txt b/Documentation/technical/api-ref-iteration.txt\nindex dbbea95..aa1c50f 100644\n--- a/Documentation/technical/api-ref-iteration.txt\n+++ b/Documentation/technical/api-ref-iteration.txt\n@@ -35,7 +35,7 @@ Iteration functions\n * `head_ref_submodule()`, `for_each_ref_submodule()`,\n `for_each_ref_in_submodule()`, `for_each_tag_ref_submodule()`,\n `for_each_branch_ref_submodule()`, `for_each_remote_ref_submodule()`\n- do the same as the functions descibed above but for a specified\n+ do the same as the functions described above but for a specified\n submodule.\n \n * `for_each_rawref()` can be used to learn about broken ref and symref.\ndiff --git a/builtin/apply.c b/builtin/apply.c\nindex 5b882d0..30eefc3 100644\n--- a/builtin/apply.c\n+++ b/builtin/apply.c\n@@ -1921,7 +1921,7 @@ static int parse_binary(char *buffer, unsigned long size, struct patch *patch)\n }\n \n /*\n- * Read the patch text in \"buffer\" taht extends for \"size\" bytes; stop\n+ * Read the patch text in \"buffer\" that extends for \"size\" bytes; stop\n * reading after seeing a single patch (i.e. changes to a single file).\n * Create fragments (i.e. patch hunks) and hang them to the given patch.\n * Return the number of bytes consumed, so that the caller can call us\n@@ -3029,7 +3029,7 @@ static struct patch *in_fn_table(const char *name)\n *\n * The latter is needed to deal with a case where two paths A and B\n * are swapped by first renaming A to B and then renaming B to A;\n- * moving A to B should not be prevented due to presense of B as we\n+ * moving A to B should not be prevented due to presence of B as we\n * will remove it in a later patch.\n */\n #define PATH_TO_BE_DELETED ((struct patch *) -2)\n@@ -3513,7 +3513,7 @@ static int check_patch(struct patch *patch)\n \t *\n \t * A patch to swap-rename between A and B would first rename A\n \t * to B and then rename B to A. While applying the first one,\n-\t * the presense of B should not stop A from getting renamed to\n+\t * the presence of B should not stop A from getting renamed to\n \t * B; ask to_be_deleted() about the later rename. Removal of\n \t * B and rename from A to B is handled the same way by asking\n \t * was_deleted().\ndiff --git a/commit.c b/commit.c\nindex 516a4ff..888e02a 100644\n--- a/commit.c\n+++ b/commit.c\n@@ -841,7 +841,7 @@ struct commit_list *get_merge_bases(struct commit *one, struct commit *two,\n }\n \n /*\n- * Is \"commit\" a decendant of one of the elements on the \"with_commit\" list?\n+ * Is \"commit\" a descendant of one of the elements on the \"with_commit\" list?\n */\n int is_descendant_of(struct commit *commit, struct commit_list *with_commit)\n {\ndiff --git a/commit.h b/commit.h\nindex 87b4b6c..057ff80 100644\n--- a/commit.h\n+++ b/commit.h\n@@ -166,7 +166,7 @@ extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *r\n extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos, int cleanup);\n extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);\n \n-/* largest postive number a signed 32-bit integer can contain */\n+/* largest positive number a signed 32-bit integer can contain */\n #define INFINITE_DEPTH 0x7fffffff\n \n extern int register_shallow(const unsigned char *sha1);\ndiff --git a/compat/nedmalloc/Readme.txt b/compat/nedmalloc/Readme.txt\nindex e46d8f1..07cbf50 100644\n--- a/compat/nedmalloc/Readme.txt\n+++ b/compat/nedmalloc/Readme.txt\n@@ -97,7 +97,7 @@ Chew for reporting this.\n \n v1.04alpha_svn915 7th October 2006:\n * Fixed failure to unlock thread cache list if allocating a new list failed.\n-Thanks to Dmitry Chichkov for reporting this. Futher thanks to Aleksey Sanin.\n+Thanks to Dmitry Chichkov for reporting this. Further thanks to Aleksey Sanin.\n * Fixed realloc(0, ) segfaulting. Thanks to Dmitry Chichkov for\n reporting this.\n * Made config defines #ifndef so they can be overridden by the build system.\ndiff --git a/compat/nedmalloc/malloc.c.h b/compat/nedmalloc/malloc.c.h\nindex ff7c2c4..1401a67 100644\n--- a/compat/nedmalloc/malloc.c.h\n+++ b/compat/nedmalloc/malloc.c.h\n@@ -4778,7 +4778,7 @@ void* dlmalloc(size_t bytes) {\n \n void dlfree(void* mem) {\n /*\n- Consolidate freed chunks with preceeding or succeeding bordering\n+ Consolidate freed chunks with preceding or succeeding bordering\n free chunks, if they exist, and then place in a bin. Intermixed\n with special cases for top, dv, mmapped chunks, and usage errors.\n */\n@@ -5680,10 +5680,10 @@ History:\n \tWolfram Gloger (Gloger@lrz.uni-muenchen.de).\n * Use last_remainder in more cases.\n * Pack bins using idea from colin@nyx10.cs.du.edu\n- * Use ordered bins instead of best-fit threshhold\n+ * Use ordered bins instead of best-fit threshold\n * Eliminate block-local decls to simplify tracing and debugging.\n * Support another case of realloc via move into top\n- * Fix error occuring when initial sbrk_base not word-aligned.\n+ * Fix error occurring when initial sbrk_base not word-aligned.\n * Rely on page size for units instead of SBRK_UNIT to\n \tavoid surprises about sbrk alignment conventions.\n * Add mallinfo, mallopt. Thanks to Raymond Nijssen\ndiff --git a/compat/obstack.h b/compat/obstack.h\nindex d178bd6..ceb4bdb 100644\n--- a/compat/obstack.h\n+++ b/compat/obstack.h\n@@ -128,7 +128,7 @@ extern \"C\" {\n \n #define __BPTR_ALIGN(B, P, A) ((B) + (((P) - (B) + (A)) & ~(A)))\n \n-/* Similiar to _BPTR_ALIGN (B, P, A), except optimize the common case\n+/* Similar to _BPTR_ALIGN (B, P, A), except optimize the common case\n where pointers can be converted to integers, aligned as integers,\n and converted back again. If PTR_INT_TYPE is narrower than a\n pointer (e.g., the AS/400), play it safe and compute the alignment\ndiff --git a/compat/precompose_utf8.c b/compat/precompose_utf8.c\nindex 8cf5955..030174d 100644\n--- a/compat/precompose_utf8.c\n+++ b/compat/precompose_utf8.c\n@@ -134,7 +134,7 @@ struct dirent_prec_psx *precompose_utf8_readdir(PREC_DIR *prec_dir)\n \t\t\tif (prec_dir->ic_precompose == (iconv_t)-1) {\n \t\t\t\tdie(\"iconv_open(%s,%s) failed, but needed:\\n\"\n \t\t\t\t\t\t\" precomposed unicode is not supported.\\n\"\n-\t\t\t\t\t\t\" If you wnat to use decomposed unicode, run\\n\"\n+\t\t\t\t\t\t\" If you want to use decomposed unicode, run\\n\"\n \t\t\t\t\t\t\" \\\"git config core.precomposeunicode false\\\"\\n\",\n \t\t\t\t\t\trepo_encoding, path_encoding);\n \t\t\t} else {\ndiff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c\nindex 8c96ed9..aab8153 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 is occurred, ERR is set by error code, and return NULL.\n This function build the following tree, from regular expression :\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 is 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.c b/compat/regex/regex.c\nindex 3dd8dfa..6aaae00 100644\n--- a/compat/regex/regex.c\n+++ b/compat/regex/regex.c\n@@ -22,7 +22,7 @@\n #include \"config.h\"\n #endif\n \n-/* Make sure noone compiles this code with a C++ compiler. */\n+/* Make sure no one compiles this code with a C++ compiler. */\n #ifdef __cplusplus\n # error \"This is C code, use a C compiler\"\n #endif\ndiff --git a/compat/regex/regex_internal.c b/compat/regex/regex_internal.c\nindex 193854c..237642c 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 is 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 is 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 will be occurred. */\n \n static int\n internal_function\ndiff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl\nindex 094129d..9c14c1f 100755\n--- a/contrib/mw-to-git/git-remote-mediawiki.perl\n+++ b/contrib/mw-to-git/git-remote-mediawiki.perl\n@@ -28,7 +28,7 @@ use warnings;\n use constant SLASH_REPLACEMENT => \"%2F\";\n \n # It's not always possible to delete pages (may require some\n-# priviledges). Deleted pages are replaced with this content.\n+# privileges). Deleted pages are replaced with this content.\n use constant DELETED_CONTENT => \"[[Category:Deleted]]\\n\";\n \n # It's not possible to create empty pages. New empty files in Git are\n@@ -841,7 +841,7 @@ sub mw_import_ref {\n \tif ($fetch_from == 1 && $n == 0) {\n \t\tprint STDERR \"You appear to have cloned an empty MediaWiki.\\n\";\n \t\t# Something has to be done remote-helper side. If nothing is done, an error is\n-\t\t# thrown saying that HEAD is refering to unknown object 0000000000000000000\n+\t\t# thrown saying that HEAD is referring to unknown object 0000000000000000000\n \t\t# and the clone fails.\n \t}\n }\n@@ -1067,7 +1067,7 @@ sub mw_push_file {\n \t\tmy $file_content;\n \t\tif ($page_deleted) {\n \t\t\t# Deleting a page usually requires\n-\t\t\t# special priviledges. A common\n+\t\t\t# special privileges. A common\n \t\t\t# convention is to replace the page\n \t\t\t# with this content instead:\n \t\t\t$file_content = DELETED_CONTENT;\ndiff --git a/contrib/mw-to-git/t/README b/contrib/mw-to-git/t/README\nindex 96e9739..03f6ee5 100644\n--- a/contrib/mw-to-git/t/README\n+++ b/contrib/mw-to-git/t/README\n@@ -25,7 +25,7 @@ Principles and Technical Choices\n \n The test environment makes it easy to install and manipulate one or\n several MediaWiki instances. To allow developers to run the testsuite\n-easily, the environment does not require root priviledge (except to\n+easily, the environment does not require root privilege (except to\n install the required packages if needed). It starts a webserver\n instance on the user's account (using lighttpd greatly helps for\n that), and does not need a separate database daemon (thanks to the use\n@@ -81,7 +81,7 @@ parameters, please refer to the `test-gitmw-lib.sh` and\n \n ** `test_check_wiki_precond`:\n Check if the tests must be skipped or not. Please use this function\n-at the beggining of each new test file.\n+at the beginning of each new test file.\n \n ** `wiki_getpage`:\n Fetch a given page from the wiki and puts its content in the\n@@ -113,7 +113,7 @@ Tests if a given page exists on the wiki.\n \n ** `wiki_reset`:\n Reset the wiki, i.e. flush the database. Use this function at the\n-begining of each new test, except if the test re-uses the same wiki\n+beginning of each new test, except if the test re-uses the same wiki\n (and history) as the previous test.\n \n How to write a new test\ndiff --git a/contrib/mw-to-git/t/install-wiki/LocalSettings.php b/contrib/mw-to-git/t/install-wiki/LocalSettings.php\nindex 29f1251..745e47e 100644\n--- a/contrib/mw-to-git/t/install-wiki/LocalSettings.php\n+++ b/contrib/mw-to-git/t/install-wiki/LocalSettings.php\n@@ -88,7 +88,7 @@ $wgShellLocale = \"en_US.utf8\";\n \n ## Set $wgCacheDirectory to a writable directory on the web server\n ## to make your wiki go slightly faster. The directory should not\n-## be publically accessible from the web.\n+## be publicly accessible from the web.\n #$wgCacheDirectory = \"$IP/cache\";\n \n # Site language code, should be one of the list in ./languages/Names.php\ndiff --git a/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh b/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh\nindex 811a90c..a54621c 100755\n--- a/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh\n+++ b/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh\n@@ -125,7 +125,7 @@ test_expect_success 'Git clone works with one specific page cloned ' '\n \twiki_editpage foo \"I will not be cloned\" false &&\n \twiki_editpage bar \"Do not clone me\" false &&\n \twiki_editpage namnam \"I will be cloned :)\" false -s=\"this log must stay\" &&\n-\twiki_editpage nyancat \"nyan nyan nyan you cant clone me\" false &&\n+\twiki_editpage nyancat \"nyan nyan nyan you cannot clone me\" false &&\n \tgit clone -c remote.origin.pages=namnam \\\n \t\tmediawiki::'\"$WIKI_URL\"' mw_dir_8 &&\n \ttest_contains_N_files mw_dir_8 1 &&\ndiff --git a/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh b/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh\nindex b6405ce..e764ddc 100755\n--- a/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh\n+++ b/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh\n@@ -139,7 +139,7 @@ test_expect_success 'character $ in file name (git -> mw) ' '\n '\n \n \n-test_expect_failure 'capital at the begining of file names' '\n+test_expect_failure 'capital at the beginning of file names' '\n \twiki_reset &&\n \tgit clone mediawiki::'\"$WIKI_URL\"' mw_dir_10 &&\n \t(\n@@ -156,7 +156,7 @@ test_expect_failure 'capital at the begining of file names' '\n '\n \n \n-test_expect_failure 'special character at the begining of file name from mw to git' '\n+test_expect_failure 'special character at the beginning of file name from mw to git' '\n \twiki_reset &&\n \tgit clone mediawiki::'\"$WIKI_URL\"' mw_dir_11 &&\n \twiki_editpage {char_1 \"expect to be renamed {char_1\" false &&\n@@ -207,7 +207,7 @@ test_expect_success 'test of correct formating for file name from mw to git' '\n '\n \n \n-test_expect_failure 'test of correct formating for file name begining with special character' '\n+test_expect_failure 'test of correct formating for file name beginning with special character' '\n \twiki_reset &&\n \tgit clone mediawiki::'\"$WIKI_URL\"' mw_dir_13 &&\n \t(\n@@ -215,7 +215,7 @@ test_expect_failure 'test of correct formating for file name begining with speci\n \t\techo \"my new file {char_1\" >\\{char_1.mw &&\n \t\techo \"my new file [char_2\" >\\[char_2.mw &&\n \t\tgit add . &&\n-\t\tgit commit -am \"commiting some exotic file name...\" &&\n+\t\tgit commit -am \"committing some exotic file name...\" &&\n \t\tgit push &&\n \t\tgit pull\n \t) &&\n@@ -234,7 +234,7 @@ test_expect_success 'test of correct formating for file name from git to mw' '\n \t\techo \"my new file char{_1\" >Char\\{_1.mw &&\n \t\techo \"my new file char[_2\" >Char\\[_2.mw &&\n \t\tgit add . &&\n-\t\tgit commit -m \"commiting some exotic file name...\" &&\n+\t\tgit commit -m \"committing some exotic file name...\" &&\n \t\tgit push\n \t) &&\n \twiki_getallpage ref_page_14 &&\ndiff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh\nindex 80d3399..4729521 100755\n--- a/contrib/subtree/t/t7900-subtree.sh\n+++ b/contrib/subtree/t/t7900-subtree.sh\n@@ -419,7 +419,7 @@ test_expect_success 'add main-sub5' '\n test_expect_success 'split for main-sub5 without --onto' '\n # also test that we still can split out an entirely new subtree\n # if the parent of the first commit in the tree is not empty,\n- # then the new subtree has accidently been attached to something\n+ # then the new subtree has accidentally been attached to something\n git subtree split --prefix subdir2 --branch mainsub5 &&\n check_equal ''\"$(git log --pretty=format:%P -1 mainsub5)\"'' \"\"\n '\ndiff --git a/diff.c b/diff.c\nindex db952a5..0eb2653 100644\n--- a/diff.c\n+++ b/diff.c\n@@ -1565,7 +1565,7 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)\n \t * Binary files are displayed with \"Bin XXX -> YYY bytes\"\n \t * instead of the change count and graph. This part is treated\n \t * similarly to the graph part, except that it is not\n-\t * \"scaled\". If total width is too small to accomodate the\n+\t * \"scaled\". If total width is too small to accommodate the\n \t * guaranteed minimum width of the filename part and the\n \t * separators and this message, this message will \"overflow\"\n \t * making the line longer than the maximum width.\ndiff --git a/git-add--interactive.perl b/git-add--interactive.perl\nindex 710764a..d2c4ce6 100755\n--- a/git-add--interactive.perl\n+++ b/git-add--interactive.perl\n@@ -1247,7 +1247,7 @@ sub summarize_hunk {\n \n \n # Print a one-line summary of each hunk in the array ref in\n-# the first argument, starting wih the index in the 2nd.\n+# the first argument, starting with the index in the 2nd.\n sub display_hunks {\n \tmy ($hunks, $i) = @_;\n \tmy $ctr = 0;\ndiff --git a/git-cvsserver.perl b/git-cvsserver.perl\nindex f1c3f49..a0d796e 100755\n--- a/git-cvsserver.perl\n+++ b/git-cvsserver.perl\n@@ -2911,7 +2911,7 @@ sub filenamesplit\n }\n \n # Cleanup various junk in filename (try to canonicalize it), and\n-# add prependdir to accomodate running CVS client from a\n+# add prependdir to accommodate running CVS client from a\n # subdirectory (so the output is relative to top directory of the project).\n sub filecleanup\n {\n@@ -4583,7 +4583,7 @@ sub getmeta\n # the numerical value of the corresponding byte plus\n # 100.\n # - \"plus 100\" avoids \"0\"s, and also reduces the\n- # likelyhood of a collision in the case that someone someday\n+ # likelihood of a collision in the case that someone someday\n # writes an import tool that tries to preserve original\n # CVS revision numbers, and the original CVS data had done\n # lots of branches off of branches and other strangeness to\ndiff --git a/git-gui/lib/blame.tcl b/git-gui/lib/blame.tcl\nindex 324f774..b1d15f4 100644\n--- a/git-gui/lib/blame.tcl\n+++ b/git-gui/lib/blame.tcl\n@@ -5,7 +5,7 @@ class blame {\n \n image create photo ::blame::img_back_arrow -data {R0lGODlhGAAYAIUAAPwCBEzKXFTSZIz+nGzmhGzqfGTidIT+nEzGXHTqhGzmfGzifFzadETCVES+VARWDFzWbHzyjAReDGTadFTOZDSyRDyyTCymPARaFGTedFzSbDy2TCyqRCyqPARaDAyCHES6VDy6VCyiPAR6HCSeNByWLARyFARiDARqFGTifARiFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAYABgAAAajQIBwSCwaj8ikcsk0BppJwRPqHEypQwHBis0WDAdEFyBIKBaMAKLBdjQeSkFBYTBAIvgEoS6JmhUTEwIUDQ4VFhcMGEhyCgoZExoUaxsWHB0THkgfAXUGAhoBDSAVFR0XBnCbDRmgog0hpSIiDJpJIyEQhBUcJCIlwA22SSYVogknEg8eD82qSigdDSknY0IqJQXPYxIl1dZCGNvWw+Dm510GQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7}\n \n-# Persistant data (survives loads)\n+# Persistent data (survives loads)\n #\n field history {}; # viewer history: {commit path}\n field header ; # array commit,key -> header field\ndiff --git a/git-gui/lib/index.tcl b/git-gui/lib/index.tcl\nindex 8efbbdd..74a81a7 100644\n--- a/git-gui/lib/index.tcl\n+++ b/git-gui/lib/index.tcl\n@@ -414,7 +414,7 @@ proc revert_helper {txt paths} {\n \t# such distinction is needed in some languages. Previously, the\n \t# code used \"Revert changes in\" for both, but that can't work\n \t# in languages where 'in' must be combined with word from\n-\t# rest of string (in diffrent way for both cases of course).\n+\t# rest of string (in different way for both cases of course).\n \t#\n \t# FIXME: Unfortunately, even that isn't enough in some languages\n \t# as they have quite complex plural-form rules. Unfortunately,\ndiff --git a/git-gui/lib/spellcheck.tcl b/git-gui/lib/spellcheck.tcl\nindex e612030..538d61c 100644\n--- a/git-gui/lib/spellcheck.tcl\n+++ b/git-gui/lib/spellcheck.tcl\n@@ -14,7 +14,7 @@ field w_menu ; # context menu for the widget\n field s_menuidx 0 ; # last index of insertion into $w_menu\n \n field s_i {} ; # timer registration for _run callbacks\n-field s_clear 0 ; # did we erase mispelled tags yet?\n+field s_clear 0 ; # did we erase misspelled tags yet?\n field s_seen [list] ; # lines last seen from $w_text in _run\n field s_checked [list] ; # lines already checked\n field s_pending [list] ; # [$line $data] sent to ispell/aspell\n@@ -259,7 +259,7 @@ method _run {} {\n \t\tif {$n == $cur_line\n \t\t && ![regexp {^\\W$} [$w_text get $cur_pos insert]]} {\n \n-\t\t\t# If the current word is mispelled remove the tag\n+\t\t\t# If the current word is misspelled remove the tag\n \t\t\t# but force a spellcheck later.\n \t\t\t#\n \t\t\tset tags [$w_text tag names $cur_pos]\ndiff --git a/git-quiltimport.sh b/git-quiltimport.sh\nindex 9a6ba2b..8e17525 100755\n--- a/git-quiltimport.sh\n+++ b/git-quiltimport.sh\n@@ -59,7 +59,7 @@ tmp_patch=\"$tmp_dir/patch\"\n tmp_info=\"$tmp_dir/info\"\n \n \n-# Find the intial commit\n+# Find the initial commit\n commit=$(git rev-parse HEAD)\n \n mkdir $tmp_dir || exit 2\ndiff --git a/gitweb/INSTALL b/gitweb/INSTALL\nindex 6d45406..08f3dda 100644\n--- a/gitweb/INSTALL\n+++ b/gitweb/INSTALL\n@@ -244,7 +244,7 @@ for gitweb (in gitweb/README), and gitweb.conf(5) manpage.\n through the GITWEB_CONFIG_SYSTEM environment variable.\n \n Note that if per-instance configuration file exists, then system-wide\n- configuration is _not used at all_. This is quite untypical and suprising\n+ configuration is _not used at all_. This is quite untypical and surprising\n behavior. On the other hand changing current behavior would break backwards\n compatibility and can lead to unexpected changes in gitweb behavior.\n Therefore gitweb also looks for common system-wide configuration file,\ndiff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl\nindex 1309196..80950c0 100755\n--- a/gitweb/gitweb.perl\n+++ b/gitweb/gitweb.perl\n@@ -683,7 +683,7 @@ sub evaluate_gitweb_config {\n \tour $GITWEB_CONFIG_SYSTEM = $ENV{'GITWEB_CONFIG_SYSTEM'} || \"++GITWEB_CONFIG_SYSTEM++\";\n \tour $GITWEB_CONFIG_COMMON = $ENV{'GITWEB_CONFIG_COMMON'} || \"++GITWEB_CONFIG_COMMON++\";\n \n-\t# Protect agains duplications of file names, to not read config twice.\n+\t# Protect against duplications of file names, to not read config twice.\n \t# Only one of $GITWEB_CONFIG and $GITWEB_CONFIG_SYSTEM is used, so\n \t# there possibility of duplication of filename there doesn't matter.\n \t$GITWEB_CONFIG = \"\" if ($GITWEB_CONFIG eq $GITWEB_CONFIG_COMMON);\n@@ -1136,7 +1136,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_\n@@ -7485,7 +7485,7 @@ sub git_object {\n \t\tsystem(git_cmd(), \"cat-file\", '-e', $hash_base) == 0\n \t\t\tor die_error(404, \"Base object does not exist\");\n \n-\t\t# here errors should not hapen\n+\t\t# here errors should not happen\n \t\topen my $fd, \"-|\", git_cmd(), \"ls-tree\", $hash_base, \"--\", $file_name\n \t\t\tor die_error(500, \"Open git-ls-tree failed\");\n \t\tmy $line = <$fd>;\ndiff --git a/kwset.c b/kwset.c\nindex 51b2ab6..5800999 100644\n--- a/kwset.c\n+++ b/kwset.c\n@@ -26,7 +26,7 @@\n The author may be reached (Email) at the address mike@ai.mit.edu,\n or (US mail) as Mike Haertel c/o Free Software Foundation. */\n \n-/* The algorithm implemented by these routines bears a startling resemblence\n+/* The algorithm implemented by these routines bears a startling resemblance\n to one discovered by Beate Commentz-Walter, although it is not identical.\n See \"A String Matching Algorithm Fast on the Average,\" Technical Report,\n IBM-Germany, Scientific Center Heidelberg, Tiergartenstrasse 15, D-6900\n@@ -435,7 +435,7 @@ kwsprep (kwset_t kws)\n \t /* Update the delta table for the descendents of this node. */\n \t treedelta(curr->links, curr->depth, delta);\n \n-\t /* Compute the failure function for the decendents of this node. */\n+\t /* Compute the failure function for the descendants of this node. */\n \t treefails(curr->links, curr->fail, kwset->trie);\n \n \t /* Update the shifts at each node in the current node's chain\ndiff --git a/perl/Git.pm b/perl/Git.pm\nindex 96cac39..650db90 100644\n--- a/perl/Git.pm\n+++ b/perl/Git.pm\n@@ -1180,7 +1180,7 @@ my (%TEMP_FILEMAP, %TEMP_FILES);\n \n =item temp_acquire ( NAME )\n \n-Attempts to retreive the temporary file mapped to the string C. If an\n+Attempts to retrieve the temporary file mapped to the string C. If an\n associated temp file has not been created this session or was closed, it is\n created, cached, and set for autoflush and binmode.\n \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/perl/private-Error.pm b/perl/private-Error.pm\nindex 11e9cd9..9a0c567 100644\n--- a/perl/private-Error.pm\n+++ b/perl/private-Error.pm\n@@ -769,7 +769,7 @@ is a numeric value. These values are what will be returned by the\n overload methods.\n \n If the text value ends with C as $@ strings do, then\n-this infomation will be used to set the C<-file> and C<-line> arguments\n+this information will be used to set the C<-file> and C<-line> arguments\n of the error object.\n \n This class is used internally if an eval'd block die's with an error\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 baa0310..ee4f8c6 100644\n--- a/sequencer.c\n+++ b/sequencer.c\n@@ -216,7 +216,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 */\ndiff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh\nindex d8b7f2f..f8a08b7 100755\n--- a/t/t1006-cat-file.sh\n+++ b/t/t1006-cat-file.sh\n@@ -116,7 +116,7 @@ tree_pretty_content=\"100644 blob $hello_sha1\thello\"\n \n run_tests 'tree' $tree_sha1 $tree_size \"\" \"$tree_pretty_content\"\n \n-commit_message=\"Intial commit\"\n+commit_message=\"Initial commit\"\n commit_sha1=$(echo_without_newline \"$commit_message\" | git commit-tree $tree_sha1)\n commit_size=176\n commit_content=\"tree $tree_sha1\ndiff --git a/t/t3511-cherry-pick-x.sh b/t/t3511-cherry-pick-x.sh\nindex f977279..25f8938 100755\n--- a/t/t3511-cherry-pick-x.sh\n+++ b/t/t3511-cherry-pick-x.sh\n@@ -133,7 +133,7 @@ test_expect_success 'cherry-pick -x -s inserts blank line when conforming footer\n \ttest_cmp expect actual\n '\n \n-test_expect_success 'cherry-pick -s adds sob when last sob doesnt match committer' '\n+test_expect_success 'cherry-pick -s adds sob when last sob does not match committer' '\n \tpristine_detach initial &&\n \tgit cherry-pick -s mesg-with-footer &&\n \tcat <<-EOF >expect &&\n@@ -144,7 +144,7 @@ test_expect_success 'cherry-pick -s adds sob when last sob doesnt match committe\n \ttest_cmp expect actual\n '\n \n-test_expect_success 'cherry-pick -x -s adds sob when last sob doesnt match committer' '\n+test_expect_success 'cherry-pick -x -s adds sob when last sob does not match committer' '\n \tpristine_detach initial &&\n \tsha1=`git rev-parse mesg-with-footer^0` &&\n \tgit cherry-pick -x -s mesg-with-footer &&\ndiff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh\nindex 098a6ae..9fab25c 100755\n--- a/t/t3701-add-interactive.sh\n+++ b/t/t3701-add-interactive.sh\n@@ -319,7 +319,7 @@ test_expect_success PERL 'split hunk \"add -p (edit)\"' '\n \t# times to get out.\n \t#\n \t# 2. Correct version applies the (not)edited version, and asks\n-\t# about the next hunk, against wich we say q and program\n+\t# about the next hunk, against which we say q and program\n \t# exits.\n \tfor a in s e q n q q\n \tdo\ndiff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh\nindex b993dae..86ee077 100755\n--- a/t/t4014-format-patch.sh\n+++ b/t/t4014-format-patch.sh\n@@ -742,21 +742,21 @@ test_expect_success 'format-patch --signature --cover-letter' '\n \ttest 2 = $(grep \"my sig\" output | wc -l)\n '\n \n-test_expect_success 'format.signature=\"\" supresses signatures' '\n+test_expect_success 'format.signature=\"\" suppresses signatures' '\n \tgit config format.signature \"\" &&\n \tgit format-patch --stdout -1 >output &&\n \tcheck_patch output &&\n \t! grep \"^-- \\$\" output\n '\n \n-test_expect_success 'format-patch --no-signature supresses signatures' '\n+test_expect_success 'format-patch --no-signature suppresses signatures' '\n \tgit config --unset-all format.signature &&\n \tgit format-patch --stdout --no-signature -1 >output &&\n \tcheck_patch output &&\n \t! grep \"^-- \\$\" output\n '\n \n-test_expect_success 'format-patch --signature=\"\" supresses signatures' '\n+test_expect_success 'format-patch --signature=\"\" suppresses signatures' '\n \tgit format-patch --stdout --signature=\"\" -1 >output &&\n \tcheck_patch output &&\n \t! grep \"^-- \\$\" output\ndiff --git a/t/t4124-apply-ws-rule.sh b/t/t4124-apply-ws-rule.sh\nindex 0bbcf06..5d0c598 100755\n--- a/t/t4124-apply-ws-rule.sh\n+++ b/t/t4124-apply-ws-rule.sh\n@@ -47,7 +47,7 @@ test_fix () {\n \t# find touched lines\n \t$DIFF file target | sed -n -e \"s/^> //p\" >fixed\n \n-\t# the changed lines are all expeced to change\n+\t# the changed lines are all expected to change\n \tfixed_cnt=$(wc -l /dev/null 2>&1 ) &&\n #( yes \"d\" | git mergetool file12 >/dev/null 2>&1 ) &&\n #( yes \"l\" | git mergetool submod >/dev/null 2>&1 ) &&\ndiff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh\nindex 97d6f4c..ebd5c5d 100755\n--- a/t/t9001-send-email.sh\n+++ b/t/t9001-send-email.sh\n@@ -101,7 +101,7 @@ test_expect_success $PREREQ \\\n \n test_expect_success $PREREQ 'Send patches with --envelope-sender' '\n clean_fake_sendmail &&\n- git send-email --envelope-sender=\"Patch Contributer \" --suppress-cc=sob --from=\"Example \" --to=nobody@example.com --smtp-server=\"$(pwd)/fake.sendmail\" $patches 2>errors\n+ git send-email --envelope-sender=\"Patch Contributor \" --suppress-cc=sob --from=\"Example \" --to=nobody@example.com --smtp-server=\"$(pwd)/fake.sendmail\" $patches 2>errors\n '\n \n test_expect_success $PREREQ 'setup expect' '\n@@ -787,7 +787,7 @@ test_expect_success $PREREQ 'confirm detects EOF (auto causes failure)' '\n \ttest $ret = \"0\"\n '\n \n-test_expect_success $PREREQ 'confirm doesnt loop forever' '\n+test_expect_success $PREREQ 'confirm does not loop forever' '\n \tCONFIRM=$(git config --get sendemail.confirm) &&\n \tgit config sendemail.confirm auto &&\n \tGIT_SEND_EMAIL_NOTTY=1 &&\ndiff --git a/transport-helper.c b/transport-helper.c\nindex cb3ef7d..dcd8d97 100644\n--- a/transport-helper.c\n+++ b/transport-helper.c\n@@ -991,7 +991,7 @@ struct unidirectional_transfer {\n \tint src_is_sock;\n \t/* Is destination socket? */\n \tint dest_is_sock;\n-\t/* Transfer state (TRANSFERING/FLUSHING/FINISHED) */\n+\t/* Transfer state (TRANSFERRING/FLUSHING/FINISHED) */\n \tint state;\n \t/* Buffer. */\n \tchar buf[BUFFERSIZE];\ndiff --git a/transport.h b/transport.h\nindex 9354462..fcb1d25 100644\n--- a/transport.h\n+++ b/transport.h\n@@ -74,7 +74,7 @@ struct transport {\n \t\t const char *executable, int fd[2]);\n \n \t/** get_refs_list(), fetch(), and push_refs() can keep\n-\t * resources (such as a connection) reserved for futher\n+\t * resources (such as a connection) reserved for further\n \t * use. disconnect() releases these resources.\n \t **/\n \tint (*disconnect)(struct transport *connection);\ndiff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c\nindex 1b7012a..b2eb6db 100644\n--- a/xdiff/xdiffi.c\n+++ b/xdiff/xdiffi.c\n@@ -490,7 +490,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {\n \n \t\t/*\n \t\t * Try to move back the possibly merged group of changes, to match\n-\t\t * the recorded postion in the other file.\n+\t\t * the recorded position in the other file.\n \t\t */\n \t\twhile (ixref < ix) {\n \t\t\trchg[--ixs] = 1;\ndiff --git a/xdiff/xhistogram.c b/xdiff/xhistogram.c\nindex bf99787..73210cb 100644\n--- a/xdiff/xhistogram.c\n+++ b/xdiff/xhistogram.c\n@@ -55,7 +55,7 @@ struct histindex {\n \tstruct record {\n \t\tunsigned int ptr, cnt;\n \t\tstruct record *next;\n-\t} **records, /* an ocurrence */\n+\t} **records, /* an occurrence */\n \t **line_map; /* map of line to record chain */\n \tchastore_t rcha;\n \tunsigned int *next_ptrs;\n-- \n1.8.2.373.g961c512\n"},{"id":"214012","messageId":"CAPig+cSXC6cA8gc1T=byqeQF_gUYKpHTjpTt54Xog=jtfdgMwA@mail.gmail.com","threadId":"33483","inReplyTo":"4cb23e38819d620f53be032d0765fbe374ddb717.1365712583.git.stefano.lattarini@gmail.com","subject":"Re: [PATCH] Various typofixes","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2013-04-11T21:43:03Z","receivedAt":"2013-04-11T21:43:03Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Thu, Apr 11, 2013 at 4:55 PM, Stefano Lattarini\n wrote:\n> Mostly suggested by codespell \n>\n> Signed-off-by: Stefano Lattarini \n> ---\n> diff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c\n> index 8c96ed9..aab8153 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 is occurred, ERR is set by error code, and return NULL.\n\nNot new in this patch, but the grammar \"error is occurred\" is rather\npoor. Since this is a cleanup patch, perhaps it makes sense to adjust\nthe grammar as well.\n\n> This function build the following tree, from regular expression :\n> CAT\n> / \\\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 is occurred. */\n\nAlso not new with the patch: s/If/if/\n\nDitto regarding grammar.\n\n> diff --git a/compat/regex/regex_internal.c b/compat/regex/regex_internal.c\n> index 193854c..237642c 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 is occurred, return 1 otherwise. */\n\nDitto: grammar\n\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 is occurred, return 1 otherwise. */\n\nGrammar.\n\n> static int\n> internal_function\n> @@ -1416,7 +1416,7 @@ re_node_set_remove_at (re_node_set *set, int idx)\n>\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 will be occurred. */\n\nGrammar.\n\n> diff --git a/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh b/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh\n> index b6405ce..e764ddc 100755\n> --- a/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh\n> +++ b/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh\n> -test_expect_failure 'test of correct formating for file name begining with special character' '\n> +test_expect_failure 'test of correct formating for file name beginning with special character' '\n\nMissed by codespell: s/formating/formatting/\n\n> wiki_reset &&\n> git clone mediawiki::'\"$WIKI_URL\"' mw_dir_13 &&\n> (\n> @@ -215,7 +215,7 @@ test_expect_failure 'test of correct formating for file name begining with speci\n\nDitto: s/formating/formatting/\n\n> echo \"my new file {char_1\" >\\{char_1.mw &&\n> echo \"my new file [char_2\" >\\[char_2.mw &&\n> git add . &&\n> - git commit -am \"commiting some exotic file name...\" &&\n> + git commit -am \"committing some exotic file name...\" &&\n> git push &&\n> git pull\n> ) &&\n> @@ -234,7 +234,7 @@ test_expect_success 'test of correct formating for file name from git to mw' '\n\ns/formating/formatting/\n\n> echo \"my new file char{_1\" >Char\\{_1.mw &&\n> echo \"my new file char[_2\" >Char\\[_2.mw &&\n> git add . &&\n> - git commit -m \"commiting some exotic file name...\" &&\n> + git commit -m \"committing some exotic file name...\" &&\n> git push\n> ) &&\n> wiki_getallpage ref_page_14 &&\n"},{"id":"214016","messageId":"85f4e2b8e40efb234a7fc0d0ce0d40562690d001.1365719690.git.stefano.lattarini@gmail.com","threadId":"33483","inReplyTo":"CAPig+cSXC6cA8gc1T=byqeQF_gUYKpHTjpTt54Xog=jtfdgMwA@mail.gmail.com","subject":"[PATCH v2] Fix various typos and grammaros","fromName":"Stefano Lattarini","fromEmail":"stefano.lattarini@gmail.com","sentAt":"2013-04-11T22:36:10Z","receivedAt":"2013-04-11T22:36:10Z","isPatch":true,"sender":{"key":"stefano.lattarini@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1429199?v=4"},"body":"Most typos suggested by codespell:\n\n\nGrammaros pointed out by Eric Sunshine.\n\nHelped-by: Eric Sunshine \nSigned-off-by: Stefano Lattarini \n---\n Documentation/git-credential.txt | 2 +-\n Documentation/git-remote-ext.txt | 2 +-\n Documentation/git-svn.txt | 4 ++--\n Documentation/git-tools.txt | 2 +-\n Documentation/revisions.txt | 2 +-\n Documentation/technical/api-argv-array.txt | 2 +-\n Documentation/technical/api-credentials.txt | 2 +-\n Documentation/technical/api-ref-iteration.txt | 2 +-\n builtin/apply.c | 6 +++---\n commit.c | 2 +-\n commit.h | 2 +-\n compat/nedmalloc/Readme.txt | 2 +-\n compat/nedmalloc/malloc.c.h | 6 +++---\n compat/obstack.h | 2 +-\n compat/precompose_utf8.c | 2 +-\n compat/regex/regcomp.c | 4 ++--\n compat/regex/regex.c | 2 +-\n compat/regex/regex_internal.c | 6 +++---\n contrib/mw-to-git/git-remote-mediawiki.perl | 6 +++---\n contrib/mw-to-git/t/README | 6 +++---\n contrib/mw-to-git/t/install-wiki/LocalSettings.php | 2 +-\n contrib/mw-to-git/t/t9360-mw-to-git-clone.sh | 2 +-\n contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh | 14 +++++++-------\n contrib/subtree/t/t7900-subtree.sh | 2 +-\n diff.c | 2 +-\n git-add--interactive.perl | 2 +-\n git-cvsserver.perl | 4 ++--\n git-gui/lib/blame.tcl | 2 +-\n git-gui/lib/index.tcl | 2 +-\n git-gui/lib/spellcheck.tcl | 4 ++--\n git-quiltimport.sh | 2 +-\n gitweb/INSTALL | 2 +-\n gitweb/gitweb.perl | 6 +++---\n kwset.c | 4 ++--\n perl/Git.pm | 2 +-\n perl/Git/I18N.pm | 2 +-\n perl/private-Error.pm | 2 +-\n po/README | 6 +++---\n sequencer.c | 2 +-\n t/t1006-cat-file.sh | 2 +-\n t/t3511-cherry-pick-x.sh | 4 ++--\n t/t3701-add-interactive.sh | 2 +-\n t/t4014-format-patch.sh | 6 +++---\n t/t4124-apply-ws-rule.sh | 2 +-\n t/t6030-bisect-porcelain.sh | 2 +-\n t/t7601-merge-pull-config.sh | 2 +-\n t/t7610-mergetool.sh | 2 +-\n t/t9001-send-email.sh | 4 ++--\n transport-helper.c | 2 +-\n transport.h | 2 +-\n xdiff/xdiffi.c | 2 +-\n xdiff/xhistogram.c | 2 +-\n 52 files changed, 81 insertions(+), 81 deletions(-)\n\ndiff --git a/Documentation/git-credential.txt b/Documentation/git-credential.txt\nindex 472f00f..7da0f13 100644\n--- a/Documentation/git-credential.txt\n+++ b/Documentation/git-credential.txt\n@@ -56,7 +56,7 @@ For example, if we want a password for\n `https://example.com/foo.git`, we might generate the following\n credential description (don't forget the blank line at the end; it\n tells `git credential` that the application finished feeding all the\n-infomation it has):\n+information it has):\n \n \t protocol=https\n \t host=example.com\ndiff --git a/Documentation/git-remote-ext.txt b/Documentation/git-remote-ext.txt\nindex 58b7fac..8cfc748 100644\n--- a/Documentation/git-remote-ext.txt\n+++ b/Documentation/git-remote-ext.txt\n@@ -86,7 +86,7 @@ begins with `ext::`. Examples:\n \tedit .ssh/config.\n \n \"ext::socat -t3600 - ABSTRACT-CONNECT:/git-server %G/somerepo\"::\n-\tRepresents repository with path /somerepo accessable over\n+\tRepresents repository with path /somerepo accessible over\n \tgit protocol at abstract namespace address /git-server.\n \n \"ext::git-server-alias foo %G/repo\"::\ndiff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt\nindex 1b8b649..7706d41 100644\n--- a/Documentation/git-svn.txt\n+++ b/Documentation/git-svn.txt\n@@ -245,7 +245,7 @@ first have already been pushed into SVN.\n \tpatch), \"all\" (accept all patches), or \"quit\".\n \t+\n \t'git svn dcommit' returns immediately if answer if \"no\" or \"quit\", without\n-\tcommiting anything to SVN.\n+\tcommitting anything to SVN.\n \n 'branch'::\n \tCreate a branch in the SVN repository.\n@@ -856,7 +856,7 @@ HANDLING OF SVN BRANCHES\n ------------------------\n If 'git svn' is configured to fetch branches (and --follow-branches\n is in effect), it sometimes creates multiple Git branches for one\n-SVN branch, where the addtional branches have names of the form\n+SVN branch, where the additional branches have names of the form\n 'branchname@nnn' (with nnn an SVN revision number). These additional\n branches are created if 'git svn' cannot find a parent commit for the\n first commit in an SVN branch, to connect the branch to the history of\ndiff --git a/Documentation/git-tools.txt b/Documentation/git-tools.txt\nindex ad8b823..78a0d95 100644\n--- a/Documentation/git-tools.txt\n+++ b/Documentation/git-tools.txt\n@@ -109,7 +109,7 @@ Others\n \n - *git.el* (contrib/)\n \n- This is an Emacs interface for Git. The user interface is modeled on\n+ This is an Emacs interface for Git. The user interface is modelled on\n pcl-cvs. It has been developed on Emacs 21 and will probably need some\n tweaking to work on XEmacs.\n \ndiff --git a/Documentation/revisions.txt b/Documentation/revisions.txt\nindex 1707d45..8855b1a 100644\n--- a/Documentation/revisions.txt\n+++ b/Documentation/revisions.txt\n@@ -55,7 +55,7 @@ when you run `git cherry-pick`.\n +\n Note that any of the 'refs/*' cases above may come either from\n the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n-While the ref name encoding is unspecified, UTF-8 is prefered as\n+While the ref name encoding is unspecified, UTF-8 is preferred as\n some output processing may assume ref names in UTF-8.\n \n '@\\{\\}', e.g. 'master@\\{yesterday\\}', 'HEAD@\\{5 minutes ago\\}'::\ndiff --git a/Documentation/technical/api-argv-array.txt b/Documentation/technical/api-argv-array.txt\nindex a959517..a6b7d83 100644\n--- a/Documentation/technical/api-argv-array.txt\n+++ b/Documentation/technical/api-argv-array.txt\n@@ -55,7 +55,7 @@ Functions\n \tinitial, empty state.\n \n `argv_array_detach`::\n-\tDetach the argv array from the `struct argv_array`, transfering\n+\tDetach the argv array from the `struct argv_array`, transferring\n \townership of the allocated array and strings.\n \n `argv_array_free_detached`::\ndiff --git a/Documentation/technical/api-credentials.txt b/Documentation/technical/api-credentials.txt\nindex 516fda7..c1b42a4 100644\n--- a/Documentation/technical/api-credentials.txt\n+++ b/Documentation/technical/api-credentials.txt\n@@ -160,7 +160,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/Documentation/technical/api-ref-iteration.txt b/Documentation/technical/api-ref-iteration.txt\nindex dbbea95..aa1c50f 100644\n--- a/Documentation/technical/api-ref-iteration.txt\n+++ b/Documentation/technical/api-ref-iteration.txt\n@@ -35,7 +35,7 @@ Iteration functions\n * `head_ref_submodule()`, `for_each_ref_submodule()`,\n `for_each_ref_in_submodule()`, `for_each_tag_ref_submodule()`,\n `for_each_branch_ref_submodule()`, `for_each_remote_ref_submodule()`\n- do the same as the functions descibed above but for a specified\n+ do the same as the functions described above but for a specified\n submodule.\n \n * `for_each_rawref()` can be used to learn about broken ref and symref.\ndiff --git a/builtin/apply.c b/builtin/apply.c\nindex 5b882d0..30eefc3 100644\n--- a/builtin/apply.c\n+++ b/builtin/apply.c\n@@ -1921,7 +1921,7 @@ static int parse_binary(char *buffer, unsigned long size, struct patch *patch)\n }\n \n /*\n- * Read the patch text in \"buffer\" taht extends for \"size\" bytes; stop\n+ * Read the patch text in \"buffer\" that extends for \"size\" bytes; stop\n * reading after seeing a single patch (i.e. changes to a single file).\n * Create fragments (i.e. patch hunks) and hang them to the given patch.\n * Return the number of bytes consumed, so that the caller can call us\n@@ -3029,7 +3029,7 @@ static struct patch *in_fn_table(const char *name)\n *\n * The latter is needed to deal with a case where two paths A and B\n * are swapped by first renaming A to B and then renaming B to A;\n- * moving A to B should not be prevented due to presense of B as we\n+ * moving A to B should not be prevented due to presence of B as we\n * will remove it in a later patch.\n */\n #define PATH_TO_BE_DELETED ((struct patch *) -2)\n@@ -3513,7 +3513,7 @@ static int check_patch(struct patch *patch)\n \t *\n \t * A patch to swap-rename between A and B would first rename A\n \t * to B and then rename B to A. While applying the first one,\n-\t * the presense of B should not stop A from getting renamed to\n+\t * the presence of B should not stop A from getting renamed to\n \t * B; ask to_be_deleted() about the later rename. Removal of\n \t * B and rename from A to B is handled the same way by asking\n \t * was_deleted().\ndiff --git a/commit.c b/commit.c\nindex 516a4ff..888e02a 100644\n--- a/commit.c\n+++ b/commit.c\n@@ -841,7 +841,7 @@ struct commit_list *get_merge_bases(struct commit *one, struct commit *two,\n }\n \n /*\n- * Is \"commit\" a decendant of one of the elements on the \"with_commit\" list?\n+ * Is \"commit\" a descendant of one of the elements on the \"with_commit\" list?\n */\n int is_descendant_of(struct commit *commit, struct commit_list *with_commit)\n {\ndiff --git a/commit.h b/commit.h\nindex 87b4b6c..057ff80 100644\n--- a/commit.h\n+++ b/commit.h\n@@ -166,7 +166,7 @@ extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *r\n extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos, int cleanup);\n extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);\n \n-/* largest postive number a signed 32-bit integer can contain */\n+/* largest positive number a signed 32-bit integer can contain */\n #define INFINITE_DEPTH 0x7fffffff\n \n extern int register_shallow(const unsigned char *sha1);\ndiff --git a/compat/nedmalloc/Readme.txt b/compat/nedmalloc/Readme.txt\nindex e46d8f1..07cbf50 100644\n--- a/compat/nedmalloc/Readme.txt\n+++ b/compat/nedmalloc/Readme.txt\n@@ -97,7 +97,7 @@ Chew for reporting this.\n \n v1.04alpha_svn915 7th October 2006:\n * Fixed failure to unlock thread cache list if allocating a new list failed.\n-Thanks to Dmitry Chichkov for reporting this. Futher thanks to Aleksey Sanin.\n+Thanks to Dmitry Chichkov for reporting this. Further thanks to Aleksey Sanin.\n * Fixed realloc(0, ) segfaulting. Thanks to Dmitry Chichkov for\n reporting this.\n * Made config defines #ifndef so they can be overridden by the build system.\ndiff --git a/compat/nedmalloc/malloc.c.h b/compat/nedmalloc/malloc.c.h\nindex ff7c2c4..1401a67 100644\n--- a/compat/nedmalloc/malloc.c.h\n+++ b/compat/nedmalloc/malloc.c.h\n@@ -4778,7 +4778,7 @@ void* dlmalloc(size_t bytes) {\n \n void dlfree(void* mem) {\n /*\n- Consolidate freed chunks with preceeding or succeeding bordering\n+ Consolidate freed chunks with preceding or succeeding bordering\n free chunks, if they exist, and then place in a bin. Intermixed\n with special cases for top, dv, mmapped chunks, and usage errors.\n */\n@@ -5680,10 +5680,10 @@ History:\n \tWolfram Gloger (Gloger@lrz.uni-muenchen.de).\n * Use last_remainder in more cases.\n * Pack bins using idea from colin@nyx10.cs.du.edu\n- * Use ordered bins instead of best-fit threshhold\n+ * Use ordered bins instead of best-fit threshold\n * Eliminate block-local decls to simplify tracing and debugging.\n * Support another case of realloc via move into top\n- * Fix error occuring when initial sbrk_base not word-aligned.\n+ * Fix error occurring when initial sbrk_base not word-aligned.\n * Rely on page size for units instead of SBRK_UNIT to\n \tavoid surprises about sbrk alignment conventions.\n * Add mallinfo, mallopt. Thanks to Raymond Nijssen\ndiff --git a/compat/obstack.h b/compat/obstack.h\nindex d178bd6..ceb4bdb 100644\n--- a/compat/obstack.h\n+++ b/compat/obstack.h\n@@ -128,7 +128,7 @@ extern \"C\" {\n \n #define __BPTR_ALIGN(B, P, A) ((B) + (((P) - (B) + (A)) & ~(A)))\n \n-/* Similiar to _BPTR_ALIGN (B, P, A), except optimize the common case\n+/* Similar to _BPTR_ALIGN (B, P, A), except optimize the common case\n where pointers can be converted to integers, aligned as integers,\n and converted back again. If PTR_INT_TYPE is narrower than a\n pointer (e.g., the AS/400), play it safe and compute the alignment\ndiff --git a/compat/precompose_utf8.c b/compat/precompose_utf8.c\nindex 8cf5955..030174d 100644\n--- a/compat/precompose_utf8.c\n+++ b/compat/precompose_utf8.c\n@@ -134,7 +134,7 @@ struct dirent_prec_psx *precompose_utf8_readdir(PREC_DIR *prec_dir)\n \t\t\tif (prec_dir->ic_precompose == (iconv_t)-1) {\n \t\t\t\tdie(\"iconv_open(%s,%s) failed, but needed:\\n\"\n \t\t\t\t\t\t\" precomposed unicode is not supported.\\n\"\n-\t\t\t\t\t\t\" If you wnat to use decomposed unicode, run\\n\"\n+\t\t\t\t\t\t\" If you want to use decomposed unicode, run\\n\"\n \t\t\t\t\t\t\" \\\"git config core.precomposeunicode false\\\"\\n\",\n \t\t\t\t\t\trepo_encoding, path_encoding);\n \t\t\t} else {\ndiff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c\nindex 8c96ed9..d0025bd 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 :\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.c b/compat/regex/regex.c\nindex 3dd8dfa..6aaae00 100644\n--- a/compat/regex/regex.c\n+++ b/compat/regex/regex.c\n@@ -22,7 +22,7 @@\n #include \"config.h\"\n #endif\n \n-/* Make sure noone compiles this code with a C++ compiler. */\n+/* Make sure no one compiles this code with a C++ compiler. */\n #ifdef __cplusplus\n # error \"This is C code, use a C compiler\"\n #endif\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/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl\nindex 094129d..9c14c1f 100755\n--- a/contrib/mw-to-git/git-remote-mediawiki.perl\n+++ b/contrib/mw-to-git/git-remote-mediawiki.perl\n@@ -28,7 +28,7 @@ use warnings;\n use constant SLASH_REPLACEMENT => \"%2F\";\n \n # It's not always possible to delete pages (may require some\n-# priviledges). Deleted pages are replaced with this content.\n+# privileges). Deleted pages are replaced with this content.\n use constant DELETED_CONTENT => \"[[Category:Deleted]]\\n\";\n \n # It's not possible to create empty pages. New empty files in Git are\n@@ -841,7 +841,7 @@ sub mw_import_ref {\n \tif ($fetch_from == 1 && $n == 0) {\n \t\tprint STDERR \"You appear to have cloned an empty MediaWiki.\\n\";\n \t\t# Something has to be done remote-helper side. If nothing is done, an error is\n-\t\t# thrown saying that HEAD is refering to unknown object 0000000000000000000\n+\t\t# thrown saying that HEAD is referring to unknown object 0000000000000000000\n \t\t# and the clone fails.\n \t}\n }\n@@ -1067,7 +1067,7 @@ sub mw_push_file {\n \t\tmy $file_content;\n \t\tif ($page_deleted) {\n \t\t\t# Deleting a page usually requires\n-\t\t\t# special priviledges. A common\n+\t\t\t# special privileges. A common\n \t\t\t# convention is to replace the page\n \t\t\t# with this content instead:\n \t\t\t$file_content = DELETED_CONTENT;\ndiff --git a/contrib/mw-to-git/t/README b/contrib/mw-to-git/t/README\nindex 96e9739..03f6ee5 100644\n--- a/contrib/mw-to-git/t/README\n+++ b/contrib/mw-to-git/t/README\n@@ -25,7 +25,7 @@ Principles and Technical Choices\n \n The test environment makes it easy to install and manipulate one or\n several MediaWiki instances. To allow developers to run the testsuite\n-easily, the environment does not require root priviledge (except to\n+easily, the environment does not require root privilege (except to\n install the required packages if needed). It starts a webserver\n instance on the user's account (using lighttpd greatly helps for\n that), and does not need a separate database daemon (thanks to the use\n@@ -81,7 +81,7 @@ parameters, please refer to the `test-gitmw-lib.sh` and\n \n ** `test_check_wiki_precond`:\n Check if the tests must be skipped or not. Please use this function\n-at the beggining of each new test file.\n+at the beginning of each new test file.\n \n ** `wiki_getpage`:\n Fetch a given page from the wiki and puts its content in the\n@@ -113,7 +113,7 @@ Tests if a given page exists on the wiki.\n \n ** `wiki_reset`:\n Reset the wiki, i.e. flush the database. Use this function at the\n-begining of each new test, except if the test re-uses the same wiki\n+beginning of each new test, except if the test re-uses the same wiki\n (and history) as the previous test.\n \n How to write a new test\ndiff --git a/contrib/mw-to-git/t/install-wiki/LocalSettings.php b/contrib/mw-to-git/t/install-wiki/LocalSettings.php\nindex 29f1251..745e47e 100644\n--- a/contrib/mw-to-git/t/install-wiki/LocalSettings.php\n+++ b/contrib/mw-to-git/t/install-wiki/LocalSettings.php\n@@ -88,7 +88,7 @@ $wgShellLocale = \"en_US.utf8\";\n \n ## Set $wgCacheDirectory to a writable directory on the web server\n ## to make your wiki go slightly faster. The directory should not\n-## be publically accessible from the web.\n+## be publicly accessible from the web.\n #$wgCacheDirectory = \"$IP/cache\";\n \n # Site language code, should be one of the list in ./languages/Names.php\ndiff --git a/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh b/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh\nindex 811a90c..a54621c 100755\n--- a/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh\n+++ b/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh\n@@ -125,7 +125,7 @@ test_expect_success 'Git clone works with one specific page cloned ' '\n \twiki_editpage foo \"I will not be cloned\" false &&\n \twiki_editpage bar \"Do not clone me\" false &&\n \twiki_editpage namnam \"I will be cloned :)\" false -s=\"this log must stay\" &&\n-\twiki_editpage nyancat \"nyan nyan nyan you cant clone me\" false &&\n+\twiki_editpage nyancat \"nyan nyan nyan you cannot clone me\" false &&\n \tgit clone -c remote.origin.pages=namnam \\\n \t\tmediawiki::'\"$WIKI_URL\"' mw_dir_8 &&\n \ttest_contains_N_files mw_dir_8 1 &&\ndiff --git a/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh b/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh\nindex b6405ce..37021e2 100755\n--- a/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh\n+++ b/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh\n@@ -139,7 +139,7 @@ test_expect_success 'character $ in file name (git -> mw) ' '\n '\n \n \n-test_expect_failure 'capital at the begining of file names' '\n+test_expect_failure 'capital at the beginning of file names' '\n \twiki_reset &&\n \tgit clone mediawiki::'\"$WIKI_URL\"' mw_dir_10 &&\n \t(\n@@ -156,7 +156,7 @@ test_expect_failure 'capital at the begining of file names' '\n '\n \n \n-test_expect_failure 'special character at the begining of file name from mw to git' '\n+test_expect_failure 'special character at the beginning of file name from mw to git' '\n \twiki_reset &&\n \tgit clone mediawiki::'\"$WIKI_URL\"' mw_dir_11 &&\n \twiki_editpage {char_1 \"expect to be renamed {char_1\" false &&\n@@ -189,7 +189,7 @@ test_expect_success 'Push page with title containing \":\" other than namespace se\n \twiki_page_exist NotANameSpace:Page\n '\n \n-test_expect_success 'test of correct formating for file name from mw to git' '\n+test_expect_success 'test of correct formatting for file name from mw to git' '\n \twiki_reset &&\n \tgit clone mediawiki::'\"$WIKI_URL\"' mw_dir_12 &&\n \twiki_editpage char_%_7b_1 \"expect to be renamed char{_1\" false &&\n@@ -207,7 +207,7 @@ test_expect_success 'test of correct formating for file name from mw to git' '\n '\n \n \n-test_expect_failure 'test of correct formating for file name begining with special character' '\n+test_expect_failure 'test of correct formatting for file name beginning with special character' '\n \twiki_reset &&\n \tgit clone mediawiki::'\"$WIKI_URL\"' mw_dir_13 &&\n \t(\n@@ -215,7 +215,7 @@ test_expect_failure 'test of correct formating for file name begining with speci\n \t\techo \"my new file {char_1\" >\\{char_1.mw &&\n \t\techo \"my new file [char_2\" >\\[char_2.mw &&\n \t\tgit add . &&\n-\t\tgit commit -am \"commiting some exotic file name...\" &&\n+\t\tgit commit -am \"committing some exotic file name...\" &&\n \t\tgit push &&\n \t\tgit pull\n \t) &&\n@@ -226,7 +226,7 @@ test_expect_failure 'test of correct formating for file name begining with speci\n '\n \n \n-test_expect_success 'test of correct formating for file name from git to mw' '\n+test_expect_success 'test of correct formatting for file name from git to mw' '\n \twiki_reset &&\n \tgit clone mediawiki::'\"$WIKI_URL\"' mw_dir_14 &&\n \t(\n@@ -234,7 +234,7 @@ test_expect_success 'test of correct formating for file name from git to mw' '\n \t\techo \"my new file char{_1\" >Char\\{_1.mw &&\n \t\techo \"my new file char[_2\" >Char\\[_2.mw &&\n \t\tgit add . &&\n-\t\tgit commit -m \"commiting some exotic file name...\" &&\n+\t\tgit commit -m \"committing some exotic file name...\" &&\n \t\tgit push\n \t) &&\n \twiki_getallpage ref_page_14 &&\ndiff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh\nindex 80d3399..4729521 100755\n--- a/contrib/subtree/t/t7900-subtree.sh\n+++ b/contrib/subtree/t/t7900-subtree.sh\n@@ -419,7 +419,7 @@ test_expect_success 'add main-sub5' '\n test_expect_success 'split for main-sub5 without --onto' '\n # also test that we still can split out an entirely new subtree\n # if the parent of the first commit in the tree is not empty,\n- # then the new subtree has accidently been attached to something\n+ # then the new subtree has accidentally been attached to something\n git subtree split --prefix subdir2 --branch mainsub5 &&\n check_equal ''\"$(git log --pretty=format:%P -1 mainsub5)\"'' \"\"\n '\ndiff --git a/diff.c b/diff.c\nindex db952a5..0eb2653 100644\n--- a/diff.c\n+++ b/diff.c\n@@ -1565,7 +1565,7 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)\n \t * Binary files are displayed with \"Bin XXX -> YYY bytes\"\n \t * instead of the change count and graph. This part is treated\n \t * similarly to the graph part, except that it is not\n-\t * \"scaled\". If total width is too small to accomodate the\n+\t * \"scaled\". If total width is too small to accommodate the\n \t * guaranteed minimum width of the filename part and the\n \t * separators and this message, this message will \"overflow\"\n \t * making the line longer than the maximum width.\ndiff --git a/git-add--interactive.perl b/git-add--interactive.perl\nindex 710764a..d2c4ce6 100755\n--- a/git-add--interactive.perl\n+++ b/git-add--interactive.perl\n@@ -1247,7 +1247,7 @@ sub summarize_hunk {\n \n \n # Print a one-line summary of each hunk in the array ref in\n-# the first argument, starting wih the index in the 2nd.\n+# the first argument, starting with the index in the 2nd.\n sub display_hunks {\n \tmy ($hunks, $i) = @_;\n \tmy $ctr = 0;\ndiff --git a/git-cvsserver.perl b/git-cvsserver.perl\nindex f1c3f49..a0d796e 100755\n--- a/git-cvsserver.perl\n+++ b/git-cvsserver.perl\n@@ -2911,7 +2911,7 @@ sub filenamesplit\n }\n \n # Cleanup various junk in filename (try to canonicalize it), and\n-# add prependdir to accomodate running CVS client from a\n+# add prependdir to accommodate running CVS client from a\n # subdirectory (so the output is relative to top directory of the project).\n sub filecleanup\n {\n@@ -4583,7 +4583,7 @@ sub getmeta\n # the numerical value of the corresponding byte plus\n # 100.\n # - \"plus 100\" avoids \"0\"s, and also reduces the\n- # likelyhood of a collision in the case that someone someday\n+ # likelihood of a collision in the case that someone someday\n # writes an import tool that tries to preserve original\n # CVS revision numbers, and the original CVS data had done\n # lots of branches off of branches and other strangeness to\ndiff --git a/git-gui/lib/blame.tcl b/git-gui/lib/blame.tcl\nindex 324f774..b1d15f4 100644\n--- a/git-gui/lib/blame.tcl\n+++ b/git-gui/lib/blame.tcl\n@@ -5,7 +5,7 @@ class blame {\n \n image create photo ::blame::img_back_arrow -data {R0lGODlhGAAYAIUAAPwCBEzKXFTSZIz+nGzmhGzqfGTidIT+nEzGXHTqhGzmfGzifFzadETCVES+VARWDFzWbHzyjAReDGTadFTOZDSyRDyyTCymPARaFGTedFzSbDy2TCyqRCyqPARaDAyCHES6VDy6VCyiPAR6HCSeNByWLARyFARiDARqFGTifARiFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAYABgAAAajQIBwSCwaj8ikcsk0BppJwRPqHEypQwHBis0WDAdEFyBIKBaMAKLBdjQeSkFBYTBAIvgEoS6JmhUTEwIUDQ4VFhcMGEhyCgoZExoUaxsWHB0THkgfAXUGAhoBDSAVFR0XBnCbDRmgog0hpSIiDJpJIyEQhBUcJCIlwA22SSYVogknEg8eD82qSigdDSknY0IqJQXPYxIl1dZCGNvWw+Dm510GQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7}\n \n-# Persistant data (survives loads)\n+# Persistent data (survives loads)\n #\n field history {}; # viewer history: {commit path}\n field header ; # array commit,key -> header field\ndiff --git a/git-gui/lib/index.tcl b/git-gui/lib/index.tcl\nindex 8efbbdd..74a81a7 100644\n--- a/git-gui/lib/index.tcl\n+++ b/git-gui/lib/index.tcl\n@@ -414,7 +414,7 @@ proc revert_helper {txt paths} {\n \t# such distinction is needed in some languages. Previously, the\n \t# code used \"Revert changes in\" for both, but that can't work\n \t# in languages where 'in' must be combined with word from\n-\t# rest of string (in diffrent way for both cases of course).\n+\t# rest of string (in different way for both cases of course).\n \t#\n \t# FIXME: Unfortunately, even that isn't enough in some languages\n \t# as they have quite complex plural-form rules. Unfortunately,\ndiff --git a/git-gui/lib/spellcheck.tcl b/git-gui/lib/spellcheck.tcl\nindex e612030..538d61c 100644\n--- a/git-gui/lib/spellcheck.tcl\n+++ b/git-gui/lib/spellcheck.tcl\n@@ -14,7 +14,7 @@ field w_menu ; # context menu for the widget\n field s_menuidx 0 ; # last index of insertion into $w_menu\n \n field s_i {} ; # timer registration for _run callbacks\n-field s_clear 0 ; # did we erase mispelled tags yet?\n+field s_clear 0 ; # did we erase misspelled tags yet?\n field s_seen [list] ; # lines last seen from $w_text in _run\n field s_checked [list] ; # lines already checked\n field s_pending [list] ; # [$line $data] sent to ispell/aspell\n@@ -259,7 +259,7 @@ method _run {} {\n \t\tif {$n == $cur_line\n \t\t && ![regexp {^\\W$} [$w_text get $cur_pos insert]]} {\n \n-\t\t\t# If the current word is mispelled remove the tag\n+\t\t\t# If the current word is misspelled remove the tag\n \t\t\t# but force a spellcheck later.\n \t\t\t#\n \t\t\tset tags [$w_text tag names $cur_pos]\ndiff --git a/git-quiltimport.sh b/git-quiltimport.sh\nindex 9a6ba2b..8e17525 100755\n--- a/git-quiltimport.sh\n+++ b/git-quiltimport.sh\n@@ -59,7 +59,7 @@ tmp_patch=\"$tmp_dir/patch\"\n tmp_info=\"$tmp_dir/info\"\n \n \n-# Find the intial commit\n+# Find the initial commit\n commit=$(git rev-parse HEAD)\n \n mkdir $tmp_dir || exit 2\ndiff --git a/gitweb/INSTALL b/gitweb/INSTALL\nindex 6d45406..08f3dda 100644\n--- a/gitweb/INSTALL\n+++ b/gitweb/INSTALL\n@@ -244,7 +244,7 @@ for gitweb (in gitweb/README), and gitweb.conf(5) manpage.\n through the GITWEB_CONFIG_SYSTEM environment variable.\n \n Note that if per-instance configuration file exists, then system-wide\n- configuration is _not used at all_. This is quite untypical and suprising\n+ configuration is _not used at all_. This is quite untypical and surprising\n behavior. On the other hand changing current behavior would break backwards\n compatibility and can lead to unexpected changes in gitweb behavior.\n Therefore gitweb also looks for common system-wide configuration file,\ndiff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl\nindex 1309196..80950c0 100755\n--- a/gitweb/gitweb.perl\n+++ b/gitweb/gitweb.perl\n@@ -683,7 +683,7 @@ sub evaluate_gitweb_config {\n \tour $GITWEB_CONFIG_SYSTEM = $ENV{'GITWEB_CONFIG_SYSTEM'} || \"++GITWEB_CONFIG_SYSTEM++\";\n \tour $GITWEB_CONFIG_COMMON = $ENV{'GITWEB_CONFIG_COMMON'} || \"++GITWEB_CONFIG_COMMON++\";\n \n-\t# Protect agains duplications of file names, to not read config twice.\n+\t# Protect against duplications of file names, to not read config twice.\n \t# Only one of $GITWEB_CONFIG and $GITWEB_CONFIG_SYSTEM is used, so\n \t# there possibility of duplication of filename there doesn't matter.\n \t$GITWEB_CONFIG = \"\" if ($GITWEB_CONFIG eq $GITWEB_CONFIG_COMMON);\n@@ -1136,7 +1136,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_\n@@ -7485,7 +7485,7 @@ sub git_object {\n \t\tsystem(git_cmd(), \"cat-file\", '-e', $hash_base) == 0\n \t\t\tor die_error(404, \"Base object does not exist\");\n \n-\t\t# here errors should not hapen\n+\t\t# here errors should not happen\n \t\topen my $fd, \"-|\", git_cmd(), \"ls-tree\", $hash_base, \"--\", $file_name\n \t\t\tor die_error(500, \"Open git-ls-tree failed\");\n \t\tmy $line = <$fd>;\ndiff --git a/kwset.c b/kwset.c\nindex 51b2ab6..5800999 100644\n--- a/kwset.c\n+++ b/kwset.c\n@@ -26,7 +26,7 @@\n The author may be reached (Email) at the address mike@ai.mit.edu,\n or (US mail) as Mike Haertel c/o Free Software Foundation. */\n \n-/* The algorithm implemented by these routines bears a startling resemblence\n+/* The algorithm implemented by these routines bears a startling resemblance\n to one discovered by Beate Commentz-Walter, although it is not identical.\n See \"A String Matching Algorithm Fast on the Average,\" Technical Report,\n IBM-Germany, Scientific Center Heidelberg, Tiergartenstrasse 15, D-6900\n@@ -435,7 +435,7 @@ kwsprep (kwset_t kws)\n \t /* Update the delta table for the descendents of this node. */\n \t treedelta(curr->links, curr->depth, delta);\n \n-\t /* Compute the failure function for the decendents of this node. */\n+\t /* Compute the failure function for the descendants of this node. */\n \t treefails(curr->links, curr->fail, kwset->trie);\n \n \t /* Update the shifts at each node in the current node's chain\ndiff --git a/perl/Git.pm b/perl/Git.pm\nindex 96cac39..650db90 100644\n--- a/perl/Git.pm\n+++ b/perl/Git.pm\n@@ -1180,7 +1180,7 @@ my (%TEMP_FILEMAP, %TEMP_FILES);\n \n =item temp_acquire ( NAME )\n \n-Attempts to retreive the temporary file mapped to the string C. If an\n+Attempts to retrieve the temporary file mapped to the string C. If an\n associated temp file has not been created this session or was closed, it is\n created, cached, and set for autoflush and binmode.\n \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/perl/private-Error.pm b/perl/private-Error.pm\nindex 11e9cd9..9a0c567 100644\n--- a/perl/private-Error.pm\n+++ b/perl/private-Error.pm\n@@ -769,7 +769,7 @@ is a numeric value. These values are what will be returned by the\n overload methods.\n \n If the text value ends with C as $@ strings do, then\n-this infomation will be used to set the C<-file> and C<-line> arguments\n+this information will be used to set the C<-file> and C<-line> arguments\n of the error object.\n \n This class is used internally if an eval'd block die's with an error\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 baa0310..ee4f8c6 100644\n--- a/sequencer.c\n+++ b/sequencer.c\n@@ -216,7 +216,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 */\ndiff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh\nindex d8b7f2f..f8a08b7 100755\n--- a/t/t1006-cat-file.sh\n+++ b/t/t1006-cat-file.sh\n@@ -116,7 +116,7 @@ tree_pretty_content=\"100644 blob $hello_sha1\thello\"\n \n run_tests 'tree' $tree_sha1 $tree_size \"\" \"$tree_pretty_content\"\n \n-commit_message=\"Intial commit\"\n+commit_message=\"Initial commit\"\n commit_sha1=$(echo_without_newline \"$commit_message\" | git commit-tree $tree_sha1)\n commit_size=176\n commit_content=\"tree $tree_sha1\ndiff --git a/t/t3511-cherry-pick-x.sh b/t/t3511-cherry-pick-x.sh\nindex f977279..25f8938 100755\n--- a/t/t3511-cherry-pick-x.sh\n+++ b/t/t3511-cherry-pick-x.sh\n@@ -133,7 +133,7 @@ test_expect_success 'cherry-pick -x -s inserts blank line when conforming footer\n \ttest_cmp expect actual\n '\n \n-test_expect_success 'cherry-pick -s adds sob when last sob doesnt match committer' '\n+test_expect_success 'cherry-pick -s adds sob when last sob does not match committer' '\n \tpristine_detach initial &&\n \tgit cherry-pick -s mesg-with-footer &&\n \tcat <<-EOF >expect &&\n@@ -144,7 +144,7 @@ test_expect_success 'cherry-pick -s adds sob when last sob doesnt match committe\n \ttest_cmp expect actual\n '\n \n-test_expect_success 'cherry-pick -x -s adds sob when last sob doesnt match committer' '\n+test_expect_success 'cherry-pick -x -s adds sob when last sob does not match committer' '\n \tpristine_detach initial &&\n \tsha1=`git rev-parse mesg-with-footer^0` &&\n \tgit cherry-pick -x -s mesg-with-footer &&\ndiff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh\nindex 098a6ae..9fab25c 100755\n--- a/t/t3701-add-interactive.sh\n+++ b/t/t3701-add-interactive.sh\n@@ -319,7 +319,7 @@ test_expect_success PERL 'split hunk \"add -p (edit)\"' '\n \t# times to get out.\n \t#\n \t# 2. Correct version applies the (not)edited version, and asks\n-\t# about the next hunk, against wich we say q and program\n+\t# about the next hunk, against which we say q and program\n \t# exits.\n \tfor a in s e q n q q\n \tdo\ndiff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh\nindex b993dae..86ee077 100755\n--- a/t/t4014-format-patch.sh\n+++ b/t/t4014-format-patch.sh\n@@ -742,21 +742,21 @@ test_expect_success 'format-patch --signature --cover-letter' '\n \ttest 2 = $(grep \"my sig\" output | wc -l)\n '\n \n-test_expect_success 'format.signature=\"\" supresses signatures' '\n+test_expect_success 'format.signature=\"\" suppresses signatures' '\n \tgit config format.signature \"\" &&\n \tgit format-patch --stdout -1 >output &&\n \tcheck_patch output &&\n \t! grep \"^-- \\$\" output\n '\n \n-test_expect_success 'format-patch --no-signature supresses signatures' '\n+test_expect_success 'format-patch --no-signature suppresses signatures' '\n \tgit config --unset-all format.signature &&\n \tgit format-patch --stdout --no-signature -1 >output &&\n \tcheck_patch output &&\n \t! grep \"^-- \\$\" output\n '\n \n-test_expect_success 'format-patch --signature=\"\" supresses signatures' '\n+test_expect_success 'format-patch --signature=\"\" suppresses signatures' '\n \tgit format-patch --stdout --signature=\"\" -1 >output &&\n \tcheck_patch output &&\n \t! grep \"^-- \\$\" output\ndiff --git a/t/t4124-apply-ws-rule.sh b/t/t4124-apply-ws-rule.sh\nindex 0bbcf06..5d0c598 100755\n--- a/t/t4124-apply-ws-rule.sh\n+++ b/t/t4124-apply-ws-rule.sh\n@@ -47,7 +47,7 @@ test_fix () {\n \t# find touched lines\n \t$DIFF file target | sed -n -e \"s/^> //p\" >fixed\n \n-\t# the changed lines are all expeced to change\n+\t# the changed lines are all expected to change\n \tfixed_cnt=$(wc -l /dev/null 2>&1 ) &&\n #( yes \"d\" | git mergetool file12 >/dev/null 2>&1 ) &&\n #( yes \"l\" | git mergetool submod >/dev/null 2>&1 ) &&\ndiff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh\nindex 97d6f4c..ebd5c5d 100755\n--- a/t/t9001-send-email.sh\n+++ b/t/t9001-send-email.sh\n@@ -101,7 +101,7 @@ test_expect_success $PREREQ \\\n \n test_expect_success $PREREQ 'Send patches with --envelope-sender' '\n clean_fake_sendmail &&\n- git send-email --envelope-sender=\"Patch Contributer \" --suppress-cc=sob --from=\"Example \" --to=nobody@example.com --smtp-server=\"$(pwd)/fake.sendmail\" $patches 2>errors\n+ git send-email --envelope-sender=\"Patch Contributor \" --suppress-cc=sob --from=\"Example \" --to=nobody@example.com --smtp-server=\"$(pwd)/fake.sendmail\" $patches 2>errors\n '\n \n test_expect_success $PREREQ 'setup expect' '\n@@ -787,7 +787,7 @@ test_expect_success $PREREQ 'confirm detects EOF (auto causes failure)' '\n \ttest $ret = \"0\"\n '\n \n-test_expect_success $PREREQ 'confirm doesnt loop forever' '\n+test_expect_success $PREREQ 'confirm does not loop forever' '\n \tCONFIRM=$(git config --get sendemail.confirm) &&\n \tgit config sendemail.confirm auto &&\n \tGIT_SEND_EMAIL_NOTTY=1 &&\ndiff --git a/transport-helper.c b/transport-helper.c\nindex cb3ef7d..dcd8d97 100644\n--- a/transport-helper.c\n+++ b/transport-helper.c\n@@ -991,7 +991,7 @@ struct unidirectional_transfer {\n \tint src_is_sock;\n \t/* Is destination socket? */\n \tint dest_is_sock;\n-\t/* Transfer state (TRANSFERING/FLUSHING/FINISHED) */\n+\t/* Transfer state (TRANSFERRING/FLUSHING/FINISHED) */\n \tint state;\n \t/* Buffer. */\n \tchar buf[BUFFERSIZE];\ndiff --git a/transport.h b/transport.h\nindex 9354462..fcb1d25 100644\n--- a/transport.h\n+++ b/transport.h\n@@ -74,7 +74,7 @@ struct transport {\n \t\t const char *executable, int fd[2]);\n \n \t/** get_refs_list(), fetch(), and push_refs() can keep\n-\t * resources (such as a connection) reserved for futher\n+\t * resources (such as a connection) reserved for further\n \t * use. disconnect() releases these resources.\n \t **/\n \tint (*disconnect)(struct transport *connection);\ndiff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c\nindex 1b7012a..b2eb6db 100644\n--- a/xdiff/xdiffi.c\n+++ b/xdiff/xdiffi.c\n@@ -490,7 +490,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {\n \n \t\t/*\n \t\t * Try to move back the possibly merged group of changes, to match\n-\t\t * the recorded postion in the other file.\n+\t\t * the recorded position in the other file.\n \t\t */\n \t\twhile (ixref < ix) {\n \t\t\trchg[--ixs] = 1;\ndiff --git a/xdiff/xhistogram.c b/xdiff/xhistogram.c\nindex bf99787..73210cb 100644\n--- a/xdiff/xhistogram.c\n+++ b/xdiff/xhistogram.c\n@@ -55,7 +55,7 @@ struct histindex {\n \tstruct record {\n \t\tunsigned int ptr, cnt;\n \t\tstruct record *next;\n-\t} **records, /* an ocurrence */\n+\t} **records, /* an occurrence */\n \t **line_map; /* map of line to record chain */\n \tchastore_t rcha;\n \tunsigned int *next_ptrs;\n-- \n1.8.2.373.g961c512\n"},{"id":"214020","messageId":"7v4nfch90r.fsf@alter.siamese.dyndns.org","threadId":"33483","inReplyTo":"85f4e2b8e40efb234a7fc0d0ce0d40562690d001.1365719690.git.stefano.lattarini@gmail.com","subject":"Re: [PATCH v2] Fix various typos and grammaros","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-04-12T00:45:08Z","receivedAt":"2013-04-12T00:45:08Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Stefano Lattarini writes:\n\n> Documentation/git-credential.txt | 2 +-\n> Documentation/git-remote-ext.txt | 2 +-\n> Documentation/git-svn.txt | 4 ++--\n> Documentation/git-tools.txt | 2 +-\n> Documentation/revisions.txt | 2 +-\n> Documentation/technical/api-argv-array.txt | 2 +-\n> Documentation/technical/api-credentials.txt | 2 +-\n> Documentation/technical/api-ref-iteration.txt | 2 +-\n> builtin/apply.c | 6 +++---\n> commit.c | 2 +-\n> commit.h | 2 +-\n> compat/nedmalloc/Readme.txt | 2 +-\n> compat/nedmalloc/malloc.c.h | 6 +++---\n> compat/obstack.h | 2 +-\n> compat/precompose_utf8.c | 2 +-\n> compat/regex/regcomp.c | 4 ++--\n> compat/regex/regex.c | 2 +-\n> compat/regex/regex_internal.c | 6 +++---\n> contrib/mw-to-git/git-remote-mediawiki.perl | 6 +++---\n> contrib/mw-to-git/t/README | 6 +++---\n> contrib/mw-to-git/t/install-wiki/LocalSettings.php | 2 +-\n> contrib/mw-to-git/t/t9360-mw-to-git-clone.sh | 2 +-\n> contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh | 14 +++++++-------\n> contrib/subtree/t/t7900-subtree.sh | 2 +-\n> diff.c | 2 +-\n> git-add--interactive.perl | 2 +-\n> git-cvsserver.perl | 4 ++--\n> git-gui/lib/blame.tcl | 2 +-\n> git-gui/lib/index.tcl | 2 +-\n> git-gui/lib/spellcheck.tcl | 4 ++--\n> git-quiltimport.sh | 2 +-\n> gitweb/INSTALL | 2 +-\n> gitweb/gitweb.perl | 6 +++---\n> kwset.c | 4 ++--\n> perl/Git.pm | 2 +-\n> perl/Git/I18N.pm | 2 +-\n> perl/private-Error.pm | 2 +-\n> po/README | 6 +++---\n> sequencer.c | 2 +-\n> t/t1006-cat-file.sh | 2 +-\n> t/t3511-cherry-pick-x.sh | 4 ++--\n> t/t3701-add-interactive.sh | 2 +-\n> t/t4014-format-patch.sh | 6 +++---\n> t/t4124-apply-ws-rule.sh | 2 +-\n> t/t6030-bisect-porcelain.sh | 2 +-\n> t/t7601-merge-pull-config.sh | 2 +-\n> t/t7610-mergetool.sh | 2 +-\n> t/t9001-send-email.sh | 4 ++--\n> transport-helper.c | 2 +-\n> transport.h | 2 +-\n> xdiff/xdiffi.c | 2 +-\n> xdiff/xhistogram.c | 2 +-\n\n\nHow much of this stuff have interact with real changes that are in\nflight, with various doneness cooking in different integration\nbranches?\n"},{"id":"214036","messageId":"20130412064837.GA5710@elie.Belkin","threadId":"33483","inReplyTo":"7v4nfch90r.fsf@alter.siamese.dyndns.org","subject":"[RFC/PATCH maint 0/10] Re: [PATCH v2] Fix various typos and grammaros","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-04-12T06:48:38Z","receivedAt":"2013-04-12T06:48:38Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Hi,\n\nJunio C Hamano wrote:\n\n> How much of this stuff have interact with real changes that are in\n> flight, with various doneness cooking in different integration\n> branches?\n\nAll except the t3511-cherry-pick-x.sh change apply cleanly to\n\"maint\" and merge without trouble with master and pu.\n\nHere is a split-up version. I haven't looked closely at the patch,\neven to sanity check it --- one of the main points of splitting it\nthis way is to make it easier to review with reference to code\nborrowed from other projects.\n\nI left out the change to compat/nedmalloc/Readme.txt, since it is\nchanging a historical record, and to\ncontrib/mw-to-git/t/t9360-mw-to-git-clone.sh, because it seems\nrealistic to allow the nyan cat to demonstrate poor punctuation\nskills.\n\nSome of these patches need more work if they are to be applied. For\nexample, git-gui is maintained separately and should not be patched\nfrom the toplevel.\n\nHope that helps,\nJonathan\n\nStefano Lattarini (10):\n doc: various spelling fixes\n git-remote-mediawiki: spelling fixes\n contrib/subtree: fix spelling of \"accidentally\"\n obstack: fix spelling of \"similar\"\n compat/regex: fix spelling and grammar in comments\n compat/nedmalloc: fix spelling in comments\n precompose-utf8: fix spelling of \"want\" in error message\n kwset: fix spelling in comments\n git-gui: fix spelling in comments\n Correct common spelling mistakes in comments and tests\n\n Documentation/git-credential.txt | 2 +-\n Documentation/git-remote-ext.txt | 2 +-\n Documentation/git-svn.txt | 4 ++--\n Documentation/git-tools.txt | 2 +-\n Documentation/revisions.txt | 2 +-\n Documentation/technical/api-argv-array.txt | 2 +-\n Documentation/technical/api-credentials.txt | 2 +-\n Documentation/technical/api-ref-iteration.txt | 2 +-\n builtin/apply.c | 6 +++---\n commit.c | 2 +-\n commit.h | 2 +-\n compat/nedmalloc/malloc.c.h | 6 +++---\n compat/obstack.h | 2 +-\n compat/precompose_utf8.c | 2 +-\n compat/regex/regcomp.c | 4 ++--\n compat/regex/regex.c | 2 +-\n compat/regex/regex_internal.c | 6 +++---\n contrib/mw-to-git/git-remote-mediawiki.perl | 6 +++---\n contrib/mw-to-git/t/README | 6 +++---\n contrib/mw-to-git/t/install-wiki/LocalSettings.php | 2 +-\n contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh | 14 +++++++-------\n contrib/subtree/t/t7900-subtree.sh | 2 +-\n diff.c | 2 +-\n git-add--interactive.perl | 2 +-\n git-cvsserver.perl | 4 ++--\n git-gui/lib/blame.tcl | 2 +-\n git-gui/lib/index.tcl | 2 +-\n git-gui/lib/spellcheck.tcl | 4 ++--\n git-quiltimport.sh | 2 +-\n gitweb/INSTALL | 2 +-\n gitweb/gitweb.perl | 6 +++---\n kwset.c | 4 ++--\n perl/Git.pm | 2 +-\n perl/Git/I18N.pm | 2 +-\n perl/private-Error.pm | 2 +-\n po/README | 6 +++---\n sequencer.c | 2 +-\n t/t1006-cat-file.sh | 2 +-\n t/t3701-add-interactive.sh | 2 +-\n t/t4014-format-patch.sh | 6 +++---\n t/t4124-apply-ws-rule.sh | 2 +-\n t/t6030-bisect-porcelain.sh | 2 +-\n t/t7601-merge-pull-config.sh | 2 +-\n t/t7610-mergetool.sh | 2 +-\n t/t9001-send-email.sh | 4 ++--\n transport-helper.c | 2 +-\n transport.h | 2 +-\n xdiff/xdiffi.c | 2 +-\n xdiff/xhistogram.c | 2 +-\n 49 files changed, 77 insertions(+), 77 deletions(-)\n"},{"id":"214037","messageId":"20130412064953.GB5710@elie.Belkin","threadId":"33483","inReplyTo":"20130412064837.GA5710@elie.Belkin","subject":"[PATCH 01/10] doc: various spelling fixes","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-04-12T06:49:53Z","receivedAt":"2013-04-12T06:49:53Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"From: Stefano Lattarini \nDate: Fri, 12 Apr 2013 00:36:10 +0200\n\nMost of these were found using Lucas De Marchi's codespell tool.\n\nSigned-off-by: Stefano Lattarini \nSigned-off-by: Jonathan Nieder \n---\nI like this one.\n\n Documentation/git-credential.txt | 2 +-\n Documentation/git-remote-ext.txt | 2 +-\n Documentation/git-svn.txt | 4 ++--\n Documentation/git-tools.txt | 2 +-\n Documentation/revisions.txt | 2 +-\n Documentation/technical/api-argv-array.txt | 2 +-\n Documentation/technical/api-credentials.txt | 2 +-\n Documentation/technical/api-ref-iteration.txt | 2 +-\n gitweb/INSTALL | 2 +-\n po/README | 6 +++---\n 10 files changed, 13 insertions(+), 13 deletions(-)\n\ndiff --git a/Documentation/git-credential.txt b/Documentation/git-credential.txt\nindex 472f00f6..7da0f13a 100644\n--- a/Documentation/git-credential.txt\n+++ b/Documentation/git-credential.txt\n@@ -56,7 +56,7 @@ For example, if we want a password for\n `https://example.com/foo.git`, we might generate the following\n credential description (don't forget the blank line at the end; it\n tells `git credential` that the application finished feeding all the\n-infomation it has):\n+information it has):\n \n \t protocol=https\n \t host=example.com\ndiff --git a/Documentation/git-remote-ext.txt b/Documentation/git-remote-ext.txt\nindex 58b7facb..8cfc748a 100644\n--- a/Documentation/git-remote-ext.txt\n+++ b/Documentation/git-remote-ext.txt\n@@ -86,7 +86,7 @@ begins with `ext::`. Examples:\n \tedit .ssh/config.\n \n \"ext::socat -t3600 - ABSTRACT-CONNECT:/git-server %G/somerepo\"::\n-\tRepresents repository with path /somerepo accessable over\n+\tRepresents repository with path /somerepo accessible over\n \tgit protocol at abstract namespace address /git-server.\n \n \"ext::git-server-alias foo %G/repo\"::\ndiff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt\nindex 1b8b6498..7706d41c 100644\n--- a/Documentation/git-svn.txt\n+++ b/Documentation/git-svn.txt\n@@ -245,7 +245,7 @@ first have already been pushed into SVN.\n \tpatch), \"all\" (accept all patches), or \"quit\".\n \t+\n \t'git svn dcommit' returns immediately if answer if \"no\" or \"quit\", without\n-\tcommiting anything to SVN.\n+\tcommitting anything to SVN.\n \n 'branch'::\n \tCreate a branch in the SVN repository.\n@@ -856,7 +856,7 @@ HANDLING OF SVN BRANCHES\n ------------------------\n If 'git svn' is configured to fetch branches (and --follow-branches\n is in effect), it sometimes creates multiple Git branches for one\n-SVN branch, where the addtional branches have names of the form\n+SVN branch, where the additional branches have names of the form\n 'branchname@nnn' (with nnn an SVN revision number). These additional\n branches are created if 'git svn' cannot find a parent commit for the\n first commit in an SVN branch, to connect the branch to the history of\ndiff --git a/Documentation/git-tools.txt b/Documentation/git-tools.txt\nindex ad8b823f..78a0d955 100644\n--- a/Documentation/git-tools.txt\n+++ b/Documentation/git-tools.txt\n@@ -109,7 +109,7 @@ Others\n \n - *git.el* (contrib/)\n \n- This is an Emacs interface for Git. The user interface is modeled on\n+ This is an Emacs interface for Git. The user interface is modelled on\n pcl-cvs. It has been developed on Emacs 21 and will probably need some\n tweaking to work on XEmacs.\n \ndiff --git a/Documentation/revisions.txt b/Documentation/revisions.txt\nindex 314e25da..b0f72206 100644\n--- a/Documentation/revisions.txt\n+++ b/Documentation/revisions.txt\n@@ -55,7 +55,7 @@ when you run `git cherry-pick`.\n +\n Note that any of the 'refs/*' cases above may come either from\n the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n-While the ref name encoding is unspecified, UTF-8 is prefered as\n+While the ref name encoding is unspecified, UTF-8 is preferred as\n some output processing may assume ref names in UTF-8.\n \n '@\\{\\}', e.g. 'master@\\{yesterday\\}', 'HEAD@\\{5 minutes ago\\}'::\ndiff --git a/Documentation/technical/api-argv-array.txt b/Documentation/technical/api-argv-array.txt\nindex a959517b..a6b7d83a 100644\n--- a/Documentation/technical/api-argv-array.txt\n+++ b/Documentation/technical/api-argv-array.txt\n@@ -55,7 +55,7 @@ Functions\n \tinitial, empty state.\n \n `argv_array_detach`::\n-\tDetach the argv array from the `struct argv_array`, transfering\n+\tDetach the argv array from the `struct argv_array`, transferring\n \townership of the allocated array and strings.\n \n `argv_array_free_detached`::\ndiff --git a/Documentation/technical/api-credentials.txt b/Documentation/technical/api-credentials.txt\nindex 516fda74..c1b42a40 100644\n--- a/Documentation/technical/api-credentials.txt\n+++ b/Documentation/technical/api-credentials.txt\n@@ -160,7 +160,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/Documentation/technical/api-ref-iteration.txt b/Documentation/technical/api-ref-iteration.txt\nindex dbbea95d..aa1c50f1 100644\n--- a/Documentation/technical/api-ref-iteration.txt\n+++ b/Documentation/technical/api-ref-iteration.txt\n@@ -35,7 +35,7 @@ Iteration functions\n * `head_ref_submodule()`, `for_each_ref_submodule()`,\n `for_each_ref_in_submodule()`, `for_each_tag_ref_submodule()`,\n `for_each_branch_ref_submodule()`, `for_each_remote_ref_submodule()`\n- do the same as the functions descibed above but for a specified\n+ do the same as the functions described above but for a specified\n submodule.\n \n * `for_each_rawref()` can be used to learn about broken ref and symref.\ndiff --git a/gitweb/INSTALL b/gitweb/INSTALL\nindex 6d454067..08f3dda0 100644\n--- a/gitweb/INSTALL\n+++ b/gitweb/INSTALL\n@@ -244,7 +244,7 @@ for gitweb (in gitweb/README), and gitweb.conf(5) manpage.\n through the GITWEB_CONFIG_SYSTEM environment variable.\n \n Note that if per-instance configuration file exists, then system-wide\n- configuration is _not used at all_. This is quite untypical and suprising\n+ configuration is _not used at all_. This is quite untypical and surprising\n behavior. On the other hand changing current behavior would break backwards\n compatibility and can lead to unexpected changes in gitweb behavior.\n Therefore gitweb also looks for common system-wide configuration file,\ndiff --git a/po/README b/po/README\nindex c1520e8c..d8c9111c 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 \n-- \n1.8.2.1\n"},{"id":"214038","messageId":"20130412065058.GC5710@elie.Belkin","threadId":"33483","inReplyTo":"20130412064837.GA5710@elie.Belkin","subject":"[PATCH 02/10] git-remote-mediawiki: spelling fixes","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-04-12T06:50:58Z","receivedAt":"2013-04-12T06:50:58Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"From: Stefano Lattarini \nDate: Fri, 12 Apr 2013 00:36:10 +0200\n\nMost of these were found using Lucas De Marchi's codespell tool.\nOthers were pointed out by Eric Sunshine.\n\nHelped-by: Eric Sunshine \nSigned-off-by: Stefano Lattarini \nSigned-off-by: Jonathan Nieder \n---\n contrib/mw-to-git/git-remote-mediawiki.perl | 6 +++---\n contrib/mw-to-git/t/README | 6 +++---\n contrib/mw-to-git/t/install-wiki/LocalSettings.php | 2 +-\n contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh | 14 +++++++-------\n 4 files changed, 14 insertions(+), 14 deletions(-)\n\ndiff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl\nindex 094129de..9c14c1f8 100755\n--- a/contrib/mw-to-git/git-remote-mediawiki.perl\n+++ b/contrib/mw-to-git/git-remote-mediawiki.perl\n@@ -28,7 +28,7 @@\n use constant SLASH_REPLACEMENT => \"%2F\";\n \n # It's not always possible to delete pages (may require some\n-# priviledges). Deleted pages are replaced with this content.\n+# privileges). Deleted pages are replaced with this content.\n use constant DELETED_CONTENT => \"[[Category:Deleted]]\\n\";\n \n # It's not possible to create empty pages. New empty files in Git are\n@@ -841,7 +841,7 @@ sub mw_import_ref {\n \tif ($fetch_from == 1 && $n == 0) {\n \t\tprint STDERR \"You appear to have cloned an empty MediaWiki.\\n\";\n \t\t# Something has to be done remote-helper side. If nothing is done, an error is\n-\t\t# thrown saying that HEAD is refering to unknown object 0000000000000000000\n+\t\t# thrown saying that HEAD is referring to unknown object 0000000000000000000\n \t\t# and the clone fails.\n \t}\n }\n@@ -1067,7 +1067,7 @@ sub mw_push_file {\n \t\tmy $file_content;\n \t\tif ($page_deleted) {\n \t\t\t# Deleting a page usually requires\n-\t\t\t# special priviledges. A common\n+\t\t\t# special privileges. A common\n \t\t\t# convention is to replace the page\n \t\t\t# with this content instead:\n \t\t\t$file_content = DELETED_CONTENT;\ndiff --git a/contrib/mw-to-git/t/README b/contrib/mw-to-git/t/README\nindex 96e97390..03f6ee5d 100644\n--- a/contrib/mw-to-git/t/README\n+++ b/contrib/mw-to-git/t/README\n@@ -25,7 +25,7 @@ Principles and Technical Choices\n \n The test environment makes it easy to install and manipulate one or\n several MediaWiki instances. To allow developers to run the testsuite\n-easily, the environment does not require root priviledge (except to\n+easily, the environment does not require root privilege (except to\n install the required packages if needed). It starts a webserver\n instance on the user's account (using lighttpd greatly helps for\n that), and does not need a separate database daemon (thanks to the use\n@@ -81,7 +81,7 @@ parameters, please refer to the `test-gitmw-lib.sh` and\n \n ** `test_check_wiki_precond`:\n Check if the tests must be skipped or not. Please use this function\n-at the beggining of each new test file.\n+at the beginning of each new test file.\n \n ** `wiki_getpage`:\n Fetch a given page from the wiki and puts its content in the\n@@ -113,7 +113,7 @@ Tests if a given page exists on the wiki.\n \n ** `wiki_reset`:\n Reset the wiki, i.e. flush the database. Use this function at the\n-begining of each new test, except if the test re-uses the same wiki\n+beginning of each new test, except if the test re-uses the same wiki\n (and history) as the previous test.\n \n How to write a new test\ndiff --git a/contrib/mw-to-git/t/install-wiki/LocalSettings.php b/contrib/mw-to-git/t/install-wiki/LocalSettings.php\nindex 29f12511..745e47e8 100644\n--- a/contrib/mw-to-git/t/install-wiki/LocalSettings.php\n+++ b/contrib/mw-to-git/t/install-wiki/LocalSettings.php\n@@ -88,7 +88,7 @@ $wgShellLocale = \"en_US.utf8\";\n \n ## Set $wgCacheDirectory to a writable directory on the web server\n ## to make your wiki go slightly faster. The directory should not\n-## be publically accessible from the web.\n+## be publicly accessible from the web.\n #$wgCacheDirectory = \"$IP/cache\";\n \n # Site language code, should be one of the list in ./languages/Names.php\ndiff --git a/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh b/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh\nindex b6405ce2..37021e20 100755\n--- a/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh\n+++ b/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh\n@@ -139,7 +139,7 @@ test_expect_success 'character $ in file name (git -> mw) ' '\n '\n \n \n-test_expect_failure 'capital at the begining of file names' '\n+test_expect_failure 'capital at the beginning of file names' '\n \twiki_reset &&\n \tgit clone mediawiki::'\"$WIKI_URL\"' mw_dir_10 &&\n \t(\n@@ -156,7 +156,7 @@ test_expect_failure 'capital at the begining of file names' '\n '\n \n \n-test_expect_failure 'special character at the begining of file name from mw to git' '\n+test_expect_failure 'special character at the beginning of file name from mw to git' '\n \twiki_reset &&\n \tgit clone mediawiki::'\"$WIKI_URL\"' mw_dir_11 &&\n \twiki_editpage {char_1 \"expect to be renamed {char_1\" false &&\n@@ -189,7 +189,7 @@ test_expect_success 'Push page with title containing \":\" other than namespace se\n \twiki_page_exist NotANameSpace:Page\n '\n \n-test_expect_success 'test of correct formating for file name from mw to git' '\n+test_expect_success 'test of correct formatting for file name from mw to git' '\n \twiki_reset &&\n \tgit clone mediawiki::'\"$WIKI_URL\"' mw_dir_12 &&\n \twiki_editpage char_%_7b_1 \"expect to be renamed char{_1\" false &&\n@@ -207,7 +207,7 @@ test_expect_success 'test of correct formating for file name from mw to git' '\n '\n \n \n-test_expect_failure 'test of correct formating for file name begining with special character' '\n+test_expect_failure 'test of correct formatting for file name beginning with special character' '\n \twiki_reset &&\n \tgit clone mediawiki::'\"$WIKI_URL\"' mw_dir_13 &&\n \t(\n@@ -215,7 +215,7 @@ test_expect_failure 'test of correct formating for file name begining with speci\n \t\techo \"my new file {char_1\" >\\{char_1.mw &&\n \t\techo \"my new file [char_2\" >\\[char_2.mw &&\n \t\tgit add . &&\n-\t\tgit commit -am \"commiting some exotic file name...\" &&\n+\t\tgit commit -am \"committing some exotic file name...\" &&\n \t\tgit push &&\n \t\tgit pull\n \t) &&\n@@ -226,7 +226,7 @@ test_expect_failure 'test of correct formating for file name begining with speci\n '\n \n \n-test_expect_success 'test of correct formating for file name from git to mw' '\n+test_expect_success 'test of correct formatting for file name from git to mw' '\n \twiki_reset &&\n \tgit clone mediawiki::'\"$WIKI_URL\"' mw_dir_14 &&\n \t(\n@@ -234,7 +234,7 @@ test_expect_success 'test of correct formating for file name from git to mw' '\n \t\techo \"my new file char{_1\" >Char\\{_1.mw &&\n \t\techo \"my new file char[_2\" >Char\\[_2.mw &&\n \t\tgit add . &&\n-\t\tgit commit -m \"commiting some exotic file name...\" &&\n+\t\tgit commit -m \"committing some exotic file name...\" &&\n \t\tgit push\n \t) &&\n \twiki_getallpage ref_page_14 &&\n-- \n1.8.2.1\n"},{"id":"214039","messageId":"20130412065430.GD5710@elie.Belkin","threadId":"33483","inReplyTo":"20130412064837.GA5710@elie.Belkin","subject":"[PATCH 03/10] contrib/subtree: fix spelling of accidentally","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-04-12T06:54:30Z","receivedAt":"2013-04-12T06:54:30Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"From: Stefano Lattarini \nDate: Fri, 12 Apr 2013 00:36:10 +0200\n\nNoticed with Lucas De Marchi's codespell tool.\n\nSigned-off-by: Stefano Lattarini \nSigned-off-by: Jonathan Nieder \n---\n contrib/subtree/t/t7900-subtree.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh\nindex 80d33996..4729521f 100755\n--- a/contrib/subtree/t/t7900-subtree.sh\n+++ b/contrib/subtree/t/t7900-subtree.sh\n@@ -419,7 +419,7 @@ test_expect_success 'add main-sub5' '\n test_expect_success 'split for main-sub5 without --onto' '\n # also test that we still can split out an entirely new subtree\n # if the parent of the first commit in the tree is not empty,\n- # then the new subtree has accidently been attached to something\n+ # then the new subtree has accidentally been attached to something\n git subtree split --prefix subdir2 --branch mainsub5 &&\n check_equal ''\"$(git log --pretty=format:%P -1 mainsub5)\"'' \"\"\n '\n-- \n1.8.2.1\n"},{"id":"214040","messageId":"20130412065737.GE5710@elie.Belkin","threadId":"33483","inReplyTo":"20130412064837.GA5710@elie.Belkin","subject":"[PATCH 04/10] obstack: fix spelling of similar","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-04-12T06:57:37Z","receivedAt":"2013-04-12T06:57:37Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"From: Stefano Lattarini \nDate: Fri, 12 Apr 2013 00:36:10 +0200\n\nNoticed using Lucas De Marchi's codespell tool.\n\nSigned-off-by: Stefano Lattarini \nSigned-off-by: Jonathan Nieder \n---\nWould it be more useful to fix this in glibc and import from there?\n\n compat/obstack.h | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/compat/obstack.h b/compat/obstack.h\nindex d178bd67..ceb4bdbc 100644\n--- a/compat/obstack.h\n+++ b/compat/obstack.h\n@@ -128,7 +128,7 @@ extern \"C\" {\n \n #define __BPTR_ALIGN(B, P, A) ((B) + (((P) - (B) + (A)) & ~(A)))\n \n-/* Similiar to _BPTR_ALIGN (B, P, A), except optimize the common case\n+/* Similar to _BPTR_ALIGN (B, P, A), except optimize the common case\n where pointers can be converted to integers, aligned as integers,\n and converted back again. If PTR_INT_TYPE is narrower than a\n pointer (e.g., the AS/400), play it safe and compute the alignment\n-- \n1.8.2.1\n"},{"id":"214041","messageId":"20130412070107.GF5710@elie.Belkin","threadId":"33483","inReplyTo":"20130412064837.GA5710@elie.Belkin","subject":"[PATCH 05/10] compat/regex: fix spelling and grammar in comments","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-04-12T07:01:07Z","receivedAt":"2013-04-12T07:01:07Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"From: Stefano Lattarini \nDate: Fri, 12 Apr 2013 00:36:10 +0200\n\nSome of these were found using Lucas De Marchi's codespell tool.\nOthers noticed by Eric Sunshine.\n\nHelped-by: Eric Sunshine \nSigned-off-by: Stefano Lattarini \nSigned-off-by: Jonathan Nieder \n---\nIs gawk the appropriate upstream to send this sort of readability\nimprovement to?\n\n compat/regex/regcomp.c | 4 ++--\n compat/regex/regex.c | 2 +-\n compat/regex/regex_internal.c | 6 +++---\n 3 files changed, 6 insertions(+), 6 deletions(-)\n\ndiff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c\nindex 8c96ed94..d0025bd5 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 :\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.c b/compat/regex/regex.c\nindex 3dd8dfa0..6aaae003 100644\n--- a/compat/regex/regex.c\n+++ b/compat/regex/regex.c\n@@ -22,7 +22,7 @@\n #include \"config.h\"\n #endif\n \n-/* Make sure noone compiles this code with a C++ compiler. */\n+/* Make sure no one compiles this code with a C++ compiler. */\n #ifdef __cplusplus\n # error \"This is C code, use a C compiler\"\n #endif\ndiff --git a/compat/regex/regex_internal.c b/compat/regex/regex_internal.c\nindex 193854cf..d4121f2f 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\n-- \n1.8.2.1\n"},{"id":"214042","messageId":"20130412070655.GG5710@elie.Belkin","threadId":"33483","inReplyTo":"20130412064837.GA5710@elie.Belkin","subject":"[PATCH 06/10] compat/nedmalloc: fix spelling in comments","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-04-12T07:06:55Z","receivedAt":"2013-04-12T07:06:55Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"From: Stefano Lattarini \nDate: Fri, 12 Apr 2013 00:36:10 +0200\n\nCorrect some typos found using Lucas De Marchi's codespell tool.\n\nSigned-off-by: Stefano Lattarini \nSigned-off-by: Jonathan Nieder \n---\nThese don't seem to be fixed yet in https://github.com/ned14/nedmalloc\n(pointed to from http://www.nedprod.com/programs/portable/nedmalloc/).\nWould it make sense to write a note to Ned and then import a fixed\nversion from there?\n\n compat/nedmalloc/malloc.c.h | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/compat/nedmalloc/malloc.c.h b/compat/nedmalloc/malloc.c.h\nindex ff7c2c4f..1401a672 100644\n--- a/compat/nedmalloc/malloc.c.h\n+++ b/compat/nedmalloc/malloc.c.h\n@@ -4778,7 +4778,7 @@ void* dlmalloc(size_t bytes) {\n \n void dlfree(void* mem) {\n /*\n- Consolidate freed chunks with preceeding or succeeding bordering\n+ Consolidate freed chunks with preceding or succeeding bordering\n free chunks, if they exist, and then place in a bin. Intermixed\n with special cases for top, dv, mmapped chunks, and usage errors.\n */\n@@ -5680,10 +5680,10 @@ History:\n \tWolfram Gloger (Gloger@lrz.uni-muenchen.de).\n * Use last_remainder in more cases.\n * Pack bins using idea from colin@nyx10.cs.du.edu\n- * Use ordered bins instead of best-fit threshhold\n+ * Use ordered bins instead of best-fit threshold\n * Eliminate block-local decls to simplify tracing and debugging.\n * Support another case of realloc via move into top\n- * Fix error occuring when initial sbrk_base not word-aligned.\n+ * Fix error occurring when initial sbrk_base not word-aligned.\n * Rely on page size for units instead of SBRK_UNIT to\n \tavoid surprises about sbrk alignment conventions.\n * Add mallinfo, mallopt. Thanks to Raymond Nijssen\n-- \n1.8.2.1\n"},{"id":"214043","messageId":"20130412070740.GH5710@elie.Belkin","threadId":"33483","inReplyTo":"20130412064837.GA5710@elie.Belkin","subject":"[PATCH 07/10] precompose-utf8: fix spelling of \"want\" in error message","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-04-12T07:07:40Z","receivedAt":"2013-04-12T07:07:40Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"From: Stefano Lattarini \nDate: Fri, 12 Apr 2013 00:36:10 +0200\n\nNoticed using Lucas De Marchi's codespell tool.\n\nSigned-off-by: Stefano Lattarini \nSigned-off-by: Jonathan Nieder \n---\n compat/precompose_utf8.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/compat/precompose_utf8.c b/compat/precompose_utf8.c\nindex 8cf59558..030174db 100644\n--- a/compat/precompose_utf8.c\n+++ b/compat/precompose_utf8.c\n@@ -134,7 +134,7 @@ struct dirent_prec_psx *precompose_utf8_readdir(PREC_DIR *prec_dir)\n \t\t\tif (prec_dir->ic_precompose == (iconv_t)-1) {\n \t\t\t\tdie(\"iconv_open(%s,%s) failed, but needed:\\n\"\n \t\t\t\t\t\t\" precomposed unicode is not supported.\\n\"\n-\t\t\t\t\t\t\" If you wnat to use decomposed unicode, run\\n\"\n+\t\t\t\t\t\t\" If you want to use decomposed unicode, run\\n\"\n \t\t\t\t\t\t\" \\\"git config core.precomposeunicode false\\\"\\n\",\n \t\t\t\t\t\trepo_encoding, path_encoding);\n \t\t\t} else {\n-- \n1.8.2.1\n"},{"id":"214044","messageId":"20130412070910.GI5710@elie.Belkin","threadId":"33483","inReplyTo":"20130412064837.GA5710@elie.Belkin","subject":"[PATCH 08/10] kwset: fix spelling in comments","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-04-12T07:09:10Z","receivedAt":"2013-04-12T07:09:10Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"From: Stefano Lattarini \nDate: Fri, 12 Apr 2013 00:36:10 +0200\n\nCorrect spelling mistakes noticed using Lucas De Marchi's codespell\ntool.\n\nSigned-off-by: Stefano Lattarini \nSigned-off-by: Jonathan Nieder \n---\nGit might be the canonical upstream for the GPL-2+ version of this\ncode.\n\n kwset.c | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/kwset.c b/kwset.c\nindex 51b2ab6c..5800999b 100644\n--- a/kwset.c\n+++ b/kwset.c\n@@ -26,7 +26,7 @@\n The author may be reached (Email) at the address mike@ai.mit.edu,\n or (US mail) as Mike Haertel c/o Free Software Foundation. */\n \n-/* The algorithm implemented by these routines bears a startling resemblence\n+/* The algorithm implemented by these routines bears a startling resemblance\n to one discovered by Beate Commentz-Walter, although it is not identical.\n See \"A String Matching Algorithm Fast on the Average,\" Technical Report,\n IBM-Germany, Scientific Center Heidelberg, Tiergartenstrasse 15, D-6900\n@@ -435,7 +435,7 @@ kwsprep (kwset_t kws)\n \t /* Update the delta table for the descendents of this node. */\n \t treedelta(curr->links, curr->depth, delta);\n \n-\t /* Compute the failure function for the decendents of this node. */\n+\t /* Compute the failure function for the descendants of this node. */\n \t treefails(curr->links, curr->fail, kwset->trie);\n \n \t /* Update the shifts at each node in the current node's chain\n-- \n1.8.2.1\n"},{"id":"214045","messageId":"20130412071017.GJ5710@elie.Belkin","threadId":"33483","inReplyTo":"20130412064837.GA5710@elie.Belkin","subject":"[PATCH 09/10] git-gui: fix spelling in comments","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-04-12T07:10:18Z","receivedAt":"2013-04-12T07:10:18Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"From: Stefano Lattarini \nDate: Fri, 12 Apr 2013 00:36:10 +0200\n\nCorrect common spelling mistakes noticed by Lucas De Marchi's\ncodespell tool.\n\nSigned-off-by: Stefano Lattarini \nSigned-off-by: Jonathan Nieder \n---\nSplit from a larger patch. Could be applied with \"patch -p2\"\nif it seems like a good change for git-gui.\n\n git-gui/lib/blame.tcl | 2 +-\n git-gui/lib/index.tcl | 2 +-\n git-gui/lib/spellcheck.tcl | 4 ++--\n 3 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/git-gui/lib/blame.tcl b/git-gui/lib/blame.tcl\nindex 324f7744..b1d15f46 100644\n--- a/git-gui/lib/blame.tcl\n+++ b/git-gui/lib/blame.tcl\n@@ -5,7 +5,7 @@ class blame {\n \n image create photo ::blame::img_back_arrow -data {R0lGODlhGAAYAIUAAPwCBEzKXFTSZIz+nGzmhGzqfGTidIT+nEzGXHTqhGzmfGzifFzadETCVES+VARWDFzWbHzyjAReDGTadFTOZDSyRDyyTCymPARaFGTedFzSbDy2TCyqRCyqPARaDAyCHES6VDy6VCyiPAR6HCSeNByWLARyFARiDARqFGTifARiFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAYABgAAAajQIBwSCwaj8ikcsk0BppJwRPqHEypQwHBis0WDAdEFyBIKBaMAKLBdjQeSkFBYTBAIvgEoS6JmhUTEwIUDQ4VFhcMGEhyCgoZExoUaxsWHB0THkgfAXUGAhoBDSAVFR0XBnCbDRmgog0hpSIiDJpJIyEQhBUcJCIlwA22SSYVogknEg8eD82qSigdDSknY0IqJQXPYxIl1dZCGNvWw+Dm510GQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7}\n \n-# Persistant data (survives loads)\n+# Persistent data (survives loads)\n #\n field history {}; # viewer history: {commit path}\n field header ; # array commit,key -> header field\ndiff --git a/git-gui/lib/index.tcl b/git-gui/lib/index.tcl\nindex 8efbbdde..74a81a7b 100644\n--- a/git-gui/lib/index.tcl\n+++ b/git-gui/lib/index.tcl\n@@ -414,7 +414,7 @@ proc revert_helper {txt paths} {\n \t# such distinction is needed in some languages. Previously, the\n \t# code used \"Revert changes in\" for both, but that can't work\n \t# in languages where 'in' must be combined with word from\n-\t# rest of string (in diffrent way for both cases of course).\n+\t# rest of string (in different way for both cases of course).\n \t#\n \t# FIXME: Unfortunately, even that isn't enough in some languages\n \t# as they have quite complex plural-form rules. Unfortunately,\ndiff --git a/git-gui/lib/spellcheck.tcl b/git-gui/lib/spellcheck.tcl\nindex e6120303..538d61c7 100644\n--- a/git-gui/lib/spellcheck.tcl\n+++ b/git-gui/lib/spellcheck.tcl\n@@ -14,7 +14,7 @@ field w_menu ; # context menu for the widget\n field s_menuidx 0 ; # last index of insertion into $w_menu\n \n field s_i {} ; # timer registration for _run callbacks\n-field s_clear 0 ; # did we erase mispelled tags yet?\n+field s_clear 0 ; # did we erase misspelled tags yet?\n field s_seen [list] ; # lines last seen from $w_text in _run\n field s_checked [list] ; # lines already checked\n field s_pending [list] ; # [$line $data] sent to ispell/aspell\n@@ -259,7 +259,7 @@ method _run {} {\n \t\tif {$n == $cur_line\n \t\t && ![regexp {^\\W$} [$w_text get $cur_pos insert]]} {\n \n-\t\t\t# If the current word is mispelled remove the tag\n+\t\t\t# If the current word is misspelled remove the tag\n \t\t\t# but force a spellcheck later.\n \t\t\t#\n \t\t\tset tags [$w_text tag names $cur_pos]\n-- \n1.8.2.1\n"},{"id":"214046","messageId":"20130412071102.GK5710@elie.Belkin","threadId":"33483","inReplyTo":"20130412064837.GA5710@elie.Belkin","subject":"[PATCH 10/10] Correct common spelling mistakes in comments and tests","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-04-12T07:11:02Z","receivedAt":"2013-04-12T07:11:02Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"From: Stefano Lattarini \nDate: Fri, 12 Apr 2013 00:36:10 +0200\n\nMost of these were found using Lucas De Marchi's codespell tool.\n\nSigned-off-by: Stefano Lattarini \nSigned-off-by: Jonathan Nieder \n---\nThanks for reading.\n\n builtin/apply.c | 6 +++---\n commit.c | 2 +-\n commit.h | 2 +-\n diff.c | 2 +-\n git-add--interactive.perl | 2 +-\n git-cvsserver.perl | 4 ++--\n git-quiltimport.sh | 2 +-\n gitweb/gitweb.perl | 6 +++---\n perl/Git.pm | 2 +-\n perl/Git/I18N.pm | 2 +-\n perl/private-Error.pm | 2 +-\n sequencer.c | 2 +-\n t/t1006-cat-file.sh | 2 +-\n t/t3701-add-interactive.sh | 2 +-\n t/t4014-format-patch.sh | 6 +++---\n t/t4124-apply-ws-rule.sh | 2 +-\n t/t6030-bisect-porcelain.sh | 2 +-\n t/t7601-merge-pull-config.sh | 2 +-\n t/t7610-mergetool.sh | 2 +-\n t/t9001-send-email.sh | 4 ++--\n transport-helper.c | 2 +-\n transport.h | 2 +-\n xdiff/xdiffi.c | 2 +-\n xdiff/xhistogram.c | 2 +-\n 24 files changed, 32 insertions(+), 32 deletions(-)\n\ndiff --git a/builtin/apply.c b/builtin/apply.c\nindex 06f5320b..f6a3c97d 100644\n--- a/builtin/apply.c\n+++ b/builtin/apply.c\n@@ -1921,7 +1921,7 @@ static int parse_binary(char *buffer, unsigned long size, struct patch *patch)\n }\n \n /*\n- * Read the patch text in \"buffer\" taht extends for \"size\" bytes; stop\n+ * Read the patch text in \"buffer\" that extends for \"size\" bytes; stop\n * reading after seeing a single patch (i.e. changes to a single file).\n * Create fragments (i.e. patch hunks) and hang them to the given patch.\n * Return the number of bytes consumed, so that the caller can call us\n@@ -3025,7 +3025,7 @@ static struct patch *in_fn_table(const char *name)\n *\n * The latter is needed to deal with a case where two paths A and B\n * are swapped by first renaming A to B and then renaming B to A;\n- * moving A to B should not be prevented due to presense of B as we\n+ * moving A to B should not be prevented due to presence of B as we\n * will remove it in a later patch.\n */\n #define PATH_TO_BE_DELETED ((struct patch *) -2)\n@@ -3509,7 +3509,7 @@ static int check_patch(struct patch *patch)\n \t *\n \t * A patch to swap-rename between A and B would first rename A\n \t * to B and then rename B to A. While applying the first one,\n-\t * the presense of B should not stop A from getting renamed to\n+\t * the presence of B should not stop A from getting renamed to\n \t * B; ask to_be_deleted() about the later rename. Removal of\n \t * B and rename from A to B is handled the same way by asking\n \t * was_deleted().\ndiff --git a/commit.c b/commit.c\nindex e8eb0aec..1a41757e 100644\n--- a/commit.c\n+++ b/commit.c\n@@ -834,7 +834,7 @@ struct commit_list *get_merge_bases(struct commit *one, struct commit *two,\n }\n \n /*\n- * Is \"commit\" a decendant of one of the elements on the \"with_commit\" list?\n+ * Is \"commit\" a descendant of one of the elements on the \"with_commit\" list?\n */\n int is_descendant_of(struct commit *commit, struct commit_list *with_commit)\n {\ndiff --git a/commit.h b/commit.h\nindex 4138bb4c..252c7f87 100644\n--- a/commit.h\n+++ b/commit.h\n@@ -164,7 +164,7 @@ extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *r\n extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos, int cleanup);\n extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);\n \n-/* largest postive number a signed 32-bit integer can contain */\n+/* largest positive number a signed 32-bit integer can contain */\n #define INFINITE_DEPTH 0x7fffffff\n \n extern int register_shallow(const unsigned char *sha1);\ndiff --git a/diff.c b/diff.c\nindex db952a5b..0eb26535 100644\n--- a/diff.c\n+++ b/diff.c\n@@ -1565,7 +1565,7 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)\n \t * Binary files are displayed with \"Bin XXX -> YYY bytes\"\n \t * instead of the change count and graph. This part is treated\n \t * similarly to the graph part, except that it is not\n-\t * \"scaled\". If total width is too small to accomodate the\n+\t * \"scaled\". If total width is too small to accommodate the\n \t * guaranteed minimum width of the filename part and the\n \t * separators and this message, this message will \"overflow\"\n \t * making the line longer than the maximum width.\ndiff --git a/git-add--interactive.perl b/git-add--interactive.perl\nindex 710764ab..d2c4ce6e 100755\n--- a/git-add--interactive.perl\n+++ b/git-add--interactive.perl\n@@ -1247,7 +1247,7 @@ sub summarize_hunk {\n \n \n # Print a one-line summary of each hunk in the array ref in\n-# the first argument, starting wih the index in the 2nd.\n+# the first argument, starting with the index in the 2nd.\n sub display_hunks {\n \tmy ($hunks, $i) = @_;\n \tmy $ctr = 0;\ndiff --git a/git-cvsserver.perl b/git-cvsserver.perl\nindex f1c3f49a..a0d796e5 100755\n--- a/git-cvsserver.perl\n+++ b/git-cvsserver.perl\n@@ -2911,7 +2911,7 @@ sub filenamesplit\n }\n \n # Cleanup various junk in filename (try to canonicalize it), and\n-# add prependdir to accomodate running CVS client from a\n+# add prependdir to accommodate running CVS client from a\n # subdirectory (so the output is relative to top directory of the project).\n sub filecleanup\n {\n@@ -4583,7 +4583,7 @@ sub getmeta\n # the numerical value of the corresponding byte plus\n # 100.\n # - \"plus 100\" avoids \"0\"s, and also reduces the\n- # likelyhood of a collision in the case that someone someday\n+ # likelihood of a collision in the case that someone someday\n # writes an import tool that tries to preserve original\n # CVS revision numbers, and the original CVS data had done\n # lots of branches off of branches and other strangeness to\ndiff --git a/git-quiltimport.sh b/git-quiltimport.sh\nindex 9a6ba2b9..8e17525d 100755\n--- a/git-quiltimport.sh\n+++ b/git-quiltimport.sh\n@@ -59,7 +59,7 @@ tmp_patch=\"$tmp_dir/patch\"\n tmp_info=\"$tmp_dir/info\"\n \n \n-# Find the intial commit\n+# Find the initial commit\n commit=$(git rev-parse HEAD)\n \n mkdir $tmp_dir || exit 2\ndiff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl\nindex 1309196d..80950c01 100755\n--- a/gitweb/gitweb.perl\n+++ b/gitweb/gitweb.perl\n@@ -683,7 +683,7 @@ sub evaluate_gitweb_config {\n \tour $GITWEB_CONFIG_SYSTEM = $ENV{'GITWEB_CONFIG_SYSTEM'} || \"++GITWEB_CONFIG_SYSTEM++\";\n \tour $GITWEB_CONFIG_COMMON = $ENV{'GITWEB_CONFIG_COMMON'} || \"++GITWEB_CONFIG_COMMON++\";\n \n-\t# Protect agains duplications of file names, to not read config twice.\n+\t# Protect against duplications of file names, to not read config twice.\n \t# Only one of $GITWEB_CONFIG and $GITWEB_CONFIG_SYSTEM is used, so\n \t# there possibility of duplication of filename there doesn't matter.\n \t$GITWEB_CONFIG = \"\" if ($GITWEB_CONFIG eq $GITWEB_CONFIG_COMMON);\n@@ -1136,7 +1136,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_\n@@ -7485,7 +7485,7 @@ sub git_object {\n \t\tsystem(git_cmd(), \"cat-file\", '-e', $hash_base) == 0\n \t\t\tor die_error(404, \"Base object does not exist\");\n \n-\t\t# here errors should not hapen\n+\t\t# here errors should not happen\n \t\topen my $fd, \"-|\", git_cmd(), \"ls-tree\", $hash_base, \"--\", $file_name\n \t\t\tor die_error(500, \"Open git-ls-tree failed\");\n \t\tmy $line = <$fd>;\ndiff --git a/perl/Git.pm b/perl/Git.pm\nindex 57a17160..f207b471 100644\n--- a/perl/Git.pm\n+++ b/perl/Git.pm\n@@ -1026,7 +1026,7 @@ my (%TEMP_FILEMAP, %TEMP_FILES);\n \n =item temp_acquire ( NAME )\n \n-Attempts to retreive the temporary file mapped to the string C. If an\n+Attempts to retrieve the temporary file mapped to the string C. If an\n associated temp file has not been created this session or was closed, it is\n created, cached, and set for autoflush and binmode.\n \ndiff --git a/perl/Git/I18N.pm b/perl/Git/I18N.pm\nindex 40dd8971..f889fd6d 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/perl/private-Error.pm b/perl/private-Error.pm\nindex ea14ab27..6098135a 100644\n--- a/perl/private-Error.pm\n+++ b/perl/private-Error.pm\n@@ -769,7 +769,7 @@ is a numeric value. These values are what will be returned by the\n overload methods.\n \n If the text value ends with C as $@ strings do, then\n-this infomation will be used to set the C<-file> and C<-line> arguments\n+this information will be used to set the C<-file> and C<-line> arguments\n of the error object.\n \n This class is used internally if an eval'd block die's with an error\ndiff --git a/sequencer.c b/sequencer.c\nindex aef5e8a0..bad50779 100644\n--- a/sequencer.c\n+++ b/sequencer.c\n@@ -133,7 +133,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 */\ndiff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh\nindex d8b7f2ff..f8a08b7f 100755\n--- a/t/t1006-cat-file.sh\n+++ b/t/t1006-cat-file.sh\n@@ -116,7 +116,7 @@ tree_pretty_content=\"100644 blob $hello_sha1\thello\"\n \n run_tests 'tree' $tree_sha1 $tree_size \"\" \"$tree_pretty_content\"\n \n-commit_message=\"Intial commit\"\n+commit_message=\"Initial commit\"\n commit_sha1=$(echo_without_newline \"$commit_message\" | git commit-tree $tree_sha1)\n commit_size=176\n commit_content=\"tree $tree_sha1\ndiff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh\nindex 098a6ae4..9fab25cc 100755\n--- a/t/t3701-add-interactive.sh\n+++ b/t/t3701-add-interactive.sh\n@@ -319,7 +319,7 @@ test_expect_success PERL 'split hunk \"add -p (edit)\"' '\n \t# times to get out.\n \t#\n \t# 2. Correct version applies the (not)edited version, and asks\n-\t# about the next hunk, against wich we say q and program\n+\t# about the next hunk, against which we say q and program\n \t# exits.\n \tfor a in s e q n q q\n \tdo\ndiff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh\nindex bb1fc47f..183fbe5b 100755\n--- a/t/t4014-format-patch.sh\n+++ b/t/t4014-format-patch.sh\n@@ -742,21 +742,21 @@ test_expect_success 'format-patch --signature --cover-letter' '\n \ttest 2 = $(grep \"my sig\" output | wc -l)\n '\n \n-test_expect_success 'format.signature=\"\" supresses signatures' '\n+test_expect_success 'format.signature=\"\" suppresses signatures' '\n \tgit config format.signature \"\" &&\n \tgit format-patch --stdout -1 >output &&\n \tcheck_patch output &&\n \t! grep \"^-- \\$\" output\n '\n \n-test_expect_success 'format-patch --no-signature supresses signatures' '\n+test_expect_success 'format-patch --no-signature suppresses signatures' '\n \tgit config --unset-all format.signature &&\n \tgit format-patch --stdout --no-signature -1 >output &&\n \tcheck_patch output &&\n \t! grep \"^-- \\$\" output\n '\n \n-test_expect_success 'format-patch --signature=\"\" supresses signatures' '\n+test_expect_success 'format-patch --signature=\"\" suppresses signatures' '\n \tgit format-patch --stdout --signature=\"\" -1 >output &&\n \tcheck_patch output &&\n \t! grep \"^-- \\$\" output\ndiff --git a/t/t4124-apply-ws-rule.sh b/t/t4124-apply-ws-rule.sh\nindex 6f6ee88b..581a8016 100755\n--- a/t/t4124-apply-ws-rule.sh\n+++ b/t/t4124-apply-ws-rule.sh\n@@ -47,7 +47,7 @@ test_fix () {\n \t# find touched lines\n \t$DIFF file target | sed -n -e \"s/^> //p\" >fixed\n \n-\t# the changed lines are all expeced to change\n+\t# the changed lines are all expected to change\n \tfixed_cnt=$(wc -l /dev/null 2>&1 ) &&\n #( yes \"d\" | git mergetool file12 >/dev/null 2>&1 ) &&\n #( yes \"l\" | git mergetool submod >/dev/null 2>&1 ) &&\ndiff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh\nindex 97d6f4c7..ebd5c5db 100755\n--- a/t/t9001-send-email.sh\n+++ b/t/t9001-send-email.sh\n@@ -101,7 +101,7 @@ test_expect_success $PREREQ \\\n \n test_expect_success $PREREQ 'Send patches with --envelope-sender' '\n clean_fake_sendmail &&\n- git send-email --envelope-sender=\"Patch Contributer \" --suppress-cc=sob --from=\"Example \" --to=nobody@example.com --smtp-server=\"$(pwd)/fake.sendmail\" $patches 2>errors\n+ git send-email --envelope-sender=\"Patch Contributor \" --suppress-cc=sob --from=\"Example \" --to=nobody@example.com --smtp-server=\"$(pwd)/fake.sendmail\" $patches 2>errors\n '\n \n test_expect_success $PREREQ 'setup expect' '\n@@ -787,7 +787,7 @@ test_expect_success $PREREQ 'confirm detects EOF (auto causes failure)' '\n \ttest $ret = \"0\"\n '\n \n-test_expect_success $PREREQ 'confirm doesnt loop forever' '\n+test_expect_success $PREREQ 'confirm does not loop forever' '\n \tCONFIRM=$(git config --get sendemail.confirm) &&\n \tgit config sendemail.confirm auto &&\n \tGIT_SEND_EMAIL_NOTTY=1 &&\ndiff --git a/transport-helper.c b/transport-helper.c\nindex cb3ef7d3..dcd8d974 100644\n--- a/transport-helper.c\n+++ b/transport-helper.c\n@@ -991,7 +991,7 @@ struct unidirectional_transfer {\n \tint src_is_sock;\n \t/* Is destination socket? */\n \tint dest_is_sock;\n-\t/* Transfer state (TRANSFERING/FLUSHING/FINISHED) */\n+\t/* Transfer state (TRANSFERRING/FLUSHING/FINISHED) */\n \tint state;\n \t/* Buffer. */\n \tchar buf[BUFFERSIZE];\ndiff --git a/transport.h b/transport.h\nindex a3450e97..e7beb815 100644\n--- a/transport.h\n+++ b/transport.h\n@@ -74,7 +74,7 @@ struct transport {\n \t\t const char *executable, int fd[2]);\n \n \t/** get_refs_list(), fetch(), and push_refs() can keep\n-\t * resources (such as a connection) reserved for futher\n+\t * resources (such as a connection) reserved for further\n \t * use. disconnect() releases these resources.\n \t **/\n \tint (*disconnect)(struct transport *connection);\ndiff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c\nindex 1b7012a1..b2eb6db2 100644\n--- a/xdiff/xdiffi.c\n+++ b/xdiff/xdiffi.c\n@@ -490,7 +490,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {\n \n \t\t/*\n \t\t * Try to move back the possibly merged group of changes, to match\n-\t\t * the recorded postion in the other file.\n+\t\t * the recorded position in the other file.\n \t\t */\n \t\twhile (ixref < ix) {\n \t\t\trchg[--ixs] = 1;\ndiff --git a/xdiff/xhistogram.c b/xdiff/xhistogram.c\nindex bf99787c..73210cb6 100644\n--- a/xdiff/xhistogram.c\n+++ b/xdiff/xhistogram.c\n@@ -55,7 +55,7 @@ struct histindex {\n \tstruct record {\n \t\tunsigned int ptr, cnt;\n \t\tstruct record *next;\n-\t} **records, /* an ocurrence */\n+\t} **records, /* an occurrence */\n \t **line_map; /* map of line to record chain */\n \tchastore_t rcha;\n \tunsigned int *next_ptrs;\n-- \n1.8.2.1\n"},{"id":"214047","messageId":"CAHGBnuN=CUNijVjEToq=mDi9uwXLxcRBTiLjN8Keg87enrJ1Mw@mail.gmail.com","threadId":"33483","inReplyTo":"20130412070655.GG5710@elie.Belkin","subject":"Re: [PATCH 06/10] compat/nedmalloc: fix spelling in comments","fromName":"Sebastian Schuberth","fromEmail":"sschuberth@gmail.com","sentAt":"2013-04-12T07:17:08Z","receivedAt":"2013-04-12T07:17:08Z","isPatch":true,"sender":{"key":"sschuberth@gmail.com","avatar":"https://avatars.githubusercontent.com/u/349154?v=4"},"body":"On Fri, Apr 12, 2013 at 9:06 AM, Jonathan Nieder wrote:\n\n> These don't seem to be fixed yet in https://github.com/ned14/nedmalloc\n> (pointed to from http://www.nedprod.com/programs/portable/nedmalloc/).\n> Would it make sense to write a note to Ned and then import a fixed\n> version from there?\n\nNot necessarily. Last time I checked upstream nedmalloc has diverged\nquite a lot from our version (which is why I only cherry-picked a\nsmall change from upstream instead of taking all of it), so we should\nmake sure not to import any unwanted stuff when going the route of\nimporting upstream.\n\n-- \nSebastian Schuberth\n"},{"id":"214049","messageId":"5167C2EB.7010709@gmail.com","threadId":"33483","inReplyTo":"7v4nfch90r.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH v2] Fix various typos and grammaros","fromName":"Stefano Lattarini","fromEmail":"stefano.lattarini@gmail.com","sentAt":"2013-04-12T08:16:43Z","receivedAt":"2013-04-12T08:16:43Z","isPatch":true,"sender":{"key":"stefano.lattarini@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1429199?v=4"},"body":"Hi Junio.\n\nOn 04/12/2013 02:45 AM, Junio C Hamano wrote:\n> Stefano Lattarini writes:\n> \n> How much of this stuff have interact with real changes that are in\n> flight, with various doneness cooking in different integration\n> branches?\n> \nI don't know, since I only follow the master branch of Git. And\nhonestly, I don't have time right now to go checking for possible\nconflicts, or to resubmit ... But I see Jonathan has taken up\nthe ball on this (thanks Jonathan!), so I'll leave the matter to\nhim.\n\nNext time I'll try to prepare a patch broken up in more digestible\npieces, so that it will be easier for you to deal with conflicts,\nand/or to selectively decide which fixes are worth applying.\n\nThanks, and sorry for the confusion,\n Stefano\n"},{"id":"214053","messageId":"vpqk3o89eyy.fsf@grenoble-inp.fr","threadId":"33483","inReplyTo":"20130412065058.GC5710@elie.Belkin","subject":"Re: [PATCH 02/10] git-remote-mediawiki: spelling fixes","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2013-04-12T11:16:05Z","receivedAt":"2013-04-12T11:16:05Z","isPatch":true,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Jonathan Nieder writes:\n\n> From: Stefano Lattarini \n> Date: Fri, 12 Apr 2013 00:36:10 +0200\n>\n> Most of these were found using Lucas De Marchi's codespell tool.\n> Others were pointed out by Eric Sunshine.\n>\n> Helped-by: Eric Sunshine \n> Signed-off-by: Stefano Lattarini \n> Signed-off-by: Jonathan Nieder \n\nAnd obviously Ack-ed-by: Matthieu Moy \n\nThanks,\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"214069","messageId":"7vfvyvg28g.fsf@alter.siamese.dyndns.org","threadId":"33483","inReplyTo":"20130412064837.GA5710@elie.Belkin","subject":"Re: [RFC/PATCH maint 0/10] Re: [PATCH v2] Fix various typos and grammaros","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-04-12T16:09:19Z","receivedAt":"2013-04-12T16:09:19Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jonathan Nieder writes:\n\n> Hi,\n>\n> Junio C Hamano wrote:\n>\n>> How much of this stuff have interact with real changes that are in\n>> flight, with various doneness cooking in different integration\n>> branches?\n>\n> All except the t3511-cherry-pick-x.sh change apply cleanly to\n> \"maint\" and merge without trouble with master and pu.\n>\n> Here is a split-up version.\n\nThanks.\n\n> I haven't looked closely at the patch,\n> even to sanity check it --- one of the main points of splitting it\n> this way is to make it easier to review with reference to code\n> borrowed from other projects.\n\nSure.\n\n> Some of these patches need more work if they are to be applied. For\n> example, git-gui is maintained separately and should not be patched\n> from the toplevel.\n\nTrue.\n\nThanks.\n"},{"id":"214070","messageId":"7vbo9jg26b.fsf@alter.siamese.dyndns.org","threadId":"33483","inReplyTo":"5167C2EB.7010709@gmail.com","subject":"Re: [PATCH v2] Fix various typos and grammaros","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-04-12T16:10:36Z","receivedAt":"2013-04-12T16:10:36Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Stefano Lattarini writes:\n\n> Hi Junio.\n>\n> On 04/12/2013 02:45 AM, Junio C Hamano wrote:\n>> Stefano Lattarini writes:\n>> \n>> How much of this stuff have interact with real changes that are in\n>> flight, with various doneness cooking in different integration\n>> branches?\n>> \n> I don't know, since I only follow the master branch of Git. And\n> honestly, I don't have time right now to go checking for possible\n> conflicts, or to resubmit ... But I see Jonathan has taken up\n> the ball on this (thanks Jonathan!), so I'll leave the matter to\n> him.\n\nYeah, that's OK. Thanks.\n\n> Next time I'll try to prepare a patch broken up in more digestible\n> pieces, so that it will be easier for you to deal with conflicts,\n> and/or to selectively decide which fixes are worth applying.\n>\n> Thanks, and sorry for the confusion,\n> Stefano\n"},{"id":"214092","messageId":"7vy5cnd0m4.fsf@alter.siamese.dyndns.org","threadId":"33483","inReplyTo":"20130412064953.GB5710@elie.Belkin","subject":"Re: [PATCH 01/10] doc: various spelling fixes","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-04-12T19:12:35Z","receivedAt":"2013-04-12T19:12:35Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jonathan Nieder writes:\n\n> Note that if per-instance configuration file exists, then system-wide\n> - configuration is _not used at all_. This is quite untypical and suprising\n> + configuration is _not used at all_. This is quite untypical and surprising\n> behavior. On the other hand changing current behavior would break backwards\n> compatibility and can lead to unexpected changes in gitweb behavior.\n> Therefore gitweb also looks for common system-wide configuration file,\n\nHmm, \"atypical\", isn't it?\n\nThe flow of the text is awkward. \"This is bad. Oh the other hand,\nbetter is broken. Therefore ...\" forces readers to make multiple\nguesses while reading: \"ok, bad, so you plan to change it and warn\nus about upcoming change? oh, not that, changing it is bad, so we\nhave to live with it? oh, not that, there is another one that is\ncommon and that is what we can use\".\n\nIt may be a good idea to rewrite this paragraph to avoid such a\nmental roller-coaster in the first place.\n\n The GITWEB_CONFIG_SYSTEM system-wide configuration file is only\n used for instances that lack per-instance configuration file.\n You can use GITWEB_CONFIG_COMMON file to keep common default\n settings that apply to all instances.\n\nor something.\n\nNot asking for a re-roll, but it may be a potential follow-up candidate.\n\nThanks.\n"},{"id":"214100","messageId":"7vppxzcwlx.fsf@alter.siamese.dyndns.org","threadId":"33483","inReplyTo":"20130412071102.GK5710@elie.Belkin","subject":"Re: [PATCH 10/10] Correct common spelling mistakes in comments and tests","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-04-12T20:39:06Z","receivedAt":"2013-04-12T20:39:06Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jonathan Nieder writes:\n\n> diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh\n> index d8b7f2ff..f8a08b7f 100755\n> --- a/t/t1006-cat-file.sh\n> +++ b/t/t1006-cat-file.sh\n> @@ -116,7 +116,7 @@ tree_pretty_content=\"100644 blob $hello_sha1\thello\"\n> \n> run_tests 'tree' $tree_sha1 $tree_size \"\" \"$tree_pretty_content\"\n> \n> -commit_message=\"Intial commit\"\n> +commit_message=\"Initial commit\"\n> commit_sha1=$(echo_without_newline \"$commit_message\" | git commit-tree $tree_sha1)\n> commit_size=176\n> commit_content=\"tree $tree_sha1\n\nThis breaks the test for rather obvious reasons. I'll squash this in:\n\ndiff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh\nindex f8a08b7..9820f70 100755\n--- a/t/t1006-cat-file.sh\n+++ b/t/t1006-cat-file.sh\n@@ -118,7 +118,7 @@ run_tests 'tree' $tree_sha1 $tree_size \"\" \"$tree_pretty_content\"\n \n commit_message=\"Initial commit\"\n commit_sha1=$(echo_without_newline \"$commit_message\" | git commit-tree $tree_sha1)\n-commit_size=176\n+commit_size=177\n commit_content=\"tree $tree_sha1\n author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> 0000000000 +0000\n committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 0000000000 +0000\n\nThanks.\n"},{"id":"214107","messageId":"516888C0.90501@gmail.com","threadId":"33483","inReplyTo":"7vy5cnd0m4.fsf@alter.siamese.dyndns.org","subject":"[PATCH] gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM","fromName":"Jakub Narębski","fromEmail":"jnareb@gmail.com","sentAt":"2013-04-12T22:20:48Z","receivedAt":"2013-04-12T22:20:48Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"On Fri, 12 April 2013, Junio C Hamano wrote:\n> Jonathan Nieder writes:\n>\n>> Note that if per-instance configuration file exists, then system-wide\n>> - configuration is _not used at all_. This is quite untypical and suprising\n>> + configuration is _not used at all_. This is quite untypical and surprising\n>> behavior. On the other hand changing current behavior would break backwards\n>> compatibility and can lead to unexpected changes in gitweb behavior.\n>> Therefore gitweb also looks for common system-wide configuration file,\n>\n> Hmm, \"atypical\", isn't it?\n>\n> The flow of the text is awkward. \"This is bad. Oh the other hand,\n> better is broken. Therefore ...\" forces readers to make multiple\n> guesses while reading: \"ok, bad, so you plan to change it and warn\n> us about upcoming change? oh, not that, changing it is bad, so we\n> have to live with it? oh, not that, there is another one that is\n> common and that is what we can use\".\n>\n> It may be a good idea to rewrite this paragraph to avoid such a\n> mental roller-coaster in the first place.\n>\n> The GITWEB_CONFIG_SYSTEM system-wide configuration file is only\n> used for instances that lack per-instance configuration file.\n> You can use GITWEB_CONFIG_COMMON file to keep common default\n> settings that apply to all instances.\n>\n> or something.\n>\n> Not asking for a re-roll, but it may be a potential follow-up candidate.\n\nPerhaps something like this?\n\nNote that this change avoids repetition of build / environmental\nconfiguration variable (I think the paragraph above, not touched\nin this patch, also might need rewrite).\n\n-- >8 --\nSubject: [PATCH] gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM\n\nThe flow of the text describing GITWEB_CONFIG_SYSTEM and\nGITWEB_CONFIG_COMMON in gitweb/INSTALL is awkward. \"This is\nbad. Oh the other hand, better is broken. Therefore ...\" forces\nreaders to make multiple guesses while reading: \"ok, bad, so you plan\nto change it and warn us about upcoming change? oh, not that,\nchanging it is bad, so we have to live with it? oh, not that, there\nis another one that is common and that is what we can use\".\n\nBetter rewrite said paragraph to avoid such a mental roller-coaster in\nthe first place.\n\nSigned-off-by: Junio Hamano \nSigned-off-by: Jakub Narebski \n---\n gitweb/INSTALL | 14 ++++++--------\n 1 file changed, 6 insertions(+), 8 deletions(-)\n\ndiff --git a/gitweb/INSTALL b/gitweb/INSTALL\nindex 6d45406..7ad1050 100644\n--- a/gitweb/INSTALL\n+++ b/gitweb/INSTALL\n@@ -243,14 +243,12 @@ for gitweb (in gitweb/README), and gitweb.conf(5) manpage.\n GITWEB_CONFIG_SYSTEM build configuration variable, and override it\n through the GITWEB_CONFIG_SYSTEM environment variable.\n \n- Note that if per-instance configuration file exists, then system-wide\n- configuration is _not used at all_. This is quite untypical and suprising\n- behavior. On the other hand changing current behavior would break backwards\n- compatibility and can lead to unexpected changes in gitweb behavior.\n- Therefore gitweb also looks for common system-wide configuration file,\n- normally /etc/gitweb-common.conf (set during build time using build time\n- configuration variable GITWEB_CONFIG_COMMON, set it at runtime using\n- environment variable with the same name). Settings from per-instance or\n+\n+ Note that the GITWEB_CONFIG_SYSTEM system-wide configuration file is\n+ only used for instances that lack per-instance configuration file.\n+ You can use GITWEB_CONFIG_COMMON common system-wide configuration\n+ file (normally /etc/gitweb-common.conf) to keep common default\n+ settings that apply to all instances. Settings from per-instance or\n system-wide configuration file override those from common system-wide\n configuration file.\n \n-- \n1.7.10.4\n"},{"id":"214423","messageId":"CAM9Z-nmOzpJdT3ni0rYRkg7Z26N5XSRyqp0TkTY79AAZ85pw2A@mail.gmail.com","threadId":"33483","inReplyTo":"516888C0.90501@gmail.com","subject":"Re: [PATCH] gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM","fromName":"Drew Northup","fromEmail":"n1xim.email@gmail.com","sentAt":"2013-04-16T03:10:58Z","receivedAt":"2013-04-16T03:10:58Z","isPatch":true,"sender":{"key":"n1xim.email@gmail.com","avatar":null},"body":"On Fri, Apr 12, 2013 at 6:20 PM, Jakub Narębski wrote:\n\n> -- >8 --\n> Subject: [PATCH] gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM\n>\n> The flow of the text describing GITWEB_CONFIG_SYSTEM and\n> GITWEB_CONFIG_COMMON in gitweb/INSTALL is awkward. \"This is\n> bad. Oh the other hand, better is broken. Therefore ...\" forces\n> readers to make multiple guesses while reading: \"ok, bad, so you plan\n> to change it and warn us about upcoming change? oh, not that,\n> changing it is bad, so we have to live with it? oh, not that, there\n> is another one that is common and that is what we can use\".\n>\n> Better rewrite said paragraph to avoid such a mental roller-coaster in\n> the first place.\n>\n> Signed-off-by: Junio Hamano \n> Signed-off-by: Jakub Narebski \n> ---\n> gitweb/INSTALL | 14 ++++++--------\n> 1 file changed, 6 insertions(+), 8 deletions(-)\n>\n> diff --git a/gitweb/INSTALL b/gitweb/INSTALL\n> index 6d45406..7ad1050 100644\n> --- a/gitweb/INSTALL\n> +++ b/gitweb/INSTALL\n> @@ -243,14 +243,12 @@ for gitweb (in gitweb/README), and gitweb.conf(5) manpage.\n> GITWEB_CONFIG_SYSTEM build configuration variable, and override it\n> through the GITWEB_CONFIG_SYSTEM environment variable.\n>\n> - Note that if per-instance configuration file exists, then system-wide\n> - configuration is _not used at all_. This is quite untypical and suprising\n> - behavior. On the other hand changing current behavior would break backwards\n> - compatibility and can lead to unexpected changes in gitweb behavior.\n> - Therefore gitweb also looks for common system-wide configuration file,\n> - normally /etc/gitweb-common.conf (set during build time using build time\n> - configuration variable GITWEB_CONFIG_COMMON, set it at runtime using\n> - environment variable with the same name). Settings from per-instance or\n> +\n> + Note that the GITWEB_CONFIG_SYSTEM system-wide configuration file is\n> + only used for instances that lack per-instance configuration file.\n> + You can use GITWEB_CONFIG_COMMON common system-wide configuration\n> + file (normally /etc/gitweb-common.conf) to keep common default\n> + settings that apply to all instances. Settings from per-instance or\n> system-wide configuration file override those from common system-wide\n> configuration file.\n\nThe point of wording it such that it was explicitly noted that the\nsupposed \"system-wide\" settings were really just \"system-wide\ndefaults\" (which would be ignored wholesale if any one setting was\noverridden locally) was due to the fact that most of the time server\nadministrators don't deal with software that idiosyncratic. Prior to\nthe addition of GITWEB_CONFIG_COMMON there was no method for setting\nup a sane default template that wouldn't be discarded wholesale upon\nany one configuration parameter being overridden.\n\nThat's the point of explaining SPECIFICALLY why the then current\nbehavior wasn't being replaced, and this other mechanism (which would\notherwise have no obvious reason for existing) was being introduced.\nSo, unfortunately, if we remove the \"mental roller coaster\" part of\nthe explanation entirely we can expect to end up in exactly the\nsituation that I complained about to begin with. (Or we could just do\nthis the way everybody else does, with partial overrides being the\ncommon case, starting at 2.x and no longer have the mental roller\ncoaster problem at all.)\n\nAs I'm the one that complained loudly enough to get this change to be\nmade in the first place I'd appreciate being kept in the loop in this\nseries.\n\n--\n-Drew Northup\n--------------------------------------------------------------\n\"As opposed to vegetable or mineral error?\"\n-John Pescatore, SANS NewsBites Vol. 12 Num. 59\n"},{"id":"214433","messageId":"7vobdfnlc7.fsf@alter.siamese.dyndns.org","threadId":"33483","inReplyTo":"CAM9Z-nmOzpJdT3ni0rYRkg7Z26N5XSRyqp0TkTY79AAZ85pw2A@mail.gmail.com","subject":"Re: [PATCH] gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-04-16T04:36:08Z","receivedAt":"2013-04-16T04:36:08Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Drew Northup writes:\n\n>> + Note that the GITWEB_CONFIG_SYSTEM system-wide configuration file is\n>> + only used for instances that lack per-instance configuration file.\n>> + You can use GITWEB_CONFIG_COMMON common system-wide configuration\n>> + file (normally /etc/gitweb-common.conf) to keep common default\n>> + settings that apply to all instances. Settings from per-instance or\n>> system-wide configuration file override those from common system-wide\n>> configuration file.\n>\n> That's the point of explaining SPECIFICALLY why the then current\n> behavior wasn't being replaced, and this other mechanism (which would\n> otherwise have no obvious reason for existing) was being introduced.\n\nIn order to just pick and use the more appropriate one (or a useful\ncombination of the two), a clean description of what each of them do\nwithout historical cruft is more readable and useful, isn't it? I\nwould expect that most of them who are newly configuring a system\nwould pick COMMON one and override per instance as needed, without\ntouching the SYSTEM one (fallback default) after reading the above,\nand that is what we want to happen.\n\nDo you think sysadmins need a history lesson to understand why there\nare two different possibilities?\n\nFor example, bash reads some but not all possible configuration\nfiles. I would expect .bashrc to be read even for login shells after\nreading .bash_login; alas, that is not what happens. The manual\ndoes not apologize that the authors now know better and understand\nthat it is a stupid behaviour. The order the rc files are read is\njust described matter-of-factly, and it gives sufficient information\nwithout unnecessary backstory.\n\nI think the new text conveys the necessary information to the\nintended audience with more clarity without the history lesson or\nthe record of your past frustration. Am I mistaken?\n"},{"id":"214441","messageId":"516CF98E.2050706@gmail.com","threadId":"33483","inReplyTo":"7vobdfnlc7.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM","fromName":"Jakub Narębski","fromEmail":"jnareb@gmail.com","sentAt":"2013-04-16T07:11:10Z","receivedAt":"2013-04-16T07:11:10Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Junio C Hamano wrote:\n\n> In order to just pick and use the more appropriate one (or a useful\n> combination of the two), a clean description of what each of them do\n> without historical cruft is more readable and useful, isn't it? I\n> would expect that most of them who are newly configuring a system\n> would pick COMMON one and override per instance as needed, without\n> touching the SYSTEM one (fallback default) after reading the above,\n> and that is what we want to happen.\n> \n> Do you think sysadmins need a history lesson to understand why there\n> are two different possibilities?\n[...]\n> I think the new text conveys the necessary information to the\n> intended audience with more clarity without the history lesson or\n> the record of your past frustration. Am I mistaken?\n\nNote also that this is about *gitweb/INSTALL*, which is meant to be\n*short* and succint description on how to install gitweb, and not\nabout the reference documentation: gitweb(1) or gitweb.conf(5).\n\nDescription of historical behavior (and backward compatibility)\nhas place (if any) in manpages, not gitweb/INSTALL.\n-- \nJakub Narębski\n"},{"id":"214477","messageId":"CAM9Z-n=MNs4598AHjOUfbd1K3uPQBJVQ-GU=qekdsgyzHvBigg@mail.gmail.com","threadId":"33483","inReplyTo":"516CF98E.2050706@gmail.com","subject":"Re: [PATCH] gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM","fromName":"Drew Northup","fromEmail":"n1xim.email@gmail.com","sentAt":"2013-04-16T11:51:12Z","receivedAt":"2013-04-16T11:51:12Z","isPatch":true,"sender":{"key":"n1xim.email@gmail.com","avatar":null},"body":"On Tue, Apr 16, 2013 at 3:11 AM, Jakub Narębski wrote:\n> Junio C Hamano wrote:\n>\n>> In order to just pick and use the more appropriate one (or a useful\n>> combination of the two), a clean description of what each of them do\n>> without historical cruft is more readable and useful, isn't it? I\n>> would expect that most of them who are newly configuring a system\n>> would pick COMMON one and override per instance as needed, without\n>> touching the SYSTEM one (fallback default) after reading the above,\n>> and that is what we want to happen.\n>>\n>> Do you think sysadmins need a history lesson to understand why there\n>> are two different possibilities?\n> [...]\n>> I think the new text conveys the necessary information to the\n>> intended audience with more clarity without the history lesson or\n>> the record of your past frustration. Am I mistaken?\n>\n> Note also that this is about *gitweb/INSTALL*, which is meant to be\n> *short* and succint description on how to install gitweb, and not\n> about the reference documentation: gitweb(1) or gitweb.conf(5).\n>\n> Description of historical behavior (and backward compatibility)\n> has place (if any) in manpages, not gitweb/INSTALL.\n> --\n> Jakub Narębski\n\nLet us then agree that it should be mentioned somewhere in\ngitweb.conf.txt then (as it currently is not).\n\n--\n-Drew Northup\n--------------------------------------------------------------\n\"As opposed to vegetable or mineral error?\"\n-John Pescatore, SANS NewsBites Vol. 12 Num. 59\n"},{"id":"214478","messageId":"CAM9Z-nm=SUNAHXZtOnz_BSS8VrVYPczicX99FUmDJe6Lj_oKpQ@mail.gmail.com","threadId":"33483","inReplyTo":"7vobdfnlc7.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM","fromName":"Drew Northup","fromEmail":"n1xim.email@gmail.com","sentAt":"2013-04-16T11:56:56Z","receivedAt":"2013-04-16T11:56:56Z","isPatch":true,"sender":{"key":"n1xim.email@gmail.com","avatar":null},"body":"On Tue, Apr 16, 2013 at 12:36 AM, Junio C Hamano wrote:\n> Drew Northup writes:\n>\n>>> + Note that the GITWEB_CONFIG_SYSTEM system-wide configuration file is\n>>> + only used for instances that lack per-instance configuration file.\n>>> + You can use GITWEB_CONFIG_COMMON common system-wide configuration\n>>> + file (normally /etc/gitweb-common.conf) to keep common default\n>>> + settings that apply to all instances. Settings from per-instance or\n>>> system-wide configuration file override those from common system-wide\n>>> configuration file.\n>>\n>> That's the point of explaining SPECIFICALLY why the then current\n>> behavior wasn't being replaced, and this other mechanism (which would\n>> otherwise have no obvious reason for existing) was being introduced.\n>\n> In order to just pick and use the more appropriate one (or a useful\n> combination of the two), a clean description of what each of them do\n> without historical cruft is more readable and useful, isn't it?\n\nI am not demanding the retention of cruft, and the rewording is\ndefinitely more pleasant to read.\n\n> I\n> would expect that most of them who are newly configuring a system\n> would pick COMMON one and override per instance as needed, without\n> touching the SYSTEM one (fallback default) after reading the above,\n> and that is what we want to happen.\n>\n> Do you think sysadmins need a history lesson to understand why there\n> are two different possibilities?\n\nWe don't need a full history lesson. What we do need to know is that\n\"Hey, they don't do that the way everybody else does because it would\nbreak things.\" That's enough to get the point across, and as Jakub\nnoted gitweb.conf.txt is the correct place for it.\n\n> For example, bash reads some but not all possible configuration\n> files. I would expect .bashrc to be read even for login shells after\n> reading .bash_login; alas, that is not what happens. The manual\n> does not apologize that the authors now know better and understand\n> that it is a stupid behaviour. The order the rc files are read is\n> just described matter-of-factly, and it gives sufficient information\n> without unnecessary backstory.\n>\n> I think the new text conveys the necessary information to the\n> intended audience with more clarity without the history lesson or\n> the record of your past frustration. Am I mistaken?\n\nThe back-story isn't needed; the \"Hey this is different\" part is. I\nthink Jakub's suggestion of covering that (succinctly) in\ngitweb.conf.txt is the correct solution.\n\n--\n-Drew Northup\n--------------------------------------------------------------\n\"As opposed to vegetable or mineral error?\"\n-John Pescatore, SANS NewsBites Vol. 12 Num. 59\n"},{"id":"214479","messageId":"516D4359.2070501@gmail.com","threadId":"33483","inReplyTo":"CAM9Z-nm=SUNAHXZtOnz_BSS8VrVYPczicX99FUmDJe6Lj_oKpQ@mail.gmail.com","subject":"[PATCH] gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility","fromName":"Jakub Narębski","fromEmail":"jnareb@gmail.com","sentAt":"2013-04-16T12:26:01Z","receivedAt":"2013-04-16T12:26:01Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Signed-off-by: Jakub Narebski \n---\nThis can be either squashed with previous patch to gitweb/INSTALL,\nkept as separate patch or discarded.\n\nDrew: gitweb(1) or gitweb.conf(5) solution is more involved, so\nperhaps something like that?\n\n gitweb/INSTALL | 3 ++-\n 1 file changed, 2 insertions(+), 1 deletion(-)\n\ndiff --git a/gitweb/INSTALL b/gitweb/INSTALL\nindex 7ad1050..386e62f 100644\n--- a/gitweb/INSTALL\n+++ b/gitweb/INSTALL\n@@ -243,7 +243,6 @@ for gitweb (in gitweb/README), and gitweb.conf(5) manpage.\n GITWEB_CONFIG_SYSTEM build configuration variable, and override it\n through the GITWEB_CONFIG_SYSTEM environment variable.\n \n-\n Note that the GITWEB_CONFIG_SYSTEM system-wide configuration file is\n only used for instances that lack per-instance configuration file.\n You can use GITWEB_CONFIG_COMMON common system-wide configuration\n@@ -252,6 +251,8 @@ for gitweb (in gitweb/README), and gitweb.conf(5) manpage.\n system-wide configuration file override those from common system-wide\n configuration file.\n \n+ (Idiosyncratic GITWEB_CONFIG_SYSTEM is present for backward compatibility.)\n+\n - The gitweb config file is a fragment of perl code. You can set variables\n using \"our $variable = value\"; text from \"#\" character until the end\n of a line is ignored. See perlsyn(1) for details.\n-- \n1.7.10.4\n"},{"id":"214480","messageId":"CAM9Z-nkbBS5qvbkocdGWj7rwtSxB86+R4jdjcBOxCU4YjtgZ1A@mail.gmail.com","threadId":"33483","inReplyTo":"516D4359.2070501@gmail.com","subject":"Re: [PATCH] gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility","fromName":"Drew Northup","fromEmail":"n1xim.email@gmail.com","sentAt":"2013-04-16T12:47:09Z","receivedAt":"2013-04-16T12:47:09Z","isPatch":true,"sender":{"key":"n1xim.email@gmail.com","avatar":null},"body":"On Tue, Apr 16, 2013 at 8:26 AM, Jakub Narębski wrote:\n\n> Drew: gitweb(1) or gitweb.conf(5) solution is more involved, so\n> perhaps something like that?\n\n\nThat or: (or both I suppose....hopefully not too mangled by Google's\nmail gadget)\n\n-- >8 --\nSubject: [PATCH] Documentation/gitweb.conf.txt: Move note about config\norder precedence\n\nTo go along with Jakub Narebski's cleanup of gitweb/INSTALL; making\nit clear that gitweb's config files work differently than a lot of\nother system-wide software. This is unobtrusive yet to the point.\n---\n Documentation/gitweb.conf.txt | 3 ++-\n 1 file changed, 2 insertions(+), 1 deletion(-)\n\ndiff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.txt\nindex eb63631..05c81e7 100644\n--- a/Documentation/gitweb.conf.txt\n+++ b/Documentation/gitweb.conf.txt\n@@ -55,7 +55,8 @@ following order:\n then fallback system-wide configuration file (defaults to\n'/etc/gitweb.conf').\n\n Values obtained in later configuration files override values obtained earlier\n-in the above sequence.\n+in the above sequence. This is different from many system-wide software\n+installations and will stay this way for historical reasons.\n\n Locations of the common system-wide configuration file, the fallback\n system-wide configuration file and the per-instance configuration file\n--\n1.8.0\n\n\n--\n-Drew Northup\n--------------------------------------------------------------\n\"As opposed to vegetable or mineral error?\"\n-John Pescatore, SANS NewsBites Vol. 12 Num. 59\n"},{"id":"214481","messageId":"CAM9Z-nm2GM+LoKSK4K_qsvCdL-EfE+-B7meOoS4hVDsVSb9CTg@mail.gmail.com","threadId":"33483","inReplyTo":"CAM9Z-nkbBS5qvbkocdGWj7rwtSxB86+R4jdjcBOxCU4YjtgZ1A@mail.gmail.com","subject":"Re: [PATCH] gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility","fromName":"Drew Northup","fromEmail":"n1xim.email@gmail.com","sentAt":"2013-04-16T12:52:01Z","receivedAt":"2013-04-16T12:52:01Z","isPatch":true,"sender":{"key":"n1xim.email@gmail.com","avatar":null},"body":"Forgot the S-O-B...\n\nOn Tue, Apr 16, 2013 at 8:47 AM, Drew Northup wrote:\n> On Tue, Apr 16, 2013 at 8:26 AM, Jakub Narębski wrote:\n>\n>> Drew: gitweb(1) or gitweb.conf(5) solution is more involved, so\n>> perhaps something like that?\n>\n>\n> That or: (or both I suppose....hopefully not too mangled by Google's\n> mail gadget)\n>\n\nSubject: [PATCH] [PATCH] Documentation/gitweb.conf.txt: Move note\nabout config order precedence\n\nTo go along with Jakub Narebski's cleanup of gitweb/INSTALL; making\nit clear that gitweb's config files work differently than a lot of\nother system-wide software. This is unobtrusive yet to the point.\n\nSigned-off-by: Drew Northup \n---\n Documentation/gitweb.conf.txt | 3 ++-\n 1 file changed, 2 insertions(+), 1 deletion(-)\n\ndiff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.txt\nindex eb63631..05c81e7 100644\n--- a/Documentation/gitweb.conf.txt\n+++ b/Documentation/gitweb.conf.txt\n@@ -55,7 +55,8 @@ following order:\n then fallback system-wide configuration file (defaults to\n'/etc/gitweb.conf').\n\n Values obtained in later configuration files override values obtained earlier\n-in the above sequence.\n+in the above sequence. This is different from many system-wide software\n+installations and will stay this way for historical reasons.\n\n Locations of the common system-wide configuration file, the fallback\n system-wide configuration file and the per-instance configuration file\n--\n1.8.0\n\n--\n-Drew Northup\n--------------------------------------------------------------\n\"As opposed to vegetable or mineral error?\"\n-John Pescatore, SANS NewsBites Vol. 12 Num. 59\n"},{"id":"214552","messageId":"20130416222600.GG29773@google.com","threadId":"33483","inReplyTo":"CAM9Z-nkbBS5qvbkocdGWj7rwtSxB86+R4jdjcBOxCU4YjtgZ1A@mail.gmail.com","subject":"Re: [PATCH] gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-04-16T22:26:00Z","receivedAt":"2013-04-16T22:26:00Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Drew Northup wrote:\n\n> This is unobtrusive yet to the point.\n\nI agree with the spirit.\n\n[...]\n> --- a/Documentation/gitweb.conf.txt\n> +++ b/Documentation/gitweb.conf.txt\n> @@ -55,7 +55,8 @@ following order:\n> then fallback system-wide configuration file (defaults to\n> '/etc/gitweb.conf').\n> \n> Values obtained in later configuration files override values obtained earlier\n> -in the above sequence.\n> +in the above sequence. This is different from many system-wide software\n> +installations and will stay this way for historical reasons.\n\nThat makes it sound like the \"per instance overrides common overrides\nbuilt-in\" cascading is what is unusual and what we need to apologize\nfor.\n\nHow about something like the following? (It uses a BUGS section to\nmake the warning easy to notice for people tracking down confusing\nbehavior by searching for \"gitweb.conf\".)\n\ndiff --git i/Documentation/gitweb.conf.txt w/Documentation/gitweb.conf.txt\nindex eb63631..ea0526e 100644\n--- i/Documentation/gitweb.conf.txt\n+++ w/Documentation/gitweb.conf.txt\n@@ -857,6 +857,13 @@ adding the following lines to your gitweb configuration file:\n \t$known_snapshot_formats{'zip'}{'disabled'} = 1;\n \t$known_snapshot_formats{'tgz'}{'compressor'} = ['gzip','-6'];\n \n+BUGS\n+----\n+Debugging would be easier if the fallback configuration file\n+(`/etc/gitweb.conf`) and environment variable to override its location\n+('GITWEB_CONFIG_SYSTEM') had names reflecting their \"fallback\" role.\n+The current names are kept to avoid breaking working setups.\n+\n ENVIRONMENT\n -----------\n The location of per-instance and system-wide configuration files can be\n"},{"id":"214664","messageId":"CAM9Z-nkG0YbudBnhcu6du824aEcXRVLCx406=kVbG83g3rFPdQ@mail.gmail.com","threadId":"33483","inReplyTo":"20130416222600.GG29773@google.com","subject":"Re: [PATCH] gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility","fromName":"Drew Northup","fromEmail":"n1xim.email@gmail.com","sentAt":"2013-04-18T01:00:15Z","receivedAt":"2013-04-18T01:00:15Z","isPatch":true,"sender":{"key":"n1xim.email@gmail.com","avatar":null},"body":"On Tue, Apr 16, 2013 at 6:26 PM, Jonathan Nieder wrote:\n> Drew Northup wrote:\n>\n>> This is unobtrusive yet to the point.\n>\n> I agree with the spirit.\n>\n> [...]\n>> --- a/Documentation/gitweb.conf.txt\n>> +++ b/Documentation/gitweb.conf.txt\n>> @@ -55,7 +55,8 @@ following order:\n>> then fallback system-wide configuration file (defaults to\n>> '/etc/gitweb.conf').\n>>\n>> Values obtained in later configuration files override values obtained earlier\n>> -in the above sequence.\n>> +in the above sequence. This is different from many system-wide software\n>> +installations and will stay this way for historical reasons.\n>\n> That makes it sound like the \"per instance overrides common overrides\n> built-in\" cascading is what is unusual and what we need to apologize\n> for.\n\nI don't think were apologizing for anything. It is helpful to say \"we\ndo some things differently here and don't plan on changing for a very\nimportant reason.\n\n> How about something like the following? (It uses a BUGS section to\n> make the warning easy to notice for people tracking down confusing\n> behavior by searching for \"gitweb.conf\".)\n>\n> diff --git i/Documentation/gitweb.conf.txt w/Documentation/gitweb.conf.txt\n> index eb63631..ea0526e 100644\n> --- i/Documentation/gitweb.conf.txt\n> +++ w/Documentation/gitweb.conf.txt\n> @@ -857,6 +857,13 @@ adding the following lines to your gitweb configuration file:\n> $known_snapshot_formats{'zip'}{'disabled'} = 1;\n> $known_snapshot_formats{'tgz'}{'compressor'} = ['gzip','-6'];\n>\n> +BUGS\n> +----\n> +Debugging would be easier if the fallback configuration file\n> +(`/etc/gitweb.conf`) and environment variable to override its location\n> +('GITWEB_CONFIG_SYSTEM') had names reflecting their \"fallback\" role.\n> +The current names are kept to avoid breaking working setups.\n> +\n> ENVIRONMENT\n> -----------\n> The location of per-instance and system-wide configuration files can be\n\nI don't disagree with this, as some would consider the naming to be a\nbug, but after having been given a good schooling on the git list a\nwhile back as to why it is the way it is I'm hesitant to label \"has\nhistory\" as a bug.\n\n--\n-Drew Northup\n--------------------------------------------------------------\n\"As opposed to vegetable or mineral error?\"\n-John Pescatore, SANS NewsBites Vol. 12 Num. 59\n"},{"id":"214666","messageId":"7v61zkd344.fsf@alter.siamese.dyndns.org","threadId":"33483","inReplyTo":"CAM9Z-nkG0YbudBnhcu6du824aEcXRVLCx406=kVbG83g3rFPdQ@mail.gmail.com","subject":"Re: [PATCH] gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-04-18T01:44:27Z","receivedAt":"2013-04-18T01:44:27Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Drew Northup writes:\n\n>> That makes it sound like the \"per instance overrides common overrides\n>> built-in\" cascading is what is unusual and what we need to apologize\n>> for.\n>\n> I don't think were apologizing for anything. It is helpful to say \"we\n> do some things differently here and don't plan on changing for a very\n> important reason.\n\nMy biggest resistance against this whole thing is that word\n\"differently\".\n\nIt really depends on who reads this document. For some, it may be\ndifferent. For others, it may not be unexpected at all. \"We do\nthings differently\" may help the former but I do not want the latter\nto try to find \"difference\" that does not exist elsewhere and get\nconfused.\n\n>>\n>> +BUGS\n>> +----\n>> +Debugging would be easier if the fallback configuration file\n>> +(`/etc/gitweb.conf`) and environment variable to override its location\n>> +('GITWEB_CONFIG_SYSTEM') had names reflecting their \"fallback\" role.\n>> +The current names are kept to avoid breaking working setups.\n>> +\n>> ENVIRONMENT\n>> -----------\n>> The location of per-instance and system-wide configuration files can be\n>\n> I don't disagree with this, as some would consider the naming to be a\n> bug, but after having been given a good schooling on the git list a\n> while back as to why it is the way it is I'm hesitant to label \"has\n> history\" as a bug.\n\nBUGS section being traditionally where you would throw this kind of\nthing, either a bug, non-bug, or wai-but-some-may-not-agree, I think\nthis is a good description.\n"}]}