diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2018-03-03 21:09:27 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2018-03-03 21:09:27 +0300 |
| commit | 63dba3fd640c096c5e7956b8d910c55ecdb194d2 (patch) | |
| tree | b17fb85d04da9da05c950dc03dfabcf251cddf59 /src/ejabberd_commands_doc.erl | |
| parent | Let a MUC room to route presences from its bare JID (diff) | |
| parent | Revert "Support for default values in default_room_opts" (diff) | |
Merge branch 'master' into muc-self-presence
Diffstat (limited to 'src/ejabberd_commands_doc.erl')
| -rw-r--r-- | src/ejabberd_commands_doc.erl | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/ejabberd_commands_doc.erl b/src/ejabberd_commands_doc.erl index b66015bac..a15bfd157 100644 --- a/src/ejabberd_commands_doc.erl +++ b/src/ejabberd_commands_doc.erl @@ -363,10 +363,6 @@ gen_doc(#ejabberd_commands{name=Name, tags=_Tags, desc=Desc, longdesc=LongDesc, args=Args, args_desc=ArgsDesc, result=Result, result_desc=ResultDesc}=Cmd, HTMLOutput, Langs) -> try - LDesc = case LongDesc of - "" -> Desc; - _ -> LongDesc - end, ArgsText = case ArgsDesc of none -> [?TAG(ul, "args-list", [gen_param(AName, Type, undefined, HTMLOutput) @@ -393,11 +389,15 @@ gen_doc(#ejabberd_commands{name=Name, tags=_Tags, desc=Desc, longdesc=LongDesc, end end, - [?TAG(h1, [?TAG(strong, atom_to_list(Name)), <<" - ">>, ?RAW(Desc)]), - ?TAG(p, ?RAW(LDesc)), - ?TAG(h2, <<"Arguments:">>), ArgsText, - ?TAG(h2, <<"Result:">>), ResultText, - ?TAG(h2, <<"Examples:">>), gen_calls(Cmd, HTMLOutput, Langs)] + [?TAG(h1, atom_to_list(Name)), + ?TAG(p, ?RAW(Desc)), + case LongDesc of + "" -> []; + _ -> ?TAG(p, ?RAW(LongDesc)) + end, + ?TAG(h2, <<"Arguments:">>), ArgsText, + ?TAG(h2, <<"Result:">>), ResultText, + ?TAG(h2, <<"Examples:">>), gen_calls(Cmd, HTMLOutput, Langs)] catch _:Ex -> throw(iolist_to_binary(io_lib:format( |