Documentation: Typo / spelling / formatting fixes

Signed-off-by: Mike Ralphson <mike@abacus.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Mike Ralphson committed Mar 3, 2009 at 19:29 UTC a1070d4cbbf1002cc0b01afc3de06382deb0511a

3 files changed +4 -4

Documentation/howto/revert-a-faulty-merge.txt

+2 -2

@@ -39,7 +39,7 @@ Such a "revert" of a merge can be made with:

40 $ git revert -m 1 M

42 -After the develpers of the side branch fixes their mistakes, the history

42 +After the developers of the side branch fix their mistakes, the history

43 may look like this:

45 ---o---o---o---M---x---x---W---x

@@ -116,7 +116,7 @@ If you reverted the revert in such a case as in the previous example:

116 / \ /

117 ---A---B A'--B'--C'

118

119 -where Y is the revert of W, A' and B'are rerolled A and B, and there may

119 +where Y is the revert of W, A' and B' are rerolled A and B, and there may

120 also be a further fix-up C' on the side branch. "diff Y^..Y" is similar

121 to "diff -R W^..W" (which in turn means it is similar to "diff M^..M"),

122 and "diff A'^..C'" by definition would be similar but different from that,

Documentation/howto/setup-git-server-over-http.txt

+1 -1

@@ -143,7 +143,7 @@ Then, add something like this to your httpd.conf

143 Require valid-user

144 </Location>

145

146 - Debian automatically reads all files under /etc/apach2/conf.d.

146 + Debian automatically reads all files under /etc/apache2/conf.d.

147

148 The password file can be somewhere else, but it has to be readable by

149 Apache and preferably not readable by the world.

Documentation/technical/api-strbuf.txt

+1 -1

@@ -222,7 +222,7 @@ which can be used by the programmer of the callback as she sees fit.

222

223 Read a given size of data from a FILE* pointer to the buffer.

224 +

225 -NOTE: The buffer is rewinded if the read fails. If -1 is returned,

225 +NOTE: The buffer is rewound if the read fails. If -1 is returned,

226 `errno` must be consulted, like you would do for `read(3)`.

227 `strbuf_read()`, `strbuf_read_file()` and `strbuf_getline()` has the

228 same behaviour as well.