From: Ralf Wildenhues Date: Mon, 7 Jan 2008 21:43:27 +0000 (+0100) Subject: Documentation: typofix X-Git-Tag: v1.5.4-rc3~20 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f1cdcc70dc654a5364871a8712c073a610b6027b;p=git.git Documentation: typofix Signed-off-by: Ralf Wildenhues Signed-off-by: Junio C Hamano --- diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt index a4703cd7c..7ee5ce386 100644 --- a/Documentation/gitcli.txt +++ b/Documentation/gitcli.txt @@ -95,7 +95,7 @@ $ git foo -oArg $ git foo -o Arg ---------------------------- -However, this is *NOT* allowed for switches with an optionnal value, where the +However, this is *NOT* allowed for switches with an optional value, where the 'sticked' form must be used: ---------------------------- $ git describe --abbrev HEAD # correct diff --git a/Documentation/technical/api-diff.txt b/Documentation/technical/api-diff.txt index 822609bcd..83b007e70 100644 --- a/Documentation/technical/api-diff.txt +++ b/Documentation/technical/api-diff.txt @@ -102,13 +102,13 @@ Notable members are: and copies. `abbrev`:: - Number of hexdigits to abbrevate raw format output to. + Number of hexdigits to abbreviate raw format output to. `pickaxe`:: A constant string (can and typically does contain newlines to look for a block of text, not just a single line) to filter out the filepairs that do not change the number of strings contained - in its preimage and postmage of the diff_queue. + in its preimage and postimage of the diff_queue. `flags`:: This is mostly a collection of boolean options that affects the @@ -149,7 +149,7 @@ REVERSE_DIFF;; EXIT_WITH_STATUS;; For communication between the calling program and the options - parser; tell the calling program to signal the presense of + parser; tell the calling program to signal the presence of difference using program exit code. HAS_CHANGES;; diff --git a/Documentation/technical/pack-format.txt b/Documentation/technical/pack-format.txt index a80baa438..aa87756a5 100644 --- a/Documentation/technical/pack-format.txt +++ b/Documentation/technical/pack-format.txt @@ -125,7 +125,7 @@ Pack file entry: <+ - A table of 4-byte CRC32 values of the packed object data. This is new in v2 so compressed data can be copied directly - from pack to pack during repacking withough undetected + from pack to pack during repacking without undetected data corruption. - A table of 4-byte offset values (in network byte order).