fix doc typos
Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jim Meyering committed
Jan 29, 2008 at 20:38 UTC
a5d86f7406ecda78b44faf9ab50b7c6e419dba9d
5 files changed
+8
-8
Documentation/RelNotes-1.5.3.3.txt
+1
-1
@@ -12,7 +12,7 @@ Fixes since v1.5.3.2
12
* The default shell on some FreeBSD did not execute the
13
argument parsing code correctly and made git unusable.
14
15
- * git-svn incorrectly spawned pager even when the user user
15
+ * git-svn incorrectly spawned pager even when the user
16
explicitly asked not to.
17
18
* sample post-receive hook overquoted the envelope sender
Documentation/git-config.txt
+1
-1
@@ -130,7 +130,7 @@ See also <<FILES>>.
130
131
-z, --null::
132
For all options that output values and/or keys, always
133
- end values with with the null character (instead of a
133
+ end values with the null character (instead of a
134
newline). Use newline instead as a delimiter between
135
key and value. This allows for secure parsing of the
136
output without getting confused e.g. by values that
Documentation/git-cvsserver.txt
+2
-2
@@ -204,7 +204,7 @@ about `DBI->connect()`.
204
205
gitcvs.dbname::
206
Database name. The exact meaning depends on the
207
- used database driver, for SQLite this is a filename.
207
+ selected database driver, for SQLite this is a filename.
208
Supports variable substitution (see below). May
209
not contain semicolons (`;`).
210
Default: '%Ggitcvs.%m.sqlite'
@@ -215,7 +215,7 @@ gitcvs.dbdriver::
215
with 'DBD::SQLite', reported to work with
216
'DBD::Pg', and reported *not* to work with 'DBD::mysql'.
217
Please regard this as an experimental feature. May not
218
- contain double colons (`:`).
218
+ contain colons (`:`).
219
Default: 'SQLite'
220
221
gitcvs.dbuser::
Documentation/git-rev-parse.txt
+3
-3
@@ -229,13 +229,13 @@ blobs contained in a commit.
229
* A colon, optionally followed by a stage number (0 to 3) and a
230
colon, followed by a path; this names a blob object in the
231
index at the given path. Missing stage number (and the colon
232
- that follows it) names an stage 0 entry. During a merge, stage
232
+ that follows it) names a stage 0 entry. During a merge, stage
233
1 is the common ancestor, stage 2 is the target branch's version
234
(typically the current branch), and stage 3 is the version from
235
the branch being merged.
236
237
Here is an illustration, by Jon Loeliger. Both node B and C are
238
-a commit parents of commit node A. Parent commits are ordered
238
+commit parents of commit node A. Parent commits are ordered
239
left-to-right.
240
241
G H I J
@@ -291,7 +291,7 @@ and its parent commits exists. `r1{caret}@` notation means all
291
parents of `r1`. `r1{caret}!` includes commit `r1` but excludes
292
its all parents.
293
294
-Here are a handful examples:
294
+Here are a handful of examples:
295
296
D G H D
297
D F G H I J D F
Documentation/technical/racy-git.txt
+1
-1
@@ -184,7 +184,7 @@ In a large project where raciness avoidance cost really matters,
184
however, the initial computation of all object names in the
185
index takes more than one second, and the index file is written
186
out after all that happens. Therefore the timestamp of the
187
-index file will be more than one seconds later than the the
187
+index file will be more than one seconds later than the
188
youngest file in the working tree. This means that in these
189
cases there actually will not be any racily clean entry in
190
the resulting index.