Merge branch 'maint'

8 files changed, 8 insertions, 8 deletions

diff --git a/lib/asn1/doc/src/asn1_ug.xml b/lib/asn1/doc/src/asn1_ug.xml
index 020e58c615..8b33497dd3 100644
--- a/lib/asn1/doc/src/asn1_ug.xml
+++ b/lib/asn1/doc/src/asn1_ug.xml
@@ -1390,7 +1390,7 @@ GENERAL-PROCEDURES GENERAL-PROCEDURE ::= {
       instance, if a Type is used in a definition with certain
       purpose, one want the type-name to express the intention. This
       can be done with parameterization.</p>
-    <p>When many types (or an other ASN.1 entity) only differs in some
+    <p>When many types (or another ASN.1 entity) only differs in some
       minor cases, but the structure of the types are similar, only
       one general type can be defined and the differences may be supplied
       through parameters. </p>
diff --git a/lib/eldap/test/README b/lib/eldap/test/README
index 8774db1504..ec774c1ae3 100644
--- a/lib/eldap/test/README
+++ b/lib/eldap/test/README
@@ -19,7 +19,7 @@ This will however not work, since slapd is guarded by apparmor that checks that
 To make a local extension of alowed operations:
     sudo emacs /etc/apparmor.d/local/usr.sbin.slapd
 
-and, after the change (yes, at least on Ubuntu it is right to edit ../local/.. but run with an other file) :
+and, after the change (yes, at least on Ubuntu it is right to edit ../local/.. but run with another file):
 
     sudo apparmor_parser -r /etc/apparmor.d/usr.sbin.slapd
 
diff --git a/lib/erl_interface/src/connect/ei_connect.c b/lib/erl_interface/src/connect/ei_connect.c
index 2e8418d61e..45c000ef76 100644
--- a/lib/erl_interface/src/connect/ei_connect.c
+++ b/lib/erl_interface/src/connect/ei_connect.c
@@ -761,7 +761,7 @@ int ei_close_connection(int fd)
 #endif
 
   /*
-  * Accept and initiate a connection from an other
+  * Accept and initiate a connection from another
   * Erlang node. Return a file descriptor at success,
   * otherwise -1;
 */
diff --git a/lib/erl_interface/src/legacy/erl_connect.c b/lib/erl_interface/src/legacy/erl_connect.c
index ae0265a388..d70d914b79 100644
--- a/lib/erl_interface/src/legacy/erl_connect.c
+++ b/lib/erl_interface/src/legacy/erl_connect.c
@@ -190,7 +190,7 @@ int erl_close_connection(int fd)
 }
 
 /*
- * Accept and initiate a connection from an other
+ * Accept and initiate a connection from another
  * Erlang node. Return a file descriptor at success,
  * otherwise -1;
  */
diff --git a/lib/kernel/test/gen_tcp_misc_SUITE.erl b/lib/kernel/test/gen_tcp_misc_SUITE.erl
index 2df4bf7c95..4e4aeb67e2 100644
--- a/lib/kernel/test/gen_tcp_misc_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_misc_SUITE.erl
@@ -882,7 +882,7 @@ passive_sockets_server_send(Socket, X) ->
 
 accept_closed_by_other_process(doc) ->
     ["Tests the return value from gen_tcp:accept when ",
-     "the socket is closed from an other process. (OTP-3817)"];
+     "the socket is closed from another process. (OTP-3817)"];
 accept_closed_by_other_process(Config) when is_list(Config) ->
     ?line Parent = self(),
     ?line {ok, ListenSocket} = gen_tcp:listen(0, []),
diff --git a/lib/mnesia/src/mnesia_frag.erl b/lib/mnesia/src/mnesia_frag.erl
index 4a1616e054..66fc20913c 100644
--- a/lib/mnesia/src/mnesia_frag.erl
+++ b/lib/mnesia/src/mnesia_frag.erl
@@ -939,7 +939,7 @@ do_split(_FH, _OldN, _FragNames, [], Ops) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Delete a fragment from a fragmented table
-%% and merge its records with an other fragment
+%% and merge its records with another fragment
     
 make_multi_del_frag(Tab) ->
     verify_multi(Tab),
diff --git a/lib/odbc/doc/src/error_handling.xml b/lib/odbc/doc/src/error_handling.xml
index b255865263..0b6179409d 100644
--- a/lib/odbc/doc/src/error_handling.xml
+++ b/lib/odbc/doc/src/error_handling.xml
@@ -88,7 +88,7 @@
   <section>
     <title>The whole picture </title>
     <p>As the Erlang ODBC application relies on third party products
-      and communicates with a database that probably runs on an other
+      and communicates with a database that probably runs on another
       computer in the network there are plenty of things that might go
       wrong. To fully understand the things that might happen it
       facilitate to know the design of the Erlang ODBC application,
diff --git a/lib/ssl/doc/src/ssl_protocol.xml b/lib/ssl/doc/src/ssl_protocol.xml
index cdfafe224b..80d9cc4ee8 100644
--- a/lib/ssl/doc/src/ssl_protocol.xml
+++ b/lib/ssl/doc/src/ssl_protocol.xml
@@ -83,7 +83,7 @@
      <em>subject</em>. The certificate is signed 
      with the private key of the issuer of the certificate. A chain
      of trust is build by having the issuer in its turn being
-     certified by an other certificate and so on until you reach the
+     certified by another certificate and so on until you reach the
      so called root certificate that is self signed i.e. issued
      by itself.</p>