Skip to content

Commit

Permalink
Documentation: Typo / spelling / formatting fixes
Browse files Browse the repository at this point in the history
Signed-off-by: Mike Ralphson <mike@abacus.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Mike Ralphson authored and Junio C Hamano committed Mar 4, 2009
1 parent 5a4aaaf commit a1070d4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Documentation/howto/revert-a-faulty-merge.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Such a "revert" of a merge can be made with:

$ git revert -m 1 M

After the develpers of the side branch fixes their mistakes, the history
After the developers of the side branch fix their mistakes, the history
may look like this:

---o---o---o---M---x---x---W---x
Expand Down Expand Up @@ -116,7 +116,7 @@ If you reverted the revert in such a case as in the previous example:
/ \ /
---A---B A'--B'--C'

where Y is the revert of W, A' and B'are rerolled A and B, and there may
where Y is the revert of W, A' and B' are rerolled A and B, and there may
also be a further fix-up C' on the side branch. "diff Y^..Y" is similar
to "diff -R W^..W" (which in turn means it is similar to "diff M^..M"),
and "diff A'^..C'" by definition would be similar but different from that,
Expand Down
2 changes: 1 addition & 1 deletion Documentation/howto/setup-git-server-over-http.txt
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ Then, add something like this to your httpd.conf
Require valid-user
</Location>

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

The password file can be somewhere else, but it has to be readable by
Apache and preferably not readable by the world.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/technical/api-strbuf.txt
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ which can be used by the programmer of the callback as she sees fit.

Read a given size of data from a FILE* pointer to the buffer.
+
NOTE: The buffer is rewinded if the read fails. If -1 is returned,
NOTE: The buffer is rewound if the read fails. If -1 is returned,
`errno` must be consulted, like you would do for `read(3)`.
`strbuf_read()`, `strbuf_read_file()` and `strbuf_getline()` has the
same behaviour as well.
Expand Down

0 comments on commit a1070d4

Please sign in to comment.