Merge remote-tracking branch 'gma/drop-set-prefix' into drop-set-prefix

README.md

@@ -42,8 +42,8 @@ tools that do one thing well.
    * [1 How It Works](#section_1)
    * [2 Installation](#section_2)
    * [3 Usage](#section_3)
-      * [3.1 set-default](#section_3.1)
-      * [3.2 set-local](#section_3.2)
+      * [3.1 default](#section_3.1)
+      * [3.2 local](#section_3.2)
       * [3.3 versions](#section_3.3)
       * [3.4 version](#section_3.4)
       * [3.5 rehash](#section_3.5)
@@ -122,26 +122,32 @@ when installing a gem that provides a binary).
 Like `git`, the `rbenv` command delegates to subcommands based on its
 first argument. The most common subcommands are:
 
-### <a name="section_3.1"></a> 3.1 set-default
+### <a name="section_3.1"></a> 3.1 default
 
 Sets the default version of Ruby to be used in all shells by writing
 the version name to the `~/.rbenv/default` file. This version can be
 overridden by a per-project `.rbenv-version` file, or by setting the
 `RBENV_VERSION` environment variable.
 
-    $ rbenv set-default 1.9.2-p290
+    $ rbenv default 1.9.2-p290
 
 The special version name `system` tells rbenv to use the system Ruby
 (detected by searching your `$PATH`).
 
-### <a name="section_3.2"></a> 3.2 set-local
+When run without a version number the currently configured default
+version is reported.
+
+### <a name="section_3.2"></a> 3.2 local
 
 Sets a local per-project Ruby version by writing the version name to
 an `.rbenv-version` file in the current directory. This version
 overrides the default, and can be overridden itself by setting the
 `RBENV_VERSION` environment variable.
 
-    $ rbenv set-local rbx-1.2.4
+    $ rbenv local rbx-1.2.4
+
+When run without a version number the currently configured local
+version is reported.
 
 ### <a name="section_3.3"></a> 3.3 versions