aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorMarcus Arendt <[email protected]>2014-08-28 10:25:11 +0200
committerMarcus Arendt <[email protected]>2014-08-28 10:25:11 +0200
commitf5b36fc72e1ac37d00f82b7651b7ca06a628097f (patch)
treefbc4a36d985017ea8c585ac97af97ce054a1eadf /erts/emulator
parentdca659f2f5f07b70a18d3e3a1ec0967f3933415e (diff)
parent63d7fbe5cdf2b714500467b771a237e9ec11aaa8 (diff)
downloadotp-f5b36fc72e1ac37d00f82b7651b7ca06a628097f.tar.gz
otp-f5b36fc72e1ac37d00f82b7651b7ca06a628097f.tar.bz2
otp-f5b36fc72e1ac37d00f82b7651b7ca06a628097f.zip
Merge branch 'tuncer/misspelled-another' into maint
* tuncer/misspelled-another: Fix misspellings of 'another'
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/drivers/common/inet_drv.c2
-rw-r--r--erts/emulator/drivers/unix/multi_drv.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c
index 09d90f4984..891589d1c5 100644
--- a/erts/emulator/drivers/common/inet_drv.c
+++ b/erts/emulator/drivers/common/inet_drv.c
@@ -5778,7 +5778,7 @@ done:
ia_p->Ipv6IfIndex &&
ia_p->Ipv6IfIndex != index)
{
- /* Oops, there was an other interface for IPv6. Possible? XXX */
+ /* Oops, there was another interface for IPv6. Possible? XXX */
index = ia_p->Ipv6IfIndex;
goto index;
}
diff --git a/erts/emulator/drivers/unix/multi_drv.c b/erts/emulator/drivers/unix/multi_drv.c
index 822c96730c..724d325ed5 100644
--- a/erts/emulator/drivers/unix/multi_drv.c
+++ b/erts/emulator/drivers/unix/multi_drv.c
@@ -20,7 +20,7 @@
/* Purpose: Multidriver interface
This is an example of a driver which allows multiple instances of itself.
I.e have one erlang process execute open_port(multi......) and
- at the same time have an other erlang process open an other port
+ at the same time have another erlang process open another port
running multi there as well.
*/