summaryrefslogtreecommitdiffstats
path: root/doc/hacker-guide/en-US/markdown/coding-standard.md
diff options
context:
space:
mode:
authorJeff Darcy <jdarcy@redhat.com>2014-03-24 20:44:07 +0000
committerJeff Darcy <jdarcy@redhat.com>2014-03-24 20:44:07 +0000
commitefbb23837761bda6c526baca1b5ea72d227e2ae3 (patch)
tree728199c73595103d7561dd9d441bdbe1845c6331 /doc/hacker-guide/en-US/markdown/coding-standard.md
parenta58b023443b7a2ec089c45bf35bde2b0108aa19b (diff)
parent17454dfea9f3c4d47fcf0b5370a6155f639c8aeb (diff)
Merge branch 'upstream'
Diffstat (limited to 'doc/hacker-guide/en-US/markdown/coding-standard.md')
-rw-r--r--doc/hacker-guide/en-US/markdown/coding-standard.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/hacker-guide/en-US/markdown/coding-standard.md b/doc/hacker-guide/en-US/markdown/coding-standard.md
index 178dc142a..368c55534 100644
--- a/doc/hacker-guide/en-US/markdown/coding-standard.md
+++ b/doc/hacker-guide/en-US/markdown/coding-standard.md
@@ -341,7 +341,7 @@ This is the recommended template for any fop. In the beginning come
the initializations. After that, the `success' control flow should be
linear. Any error conditions should cause a `goto` to a single
point, `out`. At that point, the code should detect the error
-that has occured and do appropriate cleanup.
+that has occurred and do appropriate cleanup.
```
int32_t