{"thread":{"id":"35807","subject":"[PATCH] Documentation: fix typos in man pages","startedAt":"2014-02-05T22:19:43Z","lastAt":"2014-02-05T22:35:40Z","messageCount":2,"participants":["Øystein Walle","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"234343","messageId":"1391638783-10686-1-git-send-email-oystwa@gmail.com","threadId":"35807","inReplyTo":null,"subject":"[PATCH] Documentation: fix typos in man pages","fromName":"Øystein Walle","fromEmail":"oystwa@gmail.com","sentAt":"2014-02-05T22:19:43Z","receivedAt":"2014-02-05T22:19:43Z","isPatch":true,"sender":{"key":"oystwa@gmail.com","avatar":"https://avatars.githubusercontent.com/u/794585?v=4"},"body":"Signed-off-by: Øystein Walle \n---\n\nIn July I sent in some typo fixes but it halted in a discussion on UK\nvs. US English and so forth ($gmane/231331). There were some actual typo\nfixes in there though (in addition to the \"opinionated typo fixes\").\n\nPowering up my old laptop for the first time in months I noticed that I\nhad them idling in a branch, and that incidentally none of them has been\nfixed. Hopefully I've managed to seperate the genuine typo fixes from\nthe rest.\n\n Documentation/git-clone.txt | 2 +-\n Documentation/git-diff.txt | 2 +-\n Documentation/gitcli.txt | 2 +-\n Documentation/githooks.txt | 2 +-\n Documentation/gitweb.conf.txt | 4 ++--\n Documentation/user-manual.txt | 2 +-\n 6 files changed, 7 insertions(+), 7 deletions(-)\n\ndiff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt\nindex 4987857..bf3dac0 100644\n--- a/Documentation/git-clone.txt\n+++ b/Documentation/git-clone.txt\n@@ -208,7 +208,7 @@ objects from the source repository into a pack in the cloned repository.\n --separate-git-dir=::\n \tInstead of placing the cloned repository where it is supposed\n \tto be, place the cloned repository at the specified directory,\n-\tthen make a filesytem-agnostic Git symbolic link to there.\n+\tthen make a filesystem-agnostic Git symbolic link to there.\n \tThe result is Git repository can be separated from working\n \ttree.\n \ndiff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt\nindex 33fbd8c..56fb7e5 100644\n--- a/Documentation/git-diff.txt\n+++ b/Documentation/git-diff.txt\n@@ -44,7 +44,7 @@ two blob objects, or changes between two files on disk.\n \tcommit relative to the named . Typically you\n \twould want comparison with the latest commit, so if you\n \tdo not give , it defaults to HEAD.\n-\tIf HEAD does not exist (e.g. unborned branches) and\n+\tIf HEAD does not exist (e.g. unborn branches) and\n \t is not given, it shows all staged changes.\n \t--staged is a synonym of --cached.\n \ndiff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt\nindex 3f33ca5..1c3e109 100644\n--- a/Documentation/gitcli.txt\n+++ b/Documentation/gitcli.txt\n@@ -28,7 +28,7 @@ arguments. Here are the rules:\n they can be disambiguated by placing `--` between them.\n E.g. `git diff -- HEAD` is, \"I have a file called HEAD in my work\n tree. Please show changes between the version I staged in the index\n- and what I have in the work tree for that file\". not \"show difference\n+ and what I have in the work tree for that file\", not \"show difference\n between the HEAD commit and the work tree as a whole\". You can say\n `git diff HEAD --` to ask for the latter.\n \ndiff --git a/Documentation/githooks.txt b/Documentation/githooks.txt\nindex d48bf4d..d954bf6 100644\n--- a/Documentation/githooks.txt\n+++ b/Documentation/githooks.txt\n@@ -251,7 +251,7 @@ three parameters:\n \n - the name of the ref being updated,\n - the old object name stored in the ref,\n- - and the new objectname to be stored in the ref.\n+ - and the new object name to be stored in the ref.\n \n A zero exit from the update hook allows the ref to be updated.\n Exiting with a non-zero status prevents 'git-receive-pack'\ndiff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.txt\nindex db4154f..952f503 100644\n--- a/Documentation/gitweb.conf.txt\n+++ b/Documentation/gitweb.conf.txt\n@@ -630,13 +630,13 @@ need to set this element to empty list i.e. `[]`.\n \n override::\n \tIf this field has a true value then the given feature is\n-\toverriddable, which means that it can be configured\n+\toverridable, which means that it can be configured\n \t(or enabled/disabled) on a per-repository basis.\n +\n Usually given \"\" is configurable via the `gitweb.`\n config variable in the per-repository Git configuration file.\n +\n-*Note* that no feature is overriddable by default.\n+*Note* that no feature is overridable by default.\n \n sub::\n \tInternal detail of implementation. What is important is that\ndiff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\nindex 248dcab..d4f9804 100644\n--- a/Documentation/user-manual.txt\n+++ b/Documentation/user-manual.txt\n@@ -3795,7 +3795,7 @@ like so:\n $ git update-index filename\n -------------------------------------------------\n \n-but to avoid common mistakes with filename globbing etc, the command\n+but to avoid common mistakes with filename globbing etc., the command\n will not normally add totally new entries or remove old entries,\n i.e. it will normally just update existing cache entries.\n \n-- \n1.8.5\n"},{"id":"234344","messageId":"xmqqk3d91937.fsf@gitster.dls.corp.google.com","threadId":"35807","inReplyTo":"1391638783-10686-1-git-send-email-oystwa@gmail.com","subject":"Re: [PATCH] Documentation: fix typos in man pages","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-02-05T22:35:40Z","receivedAt":"2014-02-05T22:35:40Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Øystein Walle writes:\n\n> Signed-off-by: Øystein Walle \n> ---\n>\n> In July I sent in some typo fixes but it halted in a discussion on UK\n> vs. US English and so forth ($gmane/231331). There were some actual typo\n> fixes in there though (in addition to the \"opinionated typo fixes\").\n>\n> Powering up my old laptop for the first time in months I noticed that I\n> had them idling in a branch, and that incidentally none of them has been\n> fixed. Hopefully I've managed to seperate the genuine typo fixes from\n> the rest.\n\nWonderful.\n\nAll of them looked fine. I however am already deep in today's\nintegration cycle, so it will appear in the public branches\ntomorrow.\n\nThanks.\n"}]}