diff options
| author | Fredrik Gustafsson <[email protected]> | 2012-08-14 15:27:18 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2012-08-14 15:27:18 +0200 |
| commit | df8e67e203b83f95d1e098fec88ad5d0ad840069 (patch) | |
| tree | 7609e4eddc4fd4757791ce131f6dc131060b7bfc /lib/stdlib/doc | |
| parent | 0c9d90f314f364e5b1301ec89d762baabc57c7aa (diff) | |
| parent | d932ad582676f1593d917f222b1d8dec71fe88b3 (diff) | |
| download | otp-df8e67e203b83f95d1e098fec88ad5d0ad840069.tar.gz otp-df8e67e203b83f95d1e098fec88ad5d0ad840069.tar.bz2 otp-df8e67e203b83f95d1e098fec88ad5d0ad840069.zip | |
Merge branch 'nox/compile-column-numbers' into maint
* nox/compile-column-numbers:
Fix messages ordering with column numbers
Fix type compile:err_info/0
Test column number reporting in error_SUITE
Fix printing of errors with column numbers
Create a new "column" option in compile
Allow setting of initial position in epp
Export type erl_scan:location/0
Diffstat (limited to 'lib/stdlib/doc')
| -rw-r--r-- | lib/stdlib/doc/src/epp.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/stdlib/doc/src/epp.xml b/lib/stdlib/doc/src/epp.xml index 488499581f..a57c7084fa 100644 --- a/lib/stdlib/doc/src/epp.xml +++ b/lib/stdlib/doc/src/epp.xml @@ -51,6 +51,7 @@ <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> @@ -75,6 +76,7 @@ </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. |