Skip to content

Commit

Permalink
Merge branch 'derek121/getting-started-typos' into maint
Browse files Browse the repository at this point in the history
* derek121/getting-started-typos:
  Fix typos

OTP-12478
  • Loading branch information
zhird committed Feb 11, 2015
2 parents a0f9bb7 + 68205e4 commit 4256682
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions system/doc/getting_started/conc_prog.xml
Expand Up @@ -538,7 +538,7 @@ ping finished</pre>
<p>Before we start, let's note the following:</p>
<list type="bulleted">
<item>
<p>This example will just show the message passing logic- no
<p>This example will just show the message passing logic - no
attempt at all has been made to provide a nice graphical user
interface. This can, of course, also be done in Erlang - but
that's another tutorial.</p>
Expand Down Expand Up @@ -571,7 +571,7 @@ ping finished</pre>
%%% already logged in at the same node, login will be rejected
%%% with a suitable error message.
%%% logoff()
%%% Logs off anybody at at node
%%% Logs off anybody at that node
%%% message(ToName, Message)
%%% sends Message to ToName. Error messages if the user of this
%%% function is not logged on or if ToName is not logged on at
Expand Down
2 changes: 1 addition & 1 deletion system/doc/getting_started/records_macros.xml
Expand Up @@ -97,7 +97,7 @@
%%% with a suitable error message.

%%% logoff()
%%% Logs off anybody at at node
%%% Logs off anybody at that node

%%% message(ToName, Message)
%%% sends Message to ToName. Error messages if the user of this
Expand Down
6 changes: 3 additions & 3 deletions system/doc/getting_started/robustness.xml
Expand Up @@ -214,9 +214,9 @@ Ping received pong</pre>
signal to be sent to "pong" which will also terminate.</p>
<p>It is possible to modify the default behaviour of a process so
that it does not get killed when it receives abnormal exit
signals, but all signals will be turned into normal messages on
signals, but all signals will be turned into normal messages with
the format <c>{'EXIT',FromPID,Reason}</c> and added to the end of
the receiving processes message queue. This behaviour is set by:</p>
the receiving process' message queue. This behaviour is set by:</p>
<code type="none">
process_flag(trap_exit, true)</code>
<p>There are several other process flags, see
Expand Down Expand Up @@ -289,7 +289,7 @@ pong exiting, got {'EXIT',&lt;3820.39.0>,ping}</pre>
%%% already logged in at the same node, login will be rejected
%%% with a suitable error message.
%%% logoff()
%%% Logs off anybody at at node
%%% Logs off anybody at that node
%%% message(ToName, Message)
%%% sends Message to ToName. Error messages if the user of this
%%% function is not logged on or if ToName is not logged on at
Expand Down

0 comments on commit 4256682

Please sign in to comment.