Merge branch 'maint'

* maint:
  Fix typos in lib/eldap

3 files changed, 11 insertions, 11 deletions

diff --git a/lib/eldap/doc/src/eldap.xml b/lib/eldap/doc/src/eldap.xml
index 7b0b8af8a3..8bb4323117 100644
--- a/lib/eldap/doc/src/eldap.xml
+++ b/lib/eldap/doc/src/eldap.xml
@@ -372,22 +372,22 @@
     <func>
       <name since="OTP R15B01">neverDerefAliases() -> dereference()</name>
       <fsummary>Create search option.</fsummary>
-      <desc> <p>Never derefrence aliases, treat aliases as entries.</p> </desc>
+      <desc> <p>Never dereference aliases, treat aliases as entries.</p> </desc>
     </func>
     <func>
       <name since="OTP R15B01">derefAlways() -> dereference()</name>
       <fsummary>Create search option.</fsummary>
-      <desc> <p>Always derefrence aliases.</p> </desc>
+      <desc> <p>Always dereference aliases.</p> </desc>
     </func>
     <func>
       <name since="OTP R15B01">derefInSearching() -> dereference()</name>
       <fsummary>Create search option.</fsummary>
-      <desc> <p>Derefrence aliases only when searching.</p> </desc>
+      <desc> <p>Dereference aliases only when searching.</p> </desc>
     </func>
     <func>
       <name since="OTP R15B01">derefFindingBaseObj() -> dereference()</name>
       <fsummary>Create search option.</fsummary>
-      <desc> <p>Derefrence aliases only in finding the base.</p> </desc>
+      <desc> <p>Dereference aliases only in finding the base.</p> </desc>
     </func>
 
     <func>
diff --git a/lib/eldap/src/eldap.erl b/lib/eldap/src/eldap.erl
index c647083024..24562eb790 100644
--- a/lib/eldap/src/eldap.erl
+++ b/lib/eldap/src/eldap.erl
@@ -792,7 +792,7 @@ collect_search_responses(Data, S, ID, {ok,Msg}, Acc, Ref)
 	    log2(Data, "search reply = ~p~n", [Resp]),
 	    collect_search_responses(Data, S, ID, Resp, [R|Acc], Ref);
 	{'searchResRef',R} ->
-	    %% At the moment we don't do anyting sensible here since
+	    %% At the moment we don't do anything sensible here since
 	    %% I haven't been able to trigger the server to generate
 	    %% a response like this.
 	    Resp = recv_response(S, Data),
diff --git a/lib/eldap/test/eldap_basic_SUITE.erl b/lib/eldap/test/eldap_basic_SUITE.erl
index 851ca4f5c3..15cf6a9039 100644
--- a/lib/eldap/test/eldap_basic_SUITE.erl
+++ b/lib/eldap/test/eldap_basic_SUITE.erl
@@ -187,7 +187,7 @@ end_per_suite(_Config) ->
 init_per_group(return_values, Config) ->
     case proplists:get_value(ldap_server,Config) of
 	undefined ->
-	    {skip, "LDAP server not availble"};
+	    {skip, "LDAP server not available"};
 	{Host,Port} ->
 	    ct:comment("ldap://~s:~p",[Host,Port]),
 	    Config
@@ -195,7 +195,7 @@ init_per_group(return_values, Config) ->
 init_per_group(plain_api, Config0) ->
     case proplists:get_value(ldap_server,Config0) of
 	undefined ->
-	    {skip, "LDAP server not availble"};
+	    {skip, "LDAP server not available"};
 	Server = {Host,Port} ->
 	    ct:comment("ldap://~s:~p",[Host,Port]),
 	    initialize_db([{server,Server}, {ssl_flag,false}, {start_tls,false} | Config0])
@@ -203,7 +203,7 @@ init_per_group(plain_api, Config0) ->
 init_per_group(ssl_api, Config0) ->
     case proplists:get_value(ldaps_server,Config0) of
 	undefined ->
-	    {skip, "LDAPS server not availble"};
+	    {skip, "LDAPS server not available"};
 	Server = {Host,Port} ->
 	    ct:comment("ldaps://~s:~p",[Host,Port]),
 	    initialize_db([{server,Server}, {ssl_flag,true}, {start_tls,false} | Config0])
@@ -211,9 +211,9 @@ init_per_group(ssl_api, Config0) ->
 init_per_group(start_tls_api, Config0) ->
     case {proplists:get_value(ldap_server,Config0), proplists:get_value(ssl_available,Config0)} of
 	{undefined,true} ->
-	    {skip, "LDAP server not availble"};
+	    {skip, "LDAP server not available"};
 	{_,false} ->
-	    {skip, "TLS not availble"};
+	    {skip, "TLS not available"};
 	{Server={Host,Port}, true} ->
 	    ct:comment("ldap://~s:~p + start_tls",[Host,Port]),
 	    Config = [{server,Server}, {ssl_flag,false} | Config0],
@@ -761,7 +761,7 @@ modify(Config) ->
 		     #eldap_search{base = BasePath,
 				   filter = eldap:equalityMatch("telephoneNumber", "555-12345"),
 				   scope=eldap:singleLevel()}),
-    %% restore the orignal version:
+    %% restore the original version:
     restore_original_object(H, DN, OriginalAttrs).
 
 %%%----------------------------------------------------------------