Replace Jabber->XMPP and Ejabberd (thanks to Neustradamus)(#3469)

8 files changed, 28 insertions, 28 deletions

diff --git a/src/ejabberd_cluster_mnesia.erl b/src/ejabberd_cluster_mnesia.erl
index 726cd04e3..01e87c979 100644
--- a/src/ejabberd_cluster_mnesia.erl
+++ b/src/ejabberd_cluster_mnesia.erl
@@ -1,7 +1,7 @@
 %%%----------------------------------------------------------------------
 %%% File    : ejabberd_cluster_mnesia.erl
 %%% Author  : Christophe Romain <christophe.romain@process-one.net>
-%%% Purpose : Ejabberd clustering management via Mnesia
+%%% Purpose : ejabberd clustering management via Mnesia
 %%% Created : 7 Oct 2015 by Christophe Romain <christophe.romain@process-one.net>
 %%%
 %%%
diff --git a/src/ejabberd_options_doc.erl b/src/ejabberd_options_doc.erl
index 131168b18..298a43170 100644
--- a/src/ejabberd_options_doc.erl
+++ b/src/ejabberd_options_doc.erl
@@ -770,7 +770,7 @@ doc() ->
             ?T("An LDAP filter as defined in "
                "https://tools.ietf.org/html/rfc4515[RFC4515]. "
                "There is no default value. Example: "
-               "\"(&(objectClass=shadowAccount)(memberOf=Jabber Users))\". "
+               "\"(&(objectClass=shadowAccount)(memberOf=XMPP Users))\". "
                "NOTE: don't forget to close brackets and don't use superfluous "
                "whitespaces. Also you must not use \"uid\" attribute in the "
                "filter because this attribute will be appended to the filter "
diff --git a/src/ejabberd_piefxis.erl b/src/ejabberd_piefxis.erl
index fb1525f71..ff94e168f 100644
--- a/src/ejabberd_piefxis.erl
+++ b/src/ejabberd_piefxis.erl
@@ -584,8 +584,8 @@ make_main_basefilename(Dir, FnT) ->
     filename:join([Dir, Filename2]).
 
 %% @doc Make the filename for the host.
-%% Example: ``(<<"20080804-231550">>, <<"jabber.example.org">>) ->
-%%             <<"20080804-231550_jabber_example_org.xml">>''
+%% Example: ``(<<"20080804-231550">>, <<"xmpp.domain.tld">>) ->
+%%             <<"20080804-231550_xmpp_domain_tld.xml">>''
 make_host_filename(FnT, Host) ->
     Host2 = str:join(str:tokens(Host, <<".">>), <<"_">>),
     <<FnT/binary, "_", Host2/binary, ".xml">>.
diff --git a/src/ejabberd_system_monitor.erl b/src/ejabberd_system_monitor.erl
index 35ef48d49..ab52b0775 100644
--- a/src/ejabberd_system_monitor.erl
+++ b/src/ejabberd_system_monitor.erl
@@ -1,7 +1,7 @@
 %%%-------------------------------------------------------------------
 %%% File    : ejabberd_system_monitor.erl
 %%% Author  : Alexey Shchepin <alexey@process-one.net>
-%%% Description : Ejabberd watchdog
+%%% Description : ejabberd watchdog
 %%% Created : 21 Mar 2007 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
diff --git a/src/mod_admin_extra.erl b/src/mod_admin_extra.erl
index 9a7c3560f..a90a22cea 100644
--- a/src/mod_admin_extra.erl
+++ b/src/mod_admin_extra.erl
@@ -1478,7 +1478,7 @@ srg_user_del(User, Host, Group, GroupHost) ->
 %%% Stanza
 %%%
 
-%% @doc Send a message to a Jabber account.
+%% @doc Send a message to an XMPP account.
 %% @spec (Type::binary(), From::binary(), To::binary(), Subject::binary(), Body::binary()) -> ok
 send_message(Type, From, To, Subject, Body) ->
     CodecOpts = ejabberd_config:codec_options(),
diff --git a/src/mod_register.erl b/src/mod_register.erl
index cf125db78..92df8b682 100644
--- a/src/mod_register.erl
+++ b/src/mod_register.erl
@@ -623,7 +623,7 @@ mod_doc() ->
     #{desc =>
           [?T("This module adds support for https://xmpp.org/extensions/xep-0077.html"
               "[XEP-0077: In-Band Registration]. "
-              "This protocol enables end users to use a XMPP client to:"), "",
+              "This protocol enables end users to use an XMPP client to:"), "",
            ?T("* Register a new account on the server."), "",
            ?T("* Change the password from an existing account on the server."), "",
            ?T("* Delete an existing account on the server."), "",
diff --git a/src/mod_register_web.erl b/src/mod_register_web.erl
index 28198b0ef..c6a955802 100644
--- a/src/mod_register_web.erl
+++ b/src/mod_register_web.erl
@@ -115,7 +115,7 @@ process([<<"new">>],
       {success, ok, {Username, Host, _Password}} ->
 	  Jid = jid:make(Username, Host),
           mod_register:send_registration_notifications(?MODULE, Jid, Ip),
-	  Text = translate:translate(Lang, ?T("Your Jabber account was successfully created.")),
+	  Text = translate:translate(Lang, ?T("Your XMPP account was successfully created.")),
 	  {200, [], Text};
       Error ->
 	  ErrorText =
@@ -128,7 +128,7 @@ process([<<"delete">>],
 		 host = _HTTPHost}) ->
     case form_del_post(Q) of
       {atomic, ok} ->
-	  Text = translate:translate(Lang, ?T("Your Jabber account was successfully deleted.")),
+	  Text = translate:translate(Lang, ?T("Your XMPP account was successfully deleted.")),
 	  {200, [], Text};
       Error ->
 	  ErrorText =
@@ -143,7 +143,7 @@ process([<<"change_password">>],
 		 host = _HTTPHost}) ->
     case form_changepass_post(Q) of
       {atomic, ok} ->
-	  Text = translate:translate(Lang, ?T("The password of your Jabber account was successfully changed.")),
+	  Text = translate:translate(Lang, ?T("The password of your XMPP account was successfully changed.")),
 	  {200, [], Text};
       Error ->
 	  ErrorText =
@@ -200,7 +200,7 @@ meta() ->
 index_page(Lang) ->
     HeadEls = [meta(),
 	       ?XCT(<<"title">>,
-		    ?T("Jabber Account Registration")),
+		    ?T("XMPP Account Registration")),
 	       ?XA(<<"link">>,
 		   [{<<"href">>, <<"register.css">>},
 		    {<<"type">>, <<"text/css">>},
@@ -208,15 +208,15 @@ index_page(Lang) ->
     Els = [?XACT(<<"h1">>,
 		 [{<<"class">>, <<"title">>},
 		  {<<"style">>, <<"text-align:center;">>}],
-		 ?T("Jabber Account Registration")),
+		 ?T("XMPP Account Registration")),
 	   ?XE(<<"ul">>,
 	       [?XE(<<"li">>,
-		    [?ACT(<<"new/">>, ?T("Register a Jabber account"))]),
+		    [?ACT(<<"new/">>, ?T("Register an XMPP account"))]),
 		?XE(<<"li">>,
 		    [?ACT(<<"change_password/">>, ?T("Change Password"))]),
 		?XE(<<"li">>,
 		    [?ACT(<<"delete/">>,
-			  ?T("Unregister a Jabber account"))])])],
+			  ?T("Unregister an XMPP account"))])])],
     {200,
      [{<<"Server">>, <<"ejabberd">>},
       {<<"Content-Type">>, <<"text/html">>}],
@@ -239,7 +239,7 @@ form_new_get(Host, Lang, IP) ->
 form_new_get2(Host, Lang, CaptchaEls) ->
     HeadEls = [meta(),
 	       ?XCT(<<"title">>,
-		    ?T("Register a Jabber account")),
+		    ?T("Register an XMPP account")),
 	       ?XA(<<"link">>,
 		   [{<<"href">>, <<"../register.css">>},
 		    {<<"type">>, <<"text/css">>},
@@ -247,10 +247,10 @@ form_new_get2(Host, Lang, CaptchaEls) ->
     Els = [?XACT(<<"h1">>,
 		 [{<<"class">>, <<"title">>},
 		  {<<"style">>, <<"text-align:center;">>}],
-		 ?T("Register a Jabber account")),
+		 ?T("Register an XMPP account")),
 	   ?XCT(<<"p">>,
-		?T("This page allows to create a Jabber "
-		   "account in this Jabber server. Your "
+		?T("This page allows to create an XMPP "
+		   "account in this XMPP server. Your "
 		   "JID (Jabber IDentifier) will be of the "
 		   "form: username@server. Please read carefully "
 		   "the instructions to fill correctly the "
@@ -281,19 +281,19 @@ form_new_get2(Host, Lang, CaptchaEls) ->
 			    ?XE(<<"ul">>,
 				[?XCT(<<"li">>,
 				      ?T("Don't tell your password to anybody, "
-					 "not even the administrators of the Jabber "
+					 "not even the administrators of the XMPP "
 					 "server.")),
 				 ?XCT(<<"li">>,
 				      ?T("You can later change your password using "
-					 "a Jabber client.")),
+					 "an XMPP client.")),
 				 ?XCT(<<"li">>,
-				      ?T("Some Jabber clients can store your password "
+				      ?T("Some XMPP clients can store your password "
 					 "in the computer, but you should do this only "
 					 "in your personal computer for safety reasons.")),
 				 ?XCT(<<"li">>,
 				      ?T("Memorize your password, or write it "
 					 "in a paper placed in a safe place. In "
-					 "Jabber there isn't an automated way "
+					 "XMPP there isn't an automated way "
 					 "to recover your password if you forget "
 					 "it."))])]),
 		       ?XE(<<"li">>,
@@ -494,7 +494,7 @@ check_password(Username, Host, Password) ->
 form_del_get(Host, Lang) ->
     HeadEls = [meta(),
 	       ?XCT(<<"title">>,
-		    ?T("Unregister a Jabber account")),
+		    ?T("Unregister an XMPP account")),
 	       ?XA(<<"link">>,
 		   [{<<"href">>, <<"../register.css">>},
 		    {<<"type">>, <<"text/css">>},
@@ -502,10 +502,10 @@ form_del_get(Host, Lang) ->
     Els = [?XACT(<<"h1">>,
 		 [{<<"class">>, <<"title">>},
 		  {<<"style">>, <<"text-align:center;">>}],
-		 ?T("Unregister a Jabber account")),
+		 ?T("Unregister an XMPP account")),
 	   ?XCT(<<"p">>,
-		?T("This page allows to unregister a Jabber "
-		   "account in this Jabber server.")),
+		?T("This page allows to unregister an XMPP "
+		   "account in this XMPP server.")),
 	   ?XAE(<<"form">>,
 		[{<<"action">>, <<"">>}, {<<"method">>, <<"post">>}],
 		[?XE(<<"ol">>,
diff --git a/src/mod_vcard.erl b/src/mod_vcard.erl
index 997d3ef42..f8afdc04d 100644
--- a/src/mod_vcard.erl
+++ b/src/mod_vcard.erl
@@ -210,7 +210,7 @@ process_local_iq(#iq{type = get, to = To, lang = Lang} = IQ) ->
 		undefined ->
 		    #vcard_temp{fn = <<"ejabberd">>,
 				url = ejabberd_config:get_uri(),
-				desc = misc:get_descr(Lang, ?T("Erlang Jabber Server")),
+				desc = misc:get_descr(Lang, ?T("Erlang XMPP Server")),
 				bday = <<"2002-11-16">>};
 		V ->
 		    V
@@ -456,7 +456,7 @@ make_instructions(Mod, Lang) ->
     Fill = translate:translate(
 	     Lang,
 	     ?T("Fill in the form to search for any matching "
-		"Jabber User")),
+		"XMPP User")),
     Add = translate:translate(
 	    Lang,
 	    ?T(" (Add * to the end of field to match substring)")),