aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2011-10-17 08:23:43 +0200
committerHans Bolinder <[email protected]>2011-10-17 08:23:43 +0200
commit20aff71404e5af42555887964cfc3b308c1f8a7f (patch)
treea44e3c2c8e69c6a9c10b0237c55adfda6131d659 /erts/doc
parent3acfc8993626fd808e3a28ef43dbd14888342968 (diff)
parent6a37976806f9a0998d0970c17f0e176b6e19bdad (diff)
downloadotp-20aff71404e5af42555887964cfc3b308c1f8a7f.tar.gz
otp-20aff71404e5af42555887964cfc3b308c1f8a7f.tar.bz2
otp-20aff71404e5af42555887964cfc3b308c1f8a7f.zip
Merge branch 'hb/doc_fixes/OTP-9616'
* hb/doc_fixes/OTP-9616: Correct the docs
Diffstat (limited to 'erts/doc')
-rw-r--r--erts/doc/src/erl.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index 8502ceadd2..39c79a29df 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -994,7 +994,7 @@
the <c><![CDATA[-extra]]></c> section, i.e. the end of the command line
following after an <c><![CDATA[-extra]]></c> flag.</p>
</item>
- <tag><c><![CDATA[ERL_ZFLAGS]]></c>and <c><![CDATA[ERL_FLAGS]]></c></tag>
+ <tag><c><![CDATA[ERL_ZFLAGS]]></c> and <c><![CDATA[ERL_FLAGS]]></c></tag>
<item>
<p>The content of these environment variables will be added to the
end of the command line for <c><![CDATA[erl]]></c>.</p>