diff options
author | Fredrik Gustafsson <fredrik@erlang.org> | 2012-08-23 10:57:50 +0200 |
---|---|---|
committer | Fredrik Gustafsson <fredrik@erlang.org> | 2012-08-23 10:57:50 +0200 |
commit | d3ba4c96e621d4e68e38926f051aadd2b0869dc9 (patch) | |
tree | d4fc0f35f41d9c9e1674af29510e797a118220fc /lib/stdlib/doc/src | |
parent | 064b42237d891d5fdcb6c1a351980b8291437618 (diff) | |
parent | e7720fe2b2a1f09af70e74b54442f72f84609a31 (diff) | |
download | otp-d3ba4c96e621d4e68e38926f051aadd2b0869dc9.tar.gz otp-d3ba4c96e621d4e68e38926f051aadd2b0869dc9.tar.bz2 otp-d3ba4c96e621d4e68e38926f051aadd2b0869dc9.zip |
Merge branch 'maint' of super:otp into maint
* 'maint' of super:otp:
Revert "Merge branch 'nox/compile-column-numbers' into maint"
compiler: Warn if the size of a binary segment is invalid
Allow non-ASCII characters in Xref filanmes
Add powerpc dso xcomp file
Diffstat (limited to 'lib/stdlib/doc/src')
-rw-r--r-- | lib/stdlib/doc/src/epp.xml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/stdlib/doc/src/epp.xml b/lib/stdlib/doc/src/epp.xml index a57c7084fa..488499581f 100644 --- a/lib/stdlib/doc/src/epp.xml +++ b/lib/stdlib/doc/src/epp.xml @@ -51,7 +51,6 @@ <func> <name name="open" arity="2"/> <name name="open" arity="3"/> - <name name="open" arity="4"/> <fsummary>Open a file for preprocessing</fsummary> <desc> <p>Opens a file for preprocessing.</p> @@ -76,7 +75,6 @@ </func> <func> <name name="parse_file" arity="3"/> - <name name="parse_file" arity="4"/> <fsummary>Preprocess and parse an Erlang source file</fsummary> <desc> <p>Preprocesses and parses an Erlang source file. |