Merge branch 'ab/doc-misc-typofixes'

Typofixes.

* ab/doc-misc-typofixes:
doc: fix typos in man pages

diff --combined Documentation/gitattributes.txt
index fa6454f10589b459b23e2604f5a56f8f6cbbec55,908d9a3009fae7fc5e92fb62a08b9852890d05fe..4fb20cd0e963b6cf52c07c6ae7492adbf35f6cbf
--- 1/Documentation/gitattributes.txt
--- 2/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@@ -18,7 -18,7 +18,7 @@@ A `gitattributes` file is a simple tex
  
  Each line in `gitattributes` file is of form:
  
 -      pattern attr1 attr2 ...
 +      pattern attr1 attr2 ...
  
  That is, a pattern followed by an attributes list,
  separated by whitespaces. Leading and trailing whitespaces are
@@@ -314,8 -314,8 +314,8 @@@ stored as UTF-8 internally. A client wi
  support will checkout `foo.ps1` as UTF-8 encoded file. This will
  typically cause trouble for the users of this file.
  +
- If a Git client, that does not support the `working-tree-encoding`
- attribute, adds a new file `bar.ps1`, then `bar.ps1` will be
+ If a Git client that does not support the `working-tree-encoding`
+ attribute adds a new file `bar.ps1`, then `bar.ps1` will be
  stored "as-is" internally (in this example probably as UTF-16).
  A client with `working-tree-encoding` support will interpret the
  internal contents as UTF-8 and try to convert it to UTF-16 on checkout.
@@@ -346,7 -346,7 +346,7 @@@ automatic line ending conversion based 
  
  Use the following attributes if your '*.ps1' files are UTF-16 little
  endian encoded without BOM and you want Git to use Windows line endings
 -in the working directory (use `UTF-16-LE-BOM` instead of `UTF-16LE` if
 +in the working directory (use `UTF-16LE-BOM` instead of `UTF-16LE` if
  you want UTF-16 little endian with BOM).
  Please note, it is highly recommended to
  explicitly define the line endings with `eol` if the `working-tree-encoding`