Permalink
Browse files

Merge pull request #4045 from joeyates/feature/correct-bin-and-home

Documentation fixes
  • Loading branch information...
josevalim committed Dec 3, 2015
2 parents c37ea4e + c78755a commit aece570083d071a3c109a9d504d3ab18ebee507d
Showing with 8 additions and 8 deletions.
  1. +5 −5 CHANGELOG.md
  2. +1 −1 bin/elixir
  3. +1 −1 bin/elixir.bat
  4. +1 −1 lib/elixir/lib/gen_server.ex
View
@@ -13,7 +13,7 @@ We have brought many features specific to Erlang 18. Here are the highlights:
the modules `Dict` and `HashDict` is now discouraged and will be
deprecated in future releases, instead use `Map`. Similarly, `Set` and
`HashSet` will be deprecated in favor of `MapSet`
- * Compilation times are faster due to improvements on both Elixir and
+ * Compilation times are faster due to improvements in both the Elixir and
Erlang compilers
* Dialyzer now emits less false negative warnings thanks to new annotations
available in the Erlang compiler
@@ -30,7 +30,7 @@ This release includes four notable language improvements:
%{key => value}
- * Support for pin operator in map keys and function clauses:
+ * Support for the pin operator in map keys and function clauses:
%{^key => value} = %{key => value}
fn ^key -> :ok end
@@ -45,7 +45,7 @@ These improvements aim to make the language more consistent and expressive.
## Getting started experience
-At the same time we improved the language, we have improved both parser and
+While we were improving the language, we also improved both the parser and
compiler to be even more aware of language constructs, emitting warnings
on common pitfalls like when piping to expressions without parentheses or
when defining unsafe variables.
@@ -76,8 +76,8 @@ achieved when migrating to Erlang 18.
With Rebar 3 support gaining more adoption in the Erlang community, Mix is
now able to fetch and compile Rebar 3 dependencies. This feature is currently
experimental and therefore opt-in: if you have a Rebar 3 dependency, you can
-ask Mix to use Rebar 3 compile it by passing the `manager: :rebar3` option.
-Once you configured, Mix will prompt you to install Rebar 3 if one is not yet
+ask Mix to use Rebar 3 to compile it by passing the `manager: :rebar3` option.
+Once configured, Mix will prompt you to install Rebar 3 if it is not yet
available.
## v1.2.0-dev
View
@@ -2,7 +2,7 @@
if [ $# -eq 0 ] || [ "$1" = "--help" ] || [ "$1" = "-h" ]; then
echo "Usage: `basename $0` [options] [.exs file] [data]
- -v Prints version and exit
+ -v Prints version and exits
-e \"command\" Evaluates the given command (*)
-r \"file\" Requires the given files/patterns (*)
-S \"script\"   Finds and executes the given script
View
@@ -9,7 +9,7 @@ goto parseopts
:documentation
echo Usage: %~nx0 [options] [.exs file] [data]
echo.
-echo -v Prints version and exit
+echo -v Prints version and exits
echo -e command Evaluates the given command (*)
echo -r file Requires the given files/patterns (*)
echo -S script Finds and executes the given script
@@ -553,7 +553,7 @@ defmodule GenServer do
failure and continues running, and the server is just late with the reply,
it may arrive at any time later into the caller's message queue. The caller
must in this case be prepared for this and discard any such garbage messages
- that are two element tuples with a reference as the first element.
+ that are two-element tuples with a reference as the first element.
"""
@spec call(server, term, timeout) :: term
def call(server, request, timeout \\ 5000) do

0 comments on commit aece570

Please sign in to comment.