aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/doc
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2012-08-14 15:30:03 +0200
committerFredrik Gustafsson <[email protected]>2012-08-14 15:30:03 +0200
commit160bf5da0e03f39b468ebba5d39d1658c8a370e6 (patch)
treee0d7bcbde2f11b6b8def23ad8de6bc6abc3c2290 /lib/stdlib/doc
parentce6691c02f5bea8ecb0478edd68a555067de37d2 (diff)
parent9492bf7abbf5e43a9bdada5b0ace0432ce1f4223 (diff)
downloadotp-160bf5da0e03f39b468ebba5d39d1658c8a370e6.tar.gz
otp-160bf5da0e03f39b468ebba5d39d1658c8a370e6.tar.bz2
otp-160bf5da0e03f39b468ebba5d39d1658c8a370e6.zip
Merge branch 'maint', remote-tracking branch 'upstream'
Diffstat (limited to 'lib/stdlib/doc')
-rw-r--r--lib/stdlib/doc/src/epp.xml2
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.