aboutsummaryrefslogtreecommitdiff
path: root/Documentation/user-manual.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-06-16 01:22:10 -0700
committerJunio C Hamano <gitster@pobox.com>2007-06-16 01:22:10 -0700
commit5bd148bfe8a4f2df8487e029cd4ee6809bc4c963 (patch)
tree1960d9d9011cb728631b357c928745b42d096eda /Documentation/user-manual.txt
parentc5f71ad09994b46d80878ce72d1ca6f59935d952 (diff)
parentc7c84859ad586ae5670224e1abc4f846f7c3a9ae (diff)
downloadgit-5bd148bfe8a4f2df8487e029cd4ee6809bc4c963.tar.gz
git-5bd148bfe8a4f2df8487e029cd4ee6809bc4c963.tar.xz
Merge branch 'maint' to sync with GIT 1.5.2.2
Diffstat (limited to 'Documentation/user-manual.txt')
-rw-r--r--Documentation/user-manual.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 0bfa21b3d..ff7c71d4f 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -2757,8 +2757,8 @@ As a result, the general consistency of an object can always be tested
independently of the contents or the type of the object: all objects can
be validated by verifying that (a) their hashes match the content of the
file and (b) the object successfully inflates to a stream of bytes that
-forms a sequence of <ascii type without space> + <space> + <ascii decimal
-size> + <byte\0> + <binary object data>.
+forms a sequence of <ascii type without space> {plus} <space> {plus} <ascii decimal
+size> {plus} <byte\0> {plus} <binary object data>.
The structured objects can further have their structure and
connectivity to other objects verified. This is generally done with