diff options
| author | Zandra Hird <[email protected]> | 2015-02-11 10:26:23 +0100 |
|---|---|---|
| committer | Zandra Hird <[email protected]> | 2015-02-11 10:26:23 +0100 |
| commit | 425668272206a0f2e4b383aef0e2364e35046686 (patch) | |
| tree | 87bc2f5f2af2d4941ca78502b9fba4676cdf0bd5 | |
| parent | a0f9bb79004eeacc327d0bfaa891f0cbd71b3f04 (diff) | |
| parent | 68205e4d58421cc6ef66e3568dad56c073e18e51 (diff) | |
| download | otp-425668272206a0f2e4b383aef0e2364e35046686.tar.gz otp-425668272206a0f2e4b383aef0e2364e35046686.tar.bz2 otp-425668272206a0f2e4b383aef0e2364e35046686.zip | |
Merge branch 'derek121/getting-started-typos' into maint
* derek121/getting-started-typos:
Fix typos
OTP-12478
| -rw-r--r-- | system/doc/getting_started/conc_prog.xml | 4 | ||||
| -rw-r--r-- | system/doc/getting_started/records_macros.xml | 2 | ||||
| -rw-r--r-- | system/doc/getting_started/robustness.xml | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/system/doc/getting_started/conc_prog.xml b/system/doc/getting_started/conc_prog.xml index 6c513162c0..2b64826a93 100644 --- a/system/doc/getting_started/conc_prog.xml +++ b/system/doc/getting_started/conc_prog.xml @@ -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> @@ -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 diff --git a/system/doc/getting_started/records_macros.xml b/system/doc/getting_started/records_macros.xml index 2922962134..73c8ce5c8d 100644 --- a/system/doc/getting_started/records_macros.xml +++ b/system/doc/getting_started/records_macros.xml @@ -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 diff --git a/system/doc/getting_started/robustness.xml b/system/doc/getting_started/robustness.xml index b97940d388..e8fb81d5e8 100644 --- a/system/doc/getting_started/robustness.xml +++ b/system/doc/getting_started/robustness.xml @@ -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 @@ -289,7 +289,7 @@ pong exiting, got {'EXIT',<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 |