Documentation: spelling and grammar fixes
Signed-off-by: Ville Skyttä <ville.skytta@iki.fi> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ville Skyttä committed
Jun 22, 2018 at 09:50 UTC
928f0ab4bae61954c27a77794d80c2332c8e816c
13 files changed
+15
-15
Documentation/SubmittingPatches
+2
-2
@@ -298,7 +298,7 @@ smaller project it is a good discipline to follow it.
298
299
The sign-off is a simple line at the end of the explanation for
300
the patch, which certifies that you wrote it or otherwise have
301
-the right to pass it on as a open-source patch. The rules are
301
+the right to pass it on as an open-source patch. The rules are
302
pretty simple: if you can certify the below D-C-O:
303
304
[[dco]]
@@ -403,7 +403,7 @@ don't demand). +git log -p {litdd} _$area_you_are_modifying_+ would
403
help you find out who they are.
404
405
. You get comments and suggestions for improvements. You may
406
- even get them in a "on top of your change" patch form.
406
+ even get them in an "on top of your change" patch form.
407
408
. Polish, refine, and re-send to the list and the people who
409
spend their time to improve your patch. Go back to step (2).
Documentation/config.txt
+1
-1
@@ -354,7 +354,7 @@ advice.*::
354
Advice on what to do when you've accidentally added one
355
git repo inside of another.
356
ignoredHook::
357
- Advice shown if an hook is ignored because the hook is not
357
+ Advice shown if a hook is ignored because the hook is not
358
set as executable.
359
waitingForEditor::
360
Print a message to the terminal whenever Git is waiting for
Documentation/git-bisect-lk2009.txt
+1
-1
@@ -1103,7 +1103,7 @@ _____________
1103
Combining test suites, git bisect and other systems together
1104
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1105
1106
-We have seen that test suites an git bisect are very powerful when
1106
+We have seen that test suites and git bisect are very powerful when
1107
used together. It can be even more powerful if you can combine them
1108
with other systems.
1109
Documentation/git-imap-send.txt
+2
-2
@@ -68,8 +68,8 @@ imap.tunnel::
68
to the server. Required when imap.host is not set.
69
70
imap.host::
71
- A URL identifying the server. Use a `imap://` prefix for non-secure
72
- connections and a `imaps://` prefix for secure connections.
71
+ A URL identifying the server. Use an `imap://` prefix for non-secure
72
+ connections and an `imaps://` prefix for secure connections.
73
Ignored when imap.tunnel is set, but required otherwise.
74
75
imap.user::
Documentation/git-notes.txt
+1
-1
@@ -199,7 +199,7 @@ OPTIONS
199
.git/NOTES_MERGE_REF symref is updated to the resulting commit.
200
201
--abort::
202
- Abort/reset a in-progress 'git notes merge', i.e. a notes merge
202
+ Abort/reset an in-progress 'git notes merge', i.e. a notes merge
203
with conflicts. This simply removes all files related to the
204
notes merge.
205
Documentation/git-status.txt
+1
-1
@@ -106,7 +106,7 @@ It is optional: it defaults to 'traditional'.
106
The possible options are:
107
+
108
- 'traditional' - Shows ignored files and directories, unless
109
- --untracked-files=all is specifed, in which case
109
+ --untracked-files=all is specified, in which case
110
individual files in ignored directories are
111
displayed.
112
- 'no' - Show no ignored files.
Documentation/git-svn.txt
+1
-1
@@ -452,7 +452,7 @@ Any other arguments are passed directly to 'git log'
452
453
'commit-diff'::
454
Commits the diff of two tree-ish arguments from the
455
- command-line. This command does not rely on being inside an `git svn
455
+ command-line. This command does not rely on being inside a `git svn
456
init`-ed repository. This command takes three arguments, (a) the
457
original tree to diff against, (b) the new tree result, (c) the
458
URL of the target Subversion repository. The final argument
Documentation/giteveryday.txt
+1
-1
@@ -244,7 +244,7 @@ commands in addition to the ones needed by participants.
244
245
This section can also be used by those who respond to `git
246
request-pull` or pull-request on GitHub (www.github.com) to
247
-integrate the work of others into their history. An sub-area
247
+integrate the work of others into their history. A sub-area
248
lieutenant for a repository will act both as a participant and
249
as an integrator.
250
Documentation/gitsubmodules.txt
+1
-1
@@ -194,7 +194,7 @@ In the above config only the submodule 'bar' and 'baz' are active,
194
195
Note that (c) is a historical artefact and will be ignored if the
196
(a) and (b) specify that the submodule is not active. In other words,
197
-if we have an `submodule.<name>.active` set to `false` or if the
197
+if we have a `submodule.<name>.active` set to `false` or if the
198
submodule's path is excluded in the pathspec in `submodule.active`, the
199
url doesn't matter whether it is present or not. This is illustrated in
200
the example that follows.
Documentation/glossary-content.txt
+1
-1
@@ -334,7 +334,7 @@ The optional colon that terminates the "magic signature" can be
334
omitted if the pattern begins with a character that does not belong to
335
"magic signature" symbol set and is not a colon.
336
+
337
-In the long form, the leading colon `:` is followed by a open
337
+In the long form, the leading colon `:` is followed by an open
338
parenthesis `(`, a comma-separated list of zero or more "magic words",
339
and a close parentheses `)`, and the remainder is the pattern to match
340
against the path.
Documentation/technical/api-directory-listing.txt
+1
-1
@@ -54,7 +54,7 @@ The notable options are:
54
this case, the contents are returned as individual entries.
55
+
56
If this is set, files and directories that explicitly match an ignore
57
-pattern are reported. Implicity ignored directories (directories that
57
+pattern are reported. Implicitly ignored directories (directories that
58
do not match an ignore pattern, but whose contents are all ignored)
59
are not reported, instead all of the contents are reported.
60
Documentation/technical/api-gitattributes.txt
+1
-1
@@ -146,7 +146,7 @@ To get the values of all attributes associated with a file:
146
147
* Iterate over the `attr_check.items[]` array to examine
148
the attribute names and values. The name of the attribute
149
- described by a `attr_check.items[]` object can be retrieved via
149
+ described by an `attr_check.items[]` object can be retrieved via
150
`git_attr_name(check->items[i].attr)`. (Please note that no items
151
will be returned for unset attributes, so `ATTR_UNSET()` will return
152
false for all returned `attr_check.items[]` objects.)
Documentation/technical/commit-graph-format.txt
+1
-1
@@ -18,7 +18,7 @@ metadata, including:
18
the graph file.
19
20
These positional references are stored as unsigned 32-bit integers
21
-corresponding to the array position withing the list of commit OIDs. We
21
+corresponding to the array position within the list of commit OIDs. We
22
use the most-significant bit for special purposes, so we can store at most
23
(1 << 31) - 1 (around 2 billion) commits.
24