fix doc typos
PATCH 1/1 fix doc typos
--- Documentation/RelNotes-1.5.3.3.txt | 2 +- Documentation/git-config.txt | 2 +- Documentation/git-cvsserver.txt | 4 ++-- Documentation/git-rev-parse.txt | 6 +++--- Documentation/technical/racy-git.txt | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-)
Documentation/RelNotes-1.5.3.3.txt +1 -1
@@ -12,7 +12,7 @@ Fixes since v1.5.3.2 * The default shell on some FreeBSD did not execute the argument parsing code correctly and made git unusable. - * git-svn incorrectly spawned pager even when the user user + * git-svn incorrectly spawned pager even when the user explicitly asked not to. * sample post-receive hook overquoted the envelope sender
Documentation/git-config.txt +1 -1
@@ -130,7 +130,7 @@ See also <<FILES>>. -z, --null:: For all options that output values and/or keys, always - end values with with the null character (instead of a + end values with the null character (instead of a newline). Use newline instead as a delimiter between key and value. This allows for secure parsing of the output without getting confused e.g. by values that
Documentation/git-cvsserver.txt +2 -2
@@ -204,7 +204,7 @@ about `DBI->connect()`. gitcvs.dbname:: Database name. The exact meaning depends on the - used database driver, for SQLite this is a filename. + selected database driver, for SQLite this is a filename. Supports variable substitution (see below). May not contain semicolons (`;`). Default: '%Ggitcvs.%m.sqlite'
@@ -215,7 +215,7 @@ gitcvs.dbdriver:: with 'DBD::SQLite', reported to work with 'DBD::Pg', and reported *not* to work with 'DBD::mysql'. Please regard this as an experimental feature. May not - contain double colons (`:`). + contain colons (`:`). Default: 'SQLite' gitcvs.dbuser::
Documentation/git-rev-parse.txt +3 -3
@@ -229,13 +229,13 @@ blobs contained in a commit. * A colon, optionally followed by a stage number (0 to 3) and a colon, followed by a path; this names a blob object in the index at the given path. Missing stage number (and the colon - that follows it) names an stage 0 entry. During a merge, stage + that follows it) names a stage 0 entry. During a merge, stage 1 is the common ancestor, stage 2 is the target branch's version (typically the current branch), and stage 3 is the version from the branch being merged. Here is an illustration, by Jon Loeliger. Both node B and C are -a commit parents of commit node A. Parent commits are ordered +commit parents of commit node A. Parent commits are ordered left-to-right. G H I J
@@ -291,7 +291,7 @@ and its parent commits exists. `r1{caret}@` notation means all parents of `r1`. `r1{caret}!` includes commit `r1` but excludes its all parents. -Here are a handful examples: +Here are a handful of examples: D G H D 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, however, the initial computation of all object names in the index takes more than one second, and the index file is written out after all that happens. Therefore the timestamp of the -index file will be more than one seconds later than the the +index file will be more than one seconds later than the youngest file in the working tree. This means that in these cases there actually will not be any racily clean entry in the resulting index.
--
1.5.4.rc5.1.ge6bfe
Documentation/git-rev-parse.txt blobs contained in a commit. · line 238
Quoted 3 lines · Jim Meyering
Here is an illustration, by Jon Loeliger. Both node B and C are
Documentation/git-rev-parse.txt +1
-1-a commit parents of commit node A. Parent commits are ordered +commit parents of commit node A. Parent commits are ordered
wouldn't this be "Both commit node B and C are parents of commit node A."?
- VMiklos
Quoted 6 lines · Miklos Vajna
Documentation/git-rev-parse.txt blobs contained in a commit. · line 238
Quoted 3 lines · Jim Meyering
Here is an illustration, by Jon Loeliger. Both node B and C are
Documentation/git-rev-parse.txt +1
-1-a commit parents of commit node A. Parent commits are ordered +commit parents of commit node A. Parent commits are orderedwouldn't this be "Both commit node B and C are parents of commit node A."?
That does sound better.
While you're word-smithing, how about s/node B/nodes B/, too:
"Both commit nodes B and C are parents of commit node A."
Send a patch.
PATCH 1/1 git rev-parse manpage: spelling fix
---
Quoted 1 line · Jim Meyering
Send a patch.
here it is.
Documentation/git-rev-parse.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
Documentation/git-rev-parse.txt +2 -2
@@ -234,8 +234,8 @@ blobs contained in a commit. (typically the current branch), and stage 3 is the version from the branch being merged. -Here is an illustration, by Jon Loeliger. Both node B and C are -commit parents of commit node A. Parent commits are ordered +Here is an illustration, by Jon Loeliger. Both commit nodes B +and C are parents of commit node A. Parent commits are ordered left-to-right. G H I J
Signature · 1 line
1.5.4.rc5-dirty
PATCH 1/1 Documentation: Fix typo
In reply to Jim Meyering---
Beside the obvious s/if/is/ typo, is it easier to read this way? It might be my ears but "is run" sounds strange to me.
jlh
Documentation/git-cvsserver.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Documentation/git-cvsserver.txt +1 -1
@@ -183,7 +183,7 @@ access method and requested operation. That means that even if you offer only read access (e.g. by using the pserver method), git-cvsserver should have write access to the database to work reliably (otherwise you need to make sure -that the database if up-to-date all the time git-cvsserver is run). +that the database is up-to-date any time git-cvsserver is executed). By default it uses SQLite databases in the git directory, named `gitcvs.<module_name>.sqlite`. Note that the SQLite backend creates
Signature · 1 line
1.5.3.8