Merge tag 'upstream/6.1.2'

Upstream version 6.1.2

1 files changed, 4 insertions, 4 deletions

diff --git a/doc/API b/doc/API
index 8e824f5..c639432 100644
--- a/doc/API
+++ b/doc/API
@@ -432,9 +432,9 @@ Oniguruma API  Version 6.1.0  2016/08/22
   1 region:  match region data.
   2 at:      callback position.
 
-    ONIG_TRAVERSE_CALLBACK_AT_FIRST: callback first, then traverse childs.
-    ONIG_TRAVERSE_CALLBACK_AT_LAST:  traverse childs first, then callback.
-    ONIG_TRAVERSE_CALLBACK_AT_BOTH:  callback first, then traverse childs,
+    ONIG_TRAVERSE_CALLBACK_AT_FIRST: callback first, then traverse children.
+    ONIG_TRAVERSE_CALLBACK_AT_LAST:  traverse children first, then callback.
+    ONIG_TRAVERSE_CALLBACK_AT_BOTH:  callback first, then traverse children,
                                      and at last callback again.
 
   3 func:    callback function.
@@ -553,7 +553,7 @@ Oniguruma API  Version 6.1.0  2016/08/22
   2 op, op2, behavior, options: value of element.
 
 
-# void onig_copy_encoding(OnigEncoding to, OnigOnigEncoding from)
+# void onig_copy_encoding(OnigEncoding to, OnigEncoding from)
 
   Copy encoding.