Merge pull request #2160 from mururu/otp-version-scheme

Fix version scheme for Erlang/OTP

Author: José Valim

CHANGELOG.md

@@ -12,7 +12,7 @@
   * [IEx] Allow prompt configuration with the `:prompt` option
   * [Kernel] Support `ERL_PATH` in `bin/elixir`
   * [Kernel] Support interpolation in keyword syntax
-  * [Map] Add a Map module and support R17 maps and structs
+  * [Map] Add a Map module and support 17.0 maps and structs
   * [Mix] Add dependency option `:only` to specify the dependency environment. `mix deps.get` and `mix deps.update` works accross all environment unless `--only` is specified
   * [Mix] Add `Mix.Shell.prompt/1`
   * [Mix] Ensure the project is compiled in case Mix' CLI cannot find a task

README.md

@@ -16,7 +16,7 @@ If Elixir fails to build (specifically when pulling in a new version via git), b
 
 If tests pass, you are ready to move on to the [Getting Started guide][1] or to try Interactive Elixir by running: `bin/iex` in your terminal.
 
-However, if tests fail, it is likely you have an outdated Erlang version (Elixir requires Erlang R17 or later). You can check your Erlang version by calling `erl` in the command line. You will see some information as follows:
+However, if tests fail, it is likely you have an outdated Erlang version (Elixir requires Erlang 17.0 or later). You can check your Erlang version by calling `erl` in the command line. You will see some information as follows:
 
     Erlang/OTP 17 [RELEASE CANDIDATE 1] [erts-6.0] [source] [64-bit] [smp:4:4] [async-threads:10] [hipe] [kernel-poll:false]
 

lib/iex/lib/iex.ex

@@ -144,7 +144,7 @@ defmodule IEx do
   results in
 
       $ iex
-      Erlang R16B [...]
+      Erlang 17 [...]
 
       hello world
       Interactive Elixir - press Ctrl+C to exit (type h() ENTER for help)
@@ -172,7 +172,7 @@ defmodule IEx do
       ### now run the shell ###
 
       $ iex
-      Erlang R16B (erts-5.10.1) [...]
+      Erlang 17 (erts-5.10.1) [...]
 
       Interactive Elixir - press Ctrl+C to exit (type h() ENTER for help)
       iex(1)> [1, 2, 3, 4, 5]