From ce7e5e9c26efa1f907b152a4f6d223e0080542d1 Mon Sep 17 00:00:00 2001 From: Mariano Guerra Date: Tue, 14 Aug 2018 14:35:33 +0200 Subject: fix generated encoding for xml files generated with emd2exml DTRACE.xml and SYSTEMTRAP.xml set encoding to utf8 instead of utf-8 and make xmerl_scan:file/1,2 fail parsing them (cherry picked from commit faded6e1cdceb049d2d9bc995b6c981d58709315) --- make/emd2exml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/emd2exml.in b/make/emd2exml.in index 57bcaba24d..24837696f4 100755 --- a/make/emd2exml.in +++ b/make/emd2exml.in @@ -1214,7 +1214,7 @@ complete_output(#state{out = Out} = S) -> complete_output(S, [], Out) -> S#state{delayed_array = [], - out = ["", nl(), + out = ["", nl(), "", nl(), Out]}; complete_output(S, [{delayed, IX}|Rest], Out) -> -- cgit v1.2.3 From 034df6b0b6792589d0ccc817792bd689818181a8 Mon Sep 17 00:00:00 2001 From: Mariano Guerra Date: Tue, 14 Aug 2018 10:08:36 +0200 Subject: fix double parenthesis and badly formatter tags (cherry picked from commit 1b36c8ff81e896f9aa172603962f838d980668a0) --- lib/et/doc/src/et_collector.xml | 8 +++++--- lib/et/doc/src/et_selector.xml | 4 +++- lib/et/src/et_collector.erl | 2 +- lib/ftp/doc/src/ftp.xml | 4 ++-- lib/inets/doc/src/mod_security.xml | 3 ++- lib/mnesia/doc/src/mnesia_frag_hash.xml | 2 +- lib/reltool/doc/src/reltool.xml | 2 +- lib/tftp/doc/src/tftp.xml | 6 +++--- 8 files changed, 18 insertions(+), 13 deletions(-) diff --git a/lib/et/doc/src/et_collector.xml b/lib/et/doc/src/et_collector.xml index 6a85b81ec2..ba24c121e0 100644 --- a/lib/et/doc/src/et_collector.xml +++ b/lib/et/doc/src/et_collector.xml @@ -46,7 +46,8 @@ option() = {parent_pid, pid()} | {event_order, event_order()} | {dict_insert, {filter, collector}, collector_fun()} | {dict_insert, {filter, event_filter_name()}, event_filter_fun()} | {dict_insert, {subscriber, pid()}, dict_val()} | {dict_insert, dict_key(), dict_val()} | {dict_delete, dict_key()} | {trace_client, trace_client()} | {trace_global, boolean()} | {trace_pattern, trace_pattern()} | {trace_port, integer()} | {trace_max_queue, integer()} event_order() = trace_ts | event_ts trace_pattern() = {report_module(), extended_dbg_match_spec()} | undefined - report_module() = atom() | undefined <v>extended_dbg_match_spec()() = detail_level() | dbg_match_spec() + report_module() = atom() | undefined + extended_dbg_match_spec() = detail_level() | dbg_match_spec() detail_level() = min | max | integer(X) when X =< 0, X >= 100 trace_client() = {event_file, file_name()} | {dbg_trace_type(), dbg_trace_parameters()} file_name() = string() @@ -221,7 +222,7 @@ CollectorPid = pid() RawPattern = {report_module(), extended_dbg_match_spec()} report_module() = atom() | undefined - extended_dbg_match_spec()() = detail_level() | dbg_match_spec() + extended_dbg_match_spec() = detail_level() | dbg_match_spec() RawPattern = detail_level() detail_level() = min | max | integer(X) when X =< 0, X >= 100 TracePattern = {report_module(), dbg_match_spec_match_spec()} @@ -348,7 +349,8 @@ done() = 0 forward() = infinity | integer(X) where X > 0 backward() = '-infinity' | integer(X) where X < 0 - Fun = fun(Event, Acc) -> NewAcc <v>Acc = NewAcc = term() + Fun = fun(Event, Acc) -> NewAcc + Acc = NewAcc = term()

Iterate over the currently stored events.

diff --git a/lib/et/doc/src/et_selector.xml b/lib/et/doc/src/et_selector.xml index 441a4dd278..b819bbf0c6 100644 --- a/lib/et/doc/src/et_selector.xml +++ b/lib/et/doc/src/et_selector.xml @@ -90,7 +90,9 @@ Transforms trace data and makes an event record out of it - Mod = module_name() | undefined <v>module_name() = atom() <v>ValidTraceData = erlang_trace_data() | record(event) + Mod = module_name() | undefined + module_name() = atom() + ValidTraceData = erlang_trace_data() | record(event) erlang_trace_data() = {trace, Pid, Label, Info} | {trace, Pid, Label, Info, Extra} | {trace_ts, Pid, Label, Info, ReportedTS} | {trace_ts, Pid, Label, Info, Extra, ReportedTS} | {seq_trace, Label, Info} | {seq_trace, Label, Info, ReportedTS} | {drop, NumberOfDroppedItems} diff --git a/lib/et/src/et_collector.erl b/lib/et/src/et_collector.erl index ffe244324c..b432df8c62 100644 --- a/lib/et/src/et_collector.erl +++ b/lib/et/src/et_collector.erl @@ -509,7 +509,7 @@ get_global_pid() -> %% CollectorPid = pid() %% RawPattern = {report_module(), extended_dbg_match_spec()} %% report_module() = atom() | undefined -%% extended_dbg_match_spec()() = detail_level() | dbg_match_spec() +%% extended_dbg_match_spec() = detail_level() | dbg_match_spec() %% RawPattern = detail_level() %% detail_level() = min | max | integer(X) when X =< 0, X >= 100 %% TracePattern = {report_module(), dbg_match_spec_match_spec()} diff --git a/lib/ftp/doc/src/ftp.xml b/lib/ftp/doc/src/ftp.xml index 23a9e3fec7..34e3ff84b0 100644 --- a/lib/ftp/doc/src/ftp.xml +++ b/lib/ftp/doc/src/ftp.xml @@ -314,7 +314,7 @@ Transfers a binary into a remote file. Pid = pid() - Bin = binary()() + Bin = binary() RemoteFile = string() Reason = restriction_reason()| shortage_reason() | common_reason() @@ -736,7 +736,7 @@ Transfers a binary into a remote file. Pid = pid() - Bin = binary()() + Bin = binary() RemoteFile = string() Reason = restriction_reason() | common_reason() | shortage_reason() diff --git a/lib/inets/doc/src/mod_security.xml b/lib/inets/doc/src/mod_security.xml index ec8d6ec42c..d65d2ff998 100644 --- a/lib/inets/doc/src/mod_security.xml +++ b/lib/inets/doc/src/mod_security.xml @@ -135,7 +135,8 @@ What = atom() Port = integer() - Address = {A,B,C,D} | string() <v>Dir = string() + Address = {A,B,C,D} | string() + Dir = string() Data = [Info] Info = {Name, Value} diff --git a/lib/mnesia/doc/src/mnesia_frag_hash.xml b/lib/mnesia/doc/src/mnesia_frag_hash.xml index 51b32129b6..2fae542c86 100644 --- a/lib/mnesia/doc/src/mnesia_frag_hash.xml +++ b/lib/mnesia/doc/src/mnesia_frag_hash.xml @@ -130,7 +130,7 @@ key_to_frag_number(State, Key) -> FragNum | abort(Reason) Resolves the key of a record into a fragment number. - FragNum = integer()() + FragNum = integer() Reason = term() diff --git a/lib/reltool/doc/src/reltool.xml b/lib/reltool/doc/src/reltool.xml index 5bfbee966b..0da9279c80 100644 --- a/lib/reltool/doc/src/reltool.xml +++ b/lib/reltool/doc/src/reltool.xml @@ -806,7 +806,7 @@ target_spec() = [target_spec()] stop(Pid) -> ok | {error, Reason} Stop a server or window process - Pid = server_pid() | window_pid()() + Pid = server_pid() | window_pid() Reason = reason()

Stop a server or window process

 diff --git a/lib/tftp/doc/src/tftp.xml b/lib/tftp/doc/src/tftp.xml index 481e5446ad..4ed54bc462 100644 --- a/lib/tftp/doc/src/tftp.xml +++ b/lib/tftp/doc/src/tftp.xml @@ -150,7 +150,7 @@ {logger, Module} -

Module = module()()

+

Module = module()

Callback module for customized logging of errors, warnings, and info messages. The callback module must implement the @@ -220,7 +220,7 @@ info(daemons) -> [{Pid, Options}] Returns information about all daemons. - Pid = [pid()()] + Pid = [pid()] Options = [option()] Reason = term() @@ -233,7 +233,7 @@ info(servers) -> [{Pid, Options}] Returns information about all servers. - Pid = [pid()()] + Pid = [pid()] Options = [option()] Reason = term() -- cgit v1.2.3