aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-07-11 10:42:54 +0200
committerFredrik Gustafsson <[email protected]>2013-07-11 10:42:54 +0200
commit20fae602c85197ef56aa59648a6891871bb15875 (patch)
tree51489adcb3f0a2f179552b38895038fd2cb846e3
parenta8e229046356fadaa217d1a1606fde750d1e8aa1 (diff)
parent15874f5848bb4686b1ab1986adc2e8c366492a4d (diff)
downloadotp-20fae602c85197ef56aa59648a6891871bb15875.tar.gz
otp-20fae602c85197ef56aa59648a6891871bb15875.tar.bz2
otp-20fae602c85197ef56aa59648a6891871bb15875.zip
Merge branch 'maint'
-rw-r--r--lib/stdlib/doc/src/supervisor.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/doc/src/supervisor.xml b/lib/stdlib/doc/src/supervisor.xml
index 612626540a..8197684d2d 100644
--- a/lib/stdlib/doc/src/supervisor.xml
+++ b/lib/stdlib/doc/src/supervisor.xml
@@ -371,7 +371,7 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
children.</p>
<p>If the supervisor is <c>simple_one_for_one</c>, <c><anno>Id</anno></c>
- must be the child process' <c>pid()</c>. I the specified
+ must be the child process' <c>pid()</c>. If the specified
process is alive, but is not a child of the given
supervisor, the function will return
<c>{error,not_found}</c>. If the child specification