diff options
| author | Marcus Arendt <[email protected]> | 2015-01-26 14:01:06 +0100 |
|---|---|---|
| committer | Marcus Arendt <[email protected]> | 2015-01-26 14:01:06 +0100 |
| commit | e2001315febed13f8889ff1a33c046f36a4c8c54 (patch) | |
| tree | b19e6d23f227813177d0bfdf854168ce38248568 /lib/erl_docgen | |
| parent | bb6d1557403f64b35c1d41a8ec6ab83360904c3d (diff) | |
| parent | 6f492b98505ee6d68b9f438915dfbd3616a1b729 (diff) | |
| download | otp-e2001315febed13f8889ff1a33c046f36a4c8c54.tar.gz otp-e2001315febed13f8889ff1a33c046f36a4c8c54.tar.bz2 otp-e2001315febed13f8889ff1a33c046f36a4c8c54.zip | |
Merge branch 'vladdu/edoc_remove_packages/OTP-12431'
* vladdu/edoc_remove_packages/OTP-12431:
[edoc] remove functionality related to packages
[edoc] add test for nested source directories
Diffstat (limited to 'lib/erl_docgen')
| -rw-r--r-- | lib/erl_docgen/priv/bin/specs_gen.escript | 2 | ||||
| -rwxr-xr-x | lib/erl_docgen/priv/bin/xml_from_edoc.escript | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/erl_docgen/priv/bin/specs_gen.escript b/lib/erl_docgen/priv/bin/specs_gen.escript index 156311565c..e8a8f14e3a 100644 --- a/lib/erl_docgen/priv/bin/specs_gen.escript +++ b/lib/erl_docgen/priv/bin/specs_gen.escript @@ -97,7 +97,7 @@ read_file(File, Opts) -> edoc:read_source(File, Opts). extract(File, Forms, Opts) -> - Env = edoc_lib:get_doc_env([], [], [], _Opts=[]), + Env = edoc_lib:get_doc_env([], [], _Opts=[]), {_Module, Doc} = edoc_extract:source(Forms, File, Env, Opts), Doc. diff --git a/lib/erl_docgen/priv/bin/xml_from_edoc.escript b/lib/erl_docgen/priv/bin/xml_from_edoc.escript index 65a580dca2..007546e7ba 100755 --- a/lib/erl_docgen/priv/bin/xml_from_edoc.escript +++ b/lib/erl_docgen/priv/bin/xml_from_edoc.escript @@ -117,7 +117,7 @@ users_guide(File, Args) -> Text = edoc_lib:run_layout(F, Opts), OutFile = "chapter" ++ Args#args.suffix, - edoc_lib:write_file(Text, ".", OutFile, '', Encoding); + edoc_lib:write_file(Text, ".", OutFile, Encoding); false -> io:format("~s: not a regular file\n", [File]), usage() |