Document all ways of passing -X options in -Xhelp,

using the same description found in vm/environment.cpp
rubinius · Jan 20, 2015 · e0f904a · e0f904a
1 parent bf7db36
commit e0f904a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/kernel/loader.rb b/kernel/loader.rb
@@ -426,9 +426,15 @@ def options(argv=ARGV)
      All variables, even ones that the VM doesn't understand, are available
      in Rubinius::Config.
 
-     These options can also be passed via the RBXOPT environment variable:
+     Options are parsed from these sources, in this order:
 
-       RBXOPT=-Xint rbx
+     1. The file .rbxrc in the current working directory.
+     2. The RBXOPT environment variable.
+     3. The command line options.
+
+     This order permits environment and command line options to override
+     "application" configuration. Likewise, command line options can override
+     environment configuration.
 
      A number of Rubinius features are driven by setting these variables.
       DOC

diff --git a/vm/environment.cpp b/vm/environment.cpp
@@ -247,8 +247,8 @@ namespace rubinius {
      *  2. The RBXOPT environment variable.
      *  3. The command line options.
      *
-     * This order permits environment and command line ot override
-     * "application" configuration. Likewise, command line can override
+     * This order permits environment and command line options to override
+     * "application" configuration. Likewise, command line options can override
      * environment configuration.
      */