Documentation: wording fixes in the user manual and glossary

diff --git a/t/t7104-reset-hard.sh b/t/t7104-reset-hard.sh
index f136ee7bb5300966c0c3c9d2250dc81763db9feb..16faa0781373bb3769ce9f0fa0a09be8c2b2ed81 100755 (executable)
--- a/t/t7104-reset-hard.sh
+++ b/t/t7104-reset-hard.sh
@@ -33,7 +33,7 @@ test_expect_success 'reset --hard should restore unmerged ones' '
 
 '
 
-test_expect_success 'reset --hard did not corrupt index nor cached-tree' '
+test_expect_success 'reset --hard did not corrupt index or cached-tree' '
 
        T=$(git write-tree) &&
        rm -f .git/index &&