aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/doc/src/erl_pp.xml
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2015-11-04 13:14:33 +0100
committerHans Bolinder <[email protected]>2015-11-04 13:14:33 +0100
commitc4fd58a394f427edf54fae75288c3b9159f9cc1a (patch)
tree1c7c1d89b8d292546f45a342022ae659069f1ba1 /lib/stdlib/doc/src/erl_pp.xml
parentce2c23ed1d6b6dc3d1a1c7109ceae255d1203f9f (diff)
parent4ddb88db95442d18abe654ba1ff788e98eebe375 (diff)
downloadotp-c4fd58a394f427edf54fae75288c3b9159f9cc1a.tar.gz
otp-c4fd58a394f427edf54fae75288c3b9159f9cc1a.tar.bz2
otp-c4fd58a394f427edf54fae75288c3b9159f9cc1a.zip
Merge branch 'maint'
* maint: [erl_docgen] Correct documentation [dialyzer] Correct documentation [hipe] Correct documentation [test_server] Correct documentation [tools] Correct documentation [erts] Correct documentation [stdlib] Correct documentation [kernel] Correct documentation Conflicts: lib/stdlib/doc/src/erl_scan.xml
Diffstat (limited to 'lib/stdlib/doc/src/erl_pp.xml')
-rw-r--r--lib/stdlib/doc/src/erl_pp.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/stdlib/doc/src/erl_pp.xml b/lib/stdlib/doc/src/erl_pp.xml
index c9d9e2723d..4b8a571c81 100644
--- a/lib/stdlib/doc/src/erl_pp.xml
+++ b/lib/stdlib/doc/src/erl_pp.xml
@@ -48,8 +48,8 @@
<datatype>
<name name="hook_function"/>
<desc>
- <p>The optional argument <marker id="hook_function">
- <c>HookFunction</c></marker>, shown in the functions described below,
+ <p>The optional argument <marker id="hook_function"/>
+ <c>HookFunction</c>, shown in the functions described below,
defines a function which is called when an unknown form occurs where there
should be a valid expression.</p>