[PATCH] Documentation: Fix misspellings

[PATCH] Documentation: Fix misspellings

[Leila Muhtasib]

Signed-off-by: Leila Muhtasib <muhtasib@gmail.com>
---
 Documentation/diff-options.txt  |    2 +-
 Documentation/git-submodule.txt |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 6cfedd8..cf4b216 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -59,7 +59,7 @@ endif::git-format-patch[]
 	Generate a diffstat. By default, as much space as necessary
 	will be used for the filename part, and the rest for the graph
 	part. Maximum width defaults to terminal width, or 80 columns
-	if not connected to a terminal, and can be overriden by
+	if not connected to a terminal, and can be overridden by
 	`<width>`. The width of the filename part can be limited by
 	giving another width `<name-width>` after a comma. The width
 	of the graph part can be limited by using
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index 9e488c0..fbbbcb2 100644
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -140,7 +140,7 @@ update::
 	checkout the commit specified in the index of the containing repository.
 	This will make the submodules HEAD be detached unless `--rebase` or
 	`--merge` is specified or the key `submodule.$name.update` is set to
-	`rebase`, `merge` or `none`. `none` can be overriden by specifying
+	`rebase`, `merge` or `none`. `none` can be overridden by specifying
 	`--checkout`.
 +
 If the submodule is not yet initialized, and you just want to use the
-- 
1.7.7.5 (Apple Git-26)

Re: [PATCH] Documentation: Fix misspellings

[Junio C Hamano]

Thanks; "git grep overriden" finds a few more hits in t/, which we
may also want to fix.

Re: [PATCH] Documentation: Fix misspellings

[Leila]

Ok, I'll fix them too. Should I submit another patch or just update
the correct one?

On Fri, Jun 22, 2012 at 3:37 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Thanks; "git grep overriden" finds a few more hits in t/, which we
> may also want to fix.

Re: [PATCH] Documentation: Fix misspellings

[Leila]

I meant to type "current one" instead of "correct one".

I just submitted an updated patch that contains them all.

On Fri, Jun 22, 2012 at 3:43 PM, Leila <muhtasib@gmail.com> wrote:
> Ok, I'll fix them too. Should I submit another patch or just update
> the correct one?
>
> On Fri, Jun 22, 2012 at 3:37 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> Thanks; "git grep overriden" finds a few more hits in t/, which we
>> may also want to fix.