Merge branch 'master' of github.com:mruby/mruby

6 files changed, 25 insertions, 21 deletions

diff --git a/README b/README
index 12f8f5135..bfcd138cc 100644
--- a/README
+++ b/README
@@ -40,12 +40,12 @@ The mruby distribution files can be found in the following site:
 The trunk of the mruby source tree can be checked out with the
 following command:
 
-    $ git ....
+    $ git clone https://github.com/mruby/mruby.git
 
 There are some other branches under development.  Try the following
 command and see the list of branches:
 
-    $ git ....
+    $ git branch -r
 
 
 * mruby home-page (sorry, it's not launched yet. we're working on this)
diff --git a/README.ja b/README.ja
index 22895a403..18ef16d13 100644
--- a/README.ja
+++ b/README.ja
@@ -44,11 +44,11 @@ mrubyはISO規格に準拠したRuby言語を様々な環境で動作可能と�
 
 開発先端のソースコードは次のコマンドで取得できます．
 
-  $ git ....
+  $ git clone https://github.com/mruby/mruby.git
 
 他に開発中のブランチの一覧は次のコマンドで見られます．
 
-  $ git ....
+  $ git branch -r
 
 
 * ホームページ (まだ準備中です。ただいま鋭意製作中です。)
diff --git a/README.ja.md b/README.ja.md
index 0776226aa..aabad4c15 100644
--- a/README.ja.md
+++ b/README.ja.md
@@ -45,11 +45,11 @@ mrubyは[ISO規格](http://www.ipa.go.jp/about/press/20120402_2.html)に準拠�
 
 開発先端のソースコードは次のコマンドで取得できます。
 
-    $ git ....
+    $ git clone https://github.com/mruby/mruby.git
 
 他に開発中のブランチの一覧は次のコマンドで見られます。
 
-    $ git ....
+    $ git branch -r
 
 
 ## ホームページ
diff --git a/README.md b/README.md
index 8fcbf44c7..d40b85d6e 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 
 mruby is the lightweight implementation of the Ruby language complying to
 the [ISO standard](http://www.ipa.go.jp/about/press/20120402_2.html). 
-mruby can run Ruby code in 'interpreter mode' or 'compile and execute it on a virtual machine' depending on how the developer's preference.
+mruby can run Ruby code in 'interpreter mode' or 'compile and execute it on a virtual machine' depending on the developer's preference.
 
 This achievement was sponsored by the Regional Innovation Creation R&D Programs of
 the Ministry of Economy, Trade and Industry of Japan.
@@ -44,10 +44,10 @@ following command:
 
     $ git clone https://github.com/mruby/mruby.git
 
-There are some other branches under development.  Try the following
+There are some other branches under development. Try the following
 command and see the list of branches:
 
-    $ git ....
+    $ git branch -r
 
 
 ## mruby home-page
@@ -61,7 +61,7 @@ The URL of the mruby home-page will be:
 
 ## Mailing list
 
-To subscribe the mruby mailing list....[T.B.D.]
+To subscribe to the mruby mailing list....[T.B.D.]
 
 
 ## How to compile and install
@@ -78,19 +78,19 @@ See the COPYING file.
 
 Thank you for considering contributing to mruby.
 mruby has chosen a MIT License due to its permissive license allowing
-developer to target various environments such as embedded systems.
-However, the license requires to display the copyright notice and license
+developers to target various environments such as embedded systems.
+However, the license requires the display of the copyright notice and license
 information in manuals for instance. Doing so for big projects can be 
 complicated or troublesome.
-This is why, mruby has decided to display "mruby developers" as copyright name
+This is why mruby has decided to display "mruby developers" as the copyright name
 to make it simple conventionally.
-In the future, mruby might ask you to distribute your new codes
-(that you will commit,) under MIT License as a member of
+In the future, mruby might ask you to distribute your new code
+(that you will commit,) under the MIT License as a member of
 "mruby developers" but contributors will keep their copyright.
 (We did not intend for contributors to transfer or waive their copyrights,
  Actual copyright holder name (contributors) will be listed in the AUTHORS file.)
 
-Please ask us if you want to distribute your code under other license
+Please ask us if you want to distribute your code under another license
 or if your code is derived from GPL code.
 
 
@@ -99,7 +99,7 @@ or if your code is derived from GPL code.
 See the file AUTHORS.
 
 
-Feel free to send comments and bug reports to the author.  Here is the
+Feel free to send comments and bug reports to the author. Here is the
 author's latest mail address:
 
   [email protected]
diff --git a/include/mruby.h b/include/mruby.h
index eb121c971..e2a497eb6 100644
--- a/include/mruby.h
+++ b/include/mruby.h
@@ -75,7 +75,7 @@ typedef struct mrb_value {
 #define mrb_test(o)   ((o).tt != MRB_TT_FALSE)
 #define mrb_fixnum(o) (o).value.i
 #define mrb_float(o)  (o).value.f
-#define mrb_symbol(o)  (o).value.sym
+#define mrb_symbol(o) (o).value.sym
 #define mrb_object(o) (o).value.p
 #define FIXNUM_P(o)   ((o).tt == MRB_TT_FIXNUM)
 #define UNDEF_P(o)    ((o).tt == MRB_TT_UNDEF)
@@ -388,6 +388,10 @@ void mrb_write_barrier(mrb_state *, struct RBasic*);
 
 #define MRUBY_VERSION "Rite"
 
+#ifdef DEBUG
+#undef DEBUG
+#endif
+
 #if 0
 #define DEBUG(x) x
 #else
diff --git a/tools/mruby/mruby.c b/tools/mruby/mruby.c
index 4e84b3c7d..769746530 100644
--- a/tools/mruby/mruby.c
+++ b/tools/mruby/mruby.c
@@ -22,10 +22,10 @@ usage(const char *name)
 {
   static const char *const usage_msg[] = {
   "switches:",
-  "-b           load and execute RiteBinary(mrb) file",
+  "-b           load and execute RiteBinary (mrb) file",
   "-c           check syntax only",
-  "-v           print version number, then trun on verbose mode",
-  "--verbose    run at verbose mode",
+  "-v           print version number, then run in verbose mode",
+  "--verbose    run in verbose mode",
   "--version    print the version",
   "--copyright  print the copyright",
   NULL