{"thread":{"id":"18119","subject":"[PATCH] Documentation: Typo / spelling / formatting fixes","startedAt":"2009-03-03T19:29:20Z","lastAt":"2009-03-03T19:29:22Z","messageCount":3,"participants":["Mike Ralphson"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"106923","messageId":"1236108562-31469-1-git-send-email-mike@abacus.co.uk","threadId":"18119","inReplyTo":null,"subject":"[PATCH] Documentation: Typos / spelling fixes in RelNotes","fromName":"Mike Ralphson","fromEmail":"mike@abacus.co.uk","sentAt":"2009-03-03T19:29:20Z","receivedAt":"2009-03-03T19:29:20Z","isPatch":true,"sender":{"key":"mike@abacus.co.uk","avatar":"https://gravatar.com/avatar/717865f1e9a9197ec082b9f6a12e048210a9da06878e47f165b470c43a9e9175?d=mp&s=160"},"body":"Signed-off-by: Mike Ralphson \n---\n Documentation/RelNotes-1.5.2.2.txt | 2 +-\n Documentation/RelNotes-1.6.0.2.txt | 2 +-\n Documentation/RelNotes-1.6.1.1.txt | 4 ++--\n Documentation/RelNotes-1.6.1.2.txt | 4 ++--\n 4 files changed, 6 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/RelNotes-1.5.2.2.txt b/Documentation/RelNotes-1.5.2.2.txt\nindex f6393f8..7bfa341 100644\n--- a/Documentation/RelNotes-1.5.2.2.txt\n+++ b/Documentation/RelNotes-1.5.2.2.txt\n@@ -45,7 +45,7 @@ Fixes since v1.5.2.1\n correctly when the branch name had slash in it.\n \n - The email address of the user specified with user.email\n- configuration was overriden by EMAIL environment variable.\n+ configuration was overridden by EMAIL environment variable.\n \n - The tree parser did not warn about tree entries with\n nonsense file modes, and assumed they must be blobs.\ndiff --git a/Documentation/RelNotes-1.6.0.2.txt b/Documentation/RelNotes-1.6.0.2.txt\nindex 7a9646f..51b32f5 100644\n--- a/Documentation/RelNotes-1.6.0.2.txt\n+++ b/Documentation/RelNotes-1.6.0.2.txt\n@@ -7,7 +7,7 @@ Fixes since v1.6.0.1\n * Installation on platforms that needs .exe suffix to git-* programs were\n broken in 1.6.0.1.\n \n-* Installation on filesystems without symbolic links support did nto\n+* Installation on filesystems without symbolic links support did not\n work well.\n \n * In-tree documentations and test scripts now use \"git foo\" form to set a\ndiff --git a/Documentation/RelNotes-1.6.1.1.txt b/Documentation/RelNotes-1.6.1.1.txt\nindex 88454c1..8c594ba 100644\n--- a/Documentation/RelNotes-1.6.1.1.txt\n+++ b/Documentation/RelNotes-1.6.1.1.txt\n@@ -41,11 +41,11 @@ Fixes since v1.6.1\n work tree upon delete/modify conflict.\n \n * \"git merge -s recursive\" didn't leave the index unmerged for entries with\n- rename/delete conflictd.\n+ rename/delete conflicts.\n \n * \"git merge -s recursive\" clobbered untracked files in the work tree.\n \n-* \"git mv -k\" with more than one errorneous paths misbehaved.\n+* \"git mv -k\" with more than one erroneous paths misbehaved.\n \n * \"git read-tree -m -u\" hence branch switching incorrectly lost a\n subdirectory in rare cases.\ndiff --git a/Documentation/RelNotes-1.6.1.2.txt b/Documentation/RelNotes-1.6.1.2.txt\nindex 230aa3d..be37cbb 100644\n--- a/Documentation/RelNotes-1.6.1.2.txt\n+++ b/Documentation/RelNotes-1.6.1.2.txt\n@@ -4,8 +4,8 @@ GIT v1.6.1.2 Release Notes\n Fixes since v1.6.1.1\n --------------------\n \n-* The logic for rename detectin in internal diff used by commands like\n- \"git diff\" and \"git blame\" have been optimized to avoid loading the same\n+* The logic for rename detection in internal diff used by commands like\n+ \"git diff\" and \"git blame\" has been optimized to avoid loading the same\n blob repeatedly.\n \n * We did not allow writing out a blob that is larger than 2GB for no good\n-- \n1.6.0.2.229.g1293c.dirty\n"},{"id":"106924","messageId":"1236108562-31469-2-git-send-email-mike@abacus.co.uk","threadId":"18119","inReplyTo":"1236108562-31469-1-git-send-email-mike@abacus.co.uk","subject":"[PATCH] Documentation: Expand a couple of abbreviations","fromName":"Mike Ralphson","fromEmail":"mike@abacus.co.uk","sentAt":"2009-03-03T19:29:21Z","receivedAt":"2009-03-03T19:29:21Z","isPatch":true,"sender":{"key":"mike@abacus.co.uk","avatar":"https://gravatar.com/avatar/717865f1e9a9197ec082b9f6a12e048210a9da06878e47f165b470c43a9e9175?d=mp&s=160"},"body":"These may not be obvious to non-native English speakers\n\nSigned-off-by: Mike Ralphson \n---\n Documentation/git-am.txt | 2 +-\n Documentation/gitk.txt | 2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-am.txt b/Documentation/git-am.txt\nindex ff307eb..75081d9 100644\n--- a/Documentation/git-am.txt\n+++ b/Documentation/git-am.txt\n@@ -121,7 +121,7 @@ the commit, after stripping common prefix \"[PATCH ]\".\n It is supposed to describe what the commit is about concisely as\n a one line text.\n \n-The body of the message (iow, after a blank line that terminates\n+The body of the message (in other words, after a blank line that terminates\n RFC2822 headers) can begin with \"Subject: \" and \"From: \" lines\n that are different from those of the mail header, to override\n the values of these fields.\ndiff --git a/Documentation/gitk.txt b/Documentation/gitk.txt\nindex bd005bc..cf465cb 100644\n--- a/Documentation/gitk.txt\n+++ b/Documentation/gitk.txt\n@@ -74,7 +74,7 @@ frequently used options.\n ...::\n \n \tLimit commits to the ones touching files in the given paths. Note, to\n-\tavoid ambiguity wrt. revision names use \"--\" to separate the paths\n+\tavoid ambiguity with respect to revision names use \"--\" to separate the paths\n \tfrom any preceding options.\n \n Examples\n-- \n1.6.0.2.229.g1293c.dirty\n"},{"id":"106922","messageId":"1236108562-31469-3-git-send-email-mike@abacus.co.uk","threadId":"18119","inReplyTo":"1236108562-31469-2-git-send-email-mike@abacus.co.uk","subject":"[PATCH] Documentation: Typo / spelling / formatting fixes","fromName":"Mike Ralphson","fromEmail":"mike@abacus.co.uk","sentAt":"2009-03-03T19:29:22Z","receivedAt":"2009-03-03T19:29:22Z","isPatch":true,"sender":{"key":"mike@abacus.co.uk","avatar":"https://gravatar.com/avatar/717865f1e9a9197ec082b9f6a12e048210a9da06878e47f165b470c43a9e9175?d=mp&s=160"},"body":"Signed-off-by: Mike Ralphson \n---\n Documentation/howto/revert-a-faulty-merge.txt | 4 ++--\n Documentation/howto/setup-git-server-over-http.txt | 2 +-\n Documentation/technical/api-strbuf.txt | 2 +-\n 3 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/howto/revert-a-faulty-merge.txt b/Documentation/howto/revert-a-faulty-merge.txt\nindex 39b1da4..3b4a390 100644\n--- a/Documentation/howto/revert-a-faulty-merge.txt\n+++ b/Documentation/howto/revert-a-faulty-merge.txt\n@@ -39,7 +39,7 @@ Such a \"revert\" of a merge can be made with:\n \n $ git revert -m 1 M\n \n-After the develpers of the side branch fixes their mistakes, the history\n+After the developers of the side branch fix their mistakes, the history\n may look like this:\n \n ---o---o---o---M---x---x---W---x\n@@ -116,7 +116,7 @@ If you reverted the revert in such a case as in the previous example:\n \t / \\ /\n ---A---B A'--B'--C'\n \n-where Y is the revert of W, A' and B'are rerolled A and B, and there may\n+where Y is the revert of W, A' and B' are rerolled A and B, and there may\n also be a further fix-up C' on the side branch. \"diff Y^..Y\" is similar\n to \"diff -R W^..W\" (which in turn means it is similar to \"diff M^..M\"),\n and \"diff A'^..C'\" by definition would be similar but different from that,\ndiff --git a/Documentation/howto/setup-git-server-over-http.txt b/Documentation/howto/setup-git-server-over-http.txt\nindex 4032748..622ee5c 100644\n--- a/Documentation/howto/setup-git-server-over-http.txt\n+++ b/Documentation/howto/setup-git-server-over-http.txt\n@@ -143,7 +143,7 @@ Then, add something like this to your httpd.conf\n Require valid-user\n \n \n- Debian automatically reads all files under /etc/apach2/conf.d.\n+ Debian automatically reads all files under /etc/apache2/conf.d.\n \n The password file can be somewhere else, but it has to be readable by\n Apache and preferably not readable by the world.\ndiff --git a/Documentation/technical/api-strbuf.txt b/Documentation/technical/api-strbuf.txt\nindex ac56d1c..7438149 100644\n--- a/Documentation/technical/api-strbuf.txt\n+++ b/Documentation/technical/api-strbuf.txt\n@@ -222,7 +222,7 @@ which can be used by the programmer of the callback as she sees fit.\n \n \tRead a given size of data from a FILE* pointer to the buffer.\n +\n-NOTE: The buffer is rewinded if the read fails. If -1 is returned,\n+NOTE: The buffer is rewound if the read fails. If -1 is returned,\n `errno` must be consulted, like you would do for `read(3)`.\n `strbuf_read()`, `strbuf_read_file()` and `strbuf_getline()` has the\n same behaviour as well.\n-- \n1.6.0.2.229.g1293c.dirty\n"}]}