aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/doc/src
diff options
context:
space:
mode:
authorGustav Simonsson <[email protected]>2012-03-19 16:12:46 +0100
committerGustav Simonsson <[email protected]>2012-03-19 16:12:46 +0100
commitbd8e724a56aff8936fe61bfdb72e9548637ef561 (patch)
tree4acf72f622ab19089bcab840ad867f530f971432 /lib/kernel/doc/src
parent8406f47252a5f1fd38cd771aa7fa692817677709 (diff)
parent662e3ffeed74d9121315d86af46430dd71e01709 (diff)
downloadotp-bd8e724a56aff8936fe61bfdb72e9548637ef561.tar.gz
otp-bd8e724a56aff8936fe61bfdb72e9548637ef561.tar.bz2
otp-bd8e724a56aff8936fe61bfdb72e9548637ef561.zip
Merge branch 'maint'
Diffstat (limited to 'lib/kernel/doc/src')
-rw-r--r--lib/kernel/doc/src/error_logger.xml2
-rw-r--r--lib/kernel/doc/src/kernel_app.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/kernel/doc/src/error_logger.xml b/lib/kernel/doc/src/error_logger.xml
index 5781591cca..cd86b364f6 100644
--- a/lib/kernel/doc/src/error_logger.xml
+++ b/lib/kernel/doc/src/error_logger.xml
@@ -49,7 +49,7 @@
that events are logged to file instead, or not logged at all, see
<seealso marker="kernel_app">kernel(6)</seealso>.</p>
<p>Also the SASL application, if started, adds its own event
- handler, which by default writes supervisor-, crash- and progress
+ handler, which by default writes supervisor, crash and progress
reports to tty. See
<seealso marker="sasl:sasl_app">sasl(6)</seealso>.</p>
<p>It is recommended that user defined applications should report
diff --git a/lib/kernel/doc/src/kernel_app.xml b/lib/kernel/doc/src/kernel_app.xml
index 0f71a4f0f2..63fdc223f4 100644
--- a/lib/kernel/doc/src/kernel_app.xml
+++ b/lib/kernel/doc/src/kernel_app.xml
@@ -104,7 +104,7 @@
that node. <c>Value</c> is one of:</p>
<taglist>
<tag><c>never</c></tag>
- <item>Connections are never automatically connected, they
+ <item>Connections are never automatically established, they
must be explicitly connected. See <c>net_kernel(3)</c>.</item>
<tag><c>once</c></tag>
<item>Connections will be established automatically, but only