aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/git-cvsimport.txt2
-rw-r--r--Documentation/git-format-patch.txt2
-rw-r--r--contrib/thunderbird-patch-inline/README4
-rw-r--r--gitweb/README2
4 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index d7bab13f6..614e769f4 100644
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -196,7 +196,7 @@ Problems related to tags:
If you suspect that any of these issues may apply to the repository you
want to import consider using these alternative tools which proved to be
-more stable in practise:
+more stable in practice:
* cvs2git (part of cvs2svn), `http://cvs2svn.tigris.org`
* parsecvs, `http://cgit.freedesktop.org/~keithp/parsecvs`
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index eb2fbcff1..5eddca92c 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -194,7 +194,7 @@ CONFIGURATION
-------------
You can specify extra mail header lines to be added to each message
in the repository configuration, new defaults for the subject prefix
-and file suffix, control attachements, and number patches when outputting
+and file suffix, control attachments, and number patches when outputting
more than one.
------------
diff --git a/contrib/thunderbird-patch-inline/README b/contrib/thunderbird-patch-inline/README
index 39f96aa11..000147bbe 100644
--- a/contrib/thunderbird-patch-inline/README
+++ b/contrib/thunderbird-patch-inline/README
@@ -1,12 +1,12 @@
appp.sh is a script that is supposed to be used together with ExternalEditor
-for Mozilla Thundebird. It will let you include patches inline in e-mails
+for Mozilla Thunderbird. It will let you include patches inline in e-mails
in an easy way.
Usage:
- Generate the patch with git format-patch.
- Start writing a new e-mail in Thunderbird.
- Press the external editor button (or Ctrl-E) to run appp.sh
-- Select the previosly generated patch file.
+- Select the previously generated patch file.
- Finish editing the e-mail.
Any text that is entered into the message editor before appp.sh is called
diff --git a/gitweb/README b/gitweb/README
index 8433dd1d4..ccda890c0 100644
--- a/gitweb/README
+++ b/gitweb/README
@@ -206,7 +206,7 @@ not include variables usually directly set during build):
* $fallback_encoding
Gitweb assumes this charset if line contains non-UTF-8 characters.
Fallback decoding is used without error checking, so it can be even
- 'utf-8'. Value mist be valid encodig; see Encoding::Supported(3pm) man
+ 'utf-8'. Value must be valid encoding; see Encoding::Supported(3pm) man
page for a list. By default 'latin1', aka. 'iso-8859-1'.
* @diff_opts
Rename detection options for git-diff and git-diff-tree. By default