aboutsummaryrefslogtreecommitdiffstats
path: root/lib/erl_interface
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2011-09-27 09:07:20 +0200
committerHans Bolinder <[email protected]>2011-09-27 09:07:20 +0200
commit67e216c86754e7076ffdbb87fec8b48ab0d28e56 (patch)
tree9e9b66077d72e611083e66bba35f3270990ca14d /lib/erl_interface
parent0e132c07e92835811e01bec415399916afc3e44d (diff)
parentadeb8abaca990e6084ee101656832e115579a8ba (diff)
downloadotp-67e216c86754e7076ffdbb87fec8b48ab0d28e56.tar.gz
otp-67e216c86754e7076ffdbb87fec8b48ab0d28e56.tar.bz2
otp-67e216c86754e7076ffdbb87fec8b48ab0d28e56.zip
Merge branch 'dev' into major
* dev: Improve the generation of man pages Correct XML files
Diffstat (limited to 'lib/erl_interface')
-rw-r--r--lib/erl_interface/doc/src/erl_format.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/erl_interface/doc/src/erl_format.xml b/lib/erl_interface/doc/src/erl_format.xml
index 5699485845..f036b12879 100644
--- a/lib/erl_interface/doc/src/erl_format.xml
+++ b/lib/erl_interface/doc/src/erl_format.xml
@@ -4,7 +4,7 @@
<cref>
<header>
<copyright>
- <year>1996</year><year>2009</year>
+ <year>1996</year><year>2011</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -105,7 +105,7 @@ erl_format("[{name,~a},{age,~i},{data,~w}]",
values in <c><![CDATA[Term]]></c>. </p>
<p>If <c><![CDATA[Term]]></c> and <c><![CDATA[Pattern]]></c> can be matched, the
function returns a non-zero value and binds any unbound
- variables in <c><![CDATA[Pattern]]></c>. If <c><![CDATA[Term]]></c><c><![CDATA[Pattern]]></c> do
+ variables in <c><![CDATA[Pattern]]></c>. If <c><![CDATA[Term]]></c> <c><![CDATA[Pattern]]></c> do
not match, the function returns 0. For example:</p>
<code type="none"><![CDATA[
ETERM *term, *pattern, *pattern2;