aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/doc/src/http_server.xml
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2011-09-20 11:19:21 +0200
committerHenrik Nord <[email protected]>2011-09-20 11:19:21 +0200
commitec36499d7e329b4dc69a1a3be3422eac7907c260 (patch)
tree3fae5bd47f85aa8a3ac40519b2328c4451a00c18 /lib/inets/doc/src/http_server.xml
parent532c72b3ffeb9219bdb7e6a7f5d21fe26f0f0629 (diff)
parent53cf0b70c705e0bf6c09f83f2ce2709d79593ce6 (diff)
downloadotp-ec36499d7e329b4dc69a1a3be3422eac7907c260.tar.gz
otp-ec36499d7e329b4dc69a1a3be3422eac7907c260.tar.bz2
otp-ec36499d7e329b4dc69a1a3be3422eac7907c260.zip
Merge branch 'dev' into major
Conflicts: erts/aclocal.m4 erts/include/internal/ethread_header_config.h.in
Diffstat (limited to 'lib/inets/doc/src/http_server.xml')
-rw-r--r--lib/inets/doc/src/http_server.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/inets/doc/src/http_server.xml b/lib/inets/doc/src/http_server.xml
index 599a939913..f29b505bc7 100644
--- a/lib/inets/doc/src/http_server.xml
+++ b/lib/inets/doc/src/http_server.xml
@@ -406,7 +406,7 @@ http://your.server.org/***/Module[:/]Function(?QueryString|/PathInfo)
phase instead of first generating the whole web page and
then sending it to the client. The option to implement a
function with arity two is only kept for
- backwardcompatibilty reasons.
+ backwards compatibility reasons.
See <seealso marker="mod_esi">mod_esi(3)</seealso> for
implementation details of the esi callback function.</p>
</section>