Documentation: spelling fixes
[jc: with wording changes from Jonathan Nieder] Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ville Skyttä committed
Jul 20, 2010 at 00:17 UTC
6b677a28ffded042da18e3aefbb01d28e4a1b11b
9 files changed
+18
-16
Documentation/config.txt
+7
-5
@@ -128,7 +128,7 @@ advice.*::
128
when writing commit messages. Default: true.
129
commitBeforeMerge::
130
Advice shown when linkgit:git-merge[1] refuses to
131
- merge to avoid overwritting local changes.
131
+ merge to avoid overwriting local changes.
132
Default: true.
133
resolveConflict::
134
Advices shown by various commands when conflicts
@@ -418,7 +418,7 @@ Common unit suffixes of 'k', 'm', or 'g' are supported.
418
419
core.deltaBaseCacheLimit::
420
Maximum number of bytes to reserve for caching base objects
421
- that multiple deltafied objects reference. By storing the
421
+ that may be referenced by multiple deltified objects. By storing the
422
entire decompressed base objects in a cache Git is able
423
to avoid unpacking and decompressing frequently used base
424
objects multiple times.
@@ -563,7 +563,7 @@ not necessarily be the current directory.
563
am.keepcr::
564
If true, git-am will call git-mailsplit for patches in mbox format
565
with parameter '--keep-cr'. In this case git-mailsplit will
566
- not remove `\r` from lines ending with `\r\n`. Can be overrriden
566
+ not remove `\r` from lines ending with `\r\n`. Can be overridden
567
by giving '--no-keep-cr' from the command line.
568
See linkgit:git-am[1], linkgit:git-mailsplit[1].
569
@@ -1002,7 +1002,7 @@ gitcvs.usecrlfattr::
1002
If true, the server will look up the end-of-line conversion
1003
attributes for files to determine the '-k' modes to use. If
1004
the attributes force git to treat a file as text,
1005
- the '-k' mode will be left blank so cvs clients will
1005
+ the '-k' mode will be left blank so CVS clients will
1006
treat it as text. If they suppress text conversion, the file
1007
will be set with '-kb' mode, which suppresses any newline munging
1008
the client might otherwise do. If the attributes do not allow
@@ -1275,7 +1275,9 @@ instaweb.local::
1275
be bound to the local IP (127.0.0.1).
1276
1277
instaweb.modulepath::
1278
- The module path for an apache httpd used by linkgit:git-instaweb[1].
1278
+ The default module path for linkgit:git-instaweb[1] to use
1279
+ instead of /usr/lib/apache2/modules. Only used if httpd
1280
+ is Apache.
1281
1282
instaweb.port::
1283
The port number to bind the gitweb httpd to. See
Documentation/git-bisect-lk2009.txt
+1
-1
@@ -971,7 +971,7 @@ logical change in each commit.
971
The smaller the changes in your commit, the most effective "git
972
bisect" will be. And you will probably need "git bisect" less in the
973
first place, as small changes are easier to review even if they are
974
-only reviewed by the commiter.
974
+only reviewed by the committer.
975
976
Another good idea is to have good commit messages. They can be very
977
helpful to understand why some changes were made.
Documentation/git-commit.txt
+2
-2
@@ -130,11 +130,11 @@ OPTIONS
130
Usually recording a commit that has the exact same tree as its
131
sole parent commit is a mistake, and the command prevents you
132
from making such a commit. This option bypasses the safety, and
133
- is primarily for use by foreign scm interface scripts.
133
+ is primarily for use by foreign SCM interface scripts.
134
135
--allow-empty-message::
136
Like --allow-empty this command is primarily for use by foreign
137
- scm interface scripts. It allows you to create a commit with an
137
+ SCM interface scripts. It allows you to create a commit with an
138
empty commit message without using plumbing commands like
139
linkgit:git-commit-tree[1].
140
Documentation/git-cvsimport.txt
+2
-2
@@ -188,7 +188,7 @@ ISSUES
188
------
189
Problems related to timestamps:
190
191
- * If timestamps of commits in the cvs repository are not stable enough
191
+ * If timestamps of commits in the CVS repository are not stable enough
192
to be used for ordering commits changes may show up in the wrong
193
order.
194
* If any files were ever "cvs import"ed more than once (e.g., import of
@@ -201,7 +201,7 @@ Problems related to branches:
201
202
* Branches on which no commits have been made are not imported.
203
* All files from the branching point are added to a branch even if
204
- never added in cvs.
204
+ never added in CVS.
205
* This applies to files added to the source branch *after* a daughter
206
branch was created: if previously no commit was made on the daughter
207
branch they will erroneously be added to the daughter branch in git.
Documentation/git-cvsserver.txt
+2
-2
@@ -366,8 +366,8 @@ CRLF Line Ending Conversions
366
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
367
368
By default the server leaves the '-k' mode blank for all files,
369
-which causes the cvs client to treat them as a text files, subject
370
-to crlf conversion on some platforms.
369
+which causes the CVS client to treat them as a text files, subject
370
+to end-of-line conversion on some platforms.
371
372
You can make the server use the end-of-line conversion attributes to
373
set the '-k' modes for files by setting the `gitcvs.usecrlfattr`
Documentation/git-hash-object.txt
+1
-1
@@ -49,7 +49,7 @@ OPTIONS
49
50
--no-filters::
51
Hash the contents as is, ignoring any input filter that would
52
- have been chosen by the attributes mechanism, including crlf
52
+ have been chosen by the attributes mechanism, including the end-of-line
53
conversion. If the file is read from standard input then this
54
is always implied, unless the --path option is given.
55
Documentation/git-reset.txt
+1
-1
@@ -355,7 +355,7 @@ Keep changes in working tree while discarding some previous commits::
355
Suppose you are working on something and you commit it, and then you
356
continue working a bit more, but now you think that what you have in
357
your working tree should be in another branch that has nothing to do
358
-with what you commited previously. You can start a new branch and
358
+with what you committed previously. You can start a new branch and
359
reset it while keeping the changes in your work tree.
360
+
361
------------
Documentation/gitrepository-layout.txt
+1
-1
@@ -16,7 +16,7 @@ You may find these things in your git repository (`.git`
16
directory for a repository associated with your working tree, or
17
`<project>.git` directory for a public 'bare' repository. It is
18
also possible to have a working tree where `.git` is a plain
19
-ascii file containing `gitdir: <path>`, i.e. the path to the
19
+ASCII file containing `gitdir: <path>`, i.e. the path to the
20
real git repository).
21
22
objects::
Documentation/urls.txt
+1
-1
@@ -25,7 +25,7 @@ The ssh and git protocols additionally support ~username expansion:
25
- git://host.xz{startsb}:port{endsb}/~{startsb}user{endsb}/path/to/repo.git/
26
- {startsb}user@{endsb}host.xz:/~{startsb}user{endsb}/path/to/repo.git/
27
28
-For local respositories, also supported by git natively, the following
28
+For local repositories, also supported by git natively, the following
29
syntaxes may be used:
30
31
- /path/to/repo.git/