Merge branch 'master' of git://ozlabs.org/~paulus/gitk

diff --git a/Documentation/technical/api-error-handling.txt b/Documentation/technical/api-error-handling.txt
index fc68db126efd93c9c6e6f9bd84588f1c2509d5b7..ceeedd485c9650de33c10f5465189f4f1a69fc82 100644 (file)
--- a/Documentation/technical/api-error-handling.txt
+++ b/Documentation/technical/api-error-handling.txt
@@ -58,7 +58,7 @@ to `die` or `error` as-is.  For example:
        if (ref_transaction_commit(transaction, &err))
                die("%s", err.buf);
 
-The 'err' parameter will be untouched if no error occured, so multiple
+The 'err' parameter will be untouched if no error occurred, so multiple
 function calls can be chained:
 
        t = ref_transaction_begin(&err);