summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2015-06-19 23:54:20 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2015-06-19 23:54:20 +0900
commit8a5b0433abfd508c940891ffe9d748e80f006597 (patch)
tree4674ce1fe4c9c89d2a8573d36c3d994096908690
parenta219e8b7174b700a65e1570d24ba0c8e2d709e59 (diff)
parentdcc316d3b84691f88158c3a3d2c43e612a995f6e (diff)
downloadmruby-8a5b0433abfd508c940891ffe9d748e80f006597.tar.gz
mruby-8a5b0433abfd508c940891ffe9d748e80f006597.zip
Merge pull request #2840 from davydovanton/doc-fix-typos
Fix typos in documentation and error messages
-rw-r--r--CONTRIBUTING.md2
-rwxr-xr-xmrbgems/mruby-bin-debugger/tools/mrdb/cmdmisc.c2
-rw-r--r--mrbgems/mruby-fiber/src/fiber.c6
3 files changed, 5 insertions, 5 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1d4de00b9..6bababb89 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -45,7 +45,7 @@ on-demand.
#### Don't use C++ style comments
- /* This is the prefered comment style */
+ /* This is the preferred comment style */
Use C++ style comments only for temporary comment e.g. commenting out some code lines.
diff --git a/mrbgems/mruby-bin-debugger/tools/mrdb/cmdmisc.c b/mrbgems/mruby-bin-debugger/tools/mrdb/cmdmisc.c
index b40915909..f52514851 100755
--- a/mrbgems/mruby-bin-debugger/tools/mrdb/cmdmisc.c
+++ b/mrbgems/mruby-bin-debugger/tools/mrdb/cmdmisc.c
@@ -33,7 +33,7 @@ static help_msg help_msg_list[] = {
"\n"
"Continue program stopped by a breakpoint.\n"
"If N, which is non negative value, is passed,\n"
- "proceed program until the N-th breakpoint is comming.\n"
+ "proceed program until the N-th breakpoint is coming.\n"
"If N is not passed, N is assumed 1.\n"
},
{
diff --git a/mrbgems/mruby-fiber/src/fiber.c b/mrbgems/mruby-fiber/src/fiber.c
index 2e5cd82e9..93b3f1227 100644
--- a/mrbgems/mruby-fiber/src/fiber.c
+++ b/mrbgems/mruby-fiber/src/fiber.c
@@ -167,7 +167,7 @@ fiber_switch(mrb_state *mrb, mrb_value self, mrb_int len, const mrb_value *a, mr
}
}
if (resume && c->status == MRB_FIBER_TRANSFERRED) {
- mrb_raise(mrb, E_FIBER_ERROR, "resuming transfered fiber");
+ mrb_raise(mrb, E_FIBER_ERROR, "resuming transferred fiber");
}
if (c->status == MRB_FIBER_RUNNING || c->status == MRB_FIBER_RESUMING) {
mrb_raise(mrb, E_FIBER_ERROR, "double resume");
@@ -265,8 +265,8 @@ fiber_eq(mrb_state *mrb, mrb_value self)
* call-seq:
* fiber.transfer(args, ...) -> obj
*
- * Transfers control to reciever fiber of the method call.
- * Unlike <code>resume</code> the reciever wouldn't be pushed to call
+ * Transfers control to receiver fiber of the method call.
+ * Unlike <code>resume</code> the receiver wouldn't be pushed to call
* stack of fibers. Instead it will switch to the call stack of
* transferring fiber.
* When resuming a fiber that was transferred to another fiber it would