提交 a1070d4c 编写于 作者: M Mike Ralphson 提交者: Junio C Hamano

Documentation: Typo / spelling / formatting fixes

Signed-off-by: NMike Ralphson <mike@abacus.co.uk>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 5a4aaaf3
......@@ -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
......@@ -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,
......
......@@ -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.
......
......@@ -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.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册